Argeo TP v2.1.6

[gpl/argeo-tp.git] / META-INF / spring / apache.commons.xml

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index dd96fb2f9ace2782dc79cec7a409920d0f8a1e1b..d73d3cce35914abea44352997f9324823e5aa7b7 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -34,15 +34,33 @@
        <flow:flow name="apache/org.apache.commons.io" spec="spec.commons">
                <flow:arg name="project" value="io" />
                <flow:arg name="version" value="2.4" />
-               <bean p:version="2.4.0" parent="template.commonsArchiveWrapper" />
+               <bean parent="template.commonsArchiveWrapper">
+                       <property name="version" value="@{version}.0" />
+                       <property name="wrappers">
+                               <map>
+                                       <entry
+                                               key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+                                               <bean id="org.apache.commons.io" parent="template.org.apache.commons">
+                                                       <property name="bndProperties">
+                                                               <props merge="true">
+                                                                       <prop key="Export-Package">
+                                                                               org.apache.commons.io.*;version="2.4"
+                                                                       </prop>
+                                                               </props>
+                                                       </property>
+                                               </bean>
+                                       </entry>
+                               </map>
+                       </property>
+               </bean>
        </flow:flow>
-       
+
        <flow:flow name="apache/org.apache.commons.exec" spec="spec.commons">
                <flow:arg name="project" value="exec" />
                <flow:arg name="version" value="1.3" />
                <bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
-       </flow:flow>    
-       
+       </flow:flow>
+
        <flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
                <flow:arg name="project" value="net" />
                <flow:arg name="version" value="3.3" />
@@ -59,20 +77,19 @@
                        <property name="wrappers">
                                <map>
                                        <entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar">
-                                               <bean id="org.apache.commons.vfs" parent="template.org.apache.commons" />
+                                               <bean id="org.apache.commons.vfs" parent="template.org.apache.commons">
+                                                       <property name="bndProperties">
+                                                               <props merge="true">
+                                                                       <prop key="Import-Package">
+                                                                               org.apache.tools.ant.*;resolution:=optional,
+                                                                               *
+                                                                       </prop>
+                                                               </props>
+                                                       </property>
+                                               </bean>
                                        </entry>
                                </map>
                        </property>
-                       <!-- <property name="sourcesProvider"> -->
-                       <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
-                       <!-- <property name="uri" -->
-                       <!-- value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-@{version}-src.zip" 
-                               /> -->
-                       <!-- <property name="base" value="commons-httpclient-@{version}/src/java/" 
-                               /> -->
-                       <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
-                       <!-- </bean> -->
-                       <!-- </property> -->
                </bean>
        </flow:flow>