X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=META-INF%2Fspring%2Fapache.commons.xml;h=dd96fb2f9ace2782dc79cec7a409920d0f8a1e1b;hb=5ed4921fe8031b4ded9e967d4777af3bbdd27103;hp=04644a4dc1dcaea2224d29932541ec36155bcd0e;hpb=b8b775235639af6b9ef495831ab37eee211d325a;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 04644a4..dd96fb2 100644
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -7,43 +7,76 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-	<flow:flow name="apache/org.apache.commons.codec"
-		spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.codec" spec="spec.commons">
 		<flow:arg name="project" value="codec" />
 		<flow:arg name="version" value="1.9" />
-		<bean parent="template.commonsArchiveWrapper" />
+		<bean p:version="1.9.0" parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.dbcp"
-		spec="spec.commons">
-		<flow:arg name="project" value="pool" />
-		<flow:arg name="version" value="1.5.7" />
-		<bean parent="template.commonsArchiveWrapper" />
+	<flow:flow name="apache/org.apache.commons.dbcp" spec="spec.commons">
+		<flow:arg name="project" value="dbcp" />
+		<flow:arg name="version" value="1.4" />
+		<bean p:version="1.4.0" parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.pool"
-		spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.pool" spec="spec.commons">
 		<flow:arg name="project" value="pool" />
 		<flow:arg name="version" value="1.5.7" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.collections"
-		spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.collections" spec="spec.commons">
 		<flow:arg name="project" value="collections" />
 		<flow:arg name="version" value="3.2.1" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.io"
-		spec="spec.commons">
+	<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 parent="template.commonsArchiveWrapper" />
+		<bean p:version="2.4.0" parent="template.commonsArchiveWrapper" />
+	</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 name="apache/org.apache.commons.net" spec="spec.commons">
+		<flow:arg name="project" value="net" />
+		<flow:arg name="version" value="3.3" />
+		<bean p:version="3.3.0" parent="template.commonsArchiveWrapper" />
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.commons.vfs" spec="spec.commons">
+		<flow:arg name="project" value="vfs" />
+		<flow:arg name="version" value="2.0" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="version" value="@{version}.0" />
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/vfs/binaries/commons-vfs-@{version}.zip" />
+			<property name="wrappers">
+				<map>
+					<entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar">
+						<bean id="org.apache.commons.vfs" parent="template.org.apache.commons" />
+					</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>
 
-	<flow:flow name="apache/org.apache.commons.fileupload"
-		spec="spec.commons">
+	<flow:flow name="apache/org.apache.commons.fileupload" spec="spec.commons">
 		<flow:arg name="project" value="fileupload" />
 		<flow:arg name="version" value="1.3.1" />
 		<bean parent="template.commonsArchiveWrapper">
@@ -53,7 +86,16 @@
 				<map>
 					<entry
 						key="commons-@{project}-@{version}-bin/lib/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons" />
+						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons">
+							<property name="bndProperties">
+								<props merge="true">
+									<prop key="Import-Package">
+										javax.portlet;resolution:=optional,
+										*
+									</prop>
+								</props>
+							</property>
+						</bean>
 					</entry>
 				</map>
 			</property>
@@ -69,8 +111,7 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="apache/org.apache.commons.httpclient"
-		spec="spec.version">
+	<flow:flow name="apache/org.apache.commons.httpclient" spec="spec.version">
 		<flow:arg name="version" value="3.1" />
 		<bean parent="template.commonsArchiveWrapper">
 			<property name="version" value="@{version}.0" />