X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.commons.xml;h=9276c69b869ce270a81380aa325258542b2e097f;hb=1e22914984c5a2bb8ded714e29ae09b8e7d88ba4;hp=60f0d14d4fb584b8b318db0c232d3e90e2ab38aa;hpb=5a95fbf10b36fc9dc40806edda990349d837aaba;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 60f0d14..9276c69 100644
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -34,15 +34,72 @@
 	<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 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.compress" spec="spec.commons">
+		<flow:arg name="project" value="compress" />
+		<flow:arg name="version" value="1.9" />
+		<bean p:version="1.9.0" parent="template.commonsArchiveWrapper">
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+						<bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons">
+							<property name="bndProperties">
+								<props merge="true">
+									<prop key="Import-Package">
+										org.tukaani.*;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/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
+					<property name="base"
+						value="commons-@{project}-@{version}-src/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</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" />
@@ -53,20 +110,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>
 
@@ -105,6 +161,53 @@
 		</bean>
 	</flow:flow>
 
+	<flow:flow name="apache/org.apache.commons.jci" spec="spec.commons">
+		<flow:arg name="project" value="jci" />
+		<flow:arg name="version" value="1.1" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
+			<!-- JCI provides OSGi metadata, but they are broken (org.apache.commons.jci.monitor 
+				package) -->
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-@{project}-@{version}/lib/commons-@{project}-core-@{version}.jar">
+						<bean p:name="org.apache.commons.@{project}-core" parent="template.org.apache.commons">
+							<property name="bndProperties">
+								<props merge="true">
+									<prop key="Import-Package">
+										org.apache.commons.jci.monitor;resolution:=optional,
+										*
+									</prop>
+								</props>
+							</property>
+						</bean>
+					</entry>
+					<entry
+						key="commons-@{project}-@{version}/lib/commons-@{project}-eclipse-@{version}.jar">
+						<bean p:name="org.apache.commons.@{project}-eclipse" parent="template.org.apache.commons" />
+					</entry>
+					<!-- <entry -->
+					<!-- key="commons-@{project}-@{version}/lib/commons-@{project}-rhino-@{version}.jar"> -->
+					<!-- <bean p:name="org.apache.commons.@{project}-rhino" parent="template.org.apache.commons" 
+						/> -->
+					<!-- </entry> -->
+				</map>
+			</property>
+			<!-- TODO : include other sources than core -->
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
+					<property name="base"
+						value="commons-@{project}-@{version}-src/core/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
 	<flow:flow name="apache/org.apache.commons.httpclient" spec="spec.version">
 		<flow:arg name="version" value="3.1" />
 		<bean parent="template.commonsArchiveWrapper">
@@ -130,6 +233,35 @@
 		</bean>
 	</flow:flow>
 
+	<flow:flow name="apache/org.apache.httpcomponents.httpclient"
+		spec="spec.version">
+		<flow:arg name="version" value="4.4" />
+		<bean parent="template.archiveWrapper">
+			<property name="version" value="@{version}.0" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="uri"
+				value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
+			<property name="includes">
+				<map>
+					<entry
+						key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+						value="org.argeo.tp.apache" />
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-@{version}-src.zip" />
+					<property name="base"
+						value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
 	<!-- Specs and templates -->
 	<flow:spec id="spec.commons">
 		<flow:primitive name="version" isParameter="true" />