X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fapache.commons.xml;fp=META-INF%2Fspring%2Fapache.commons.xml;h=0000000000000000000000000000000000000000;hb=3f5257ef08adbd0642634ae5c57da0b1e8a18b65;hp=29b2f067213781dcbecbae10935597f865e4c51a;hpb=585573bd4db81adf7c81abe52977390b74e0162e;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
deleted file mode 100644
index 29b2f06..0000000
--- a/META-INF/spring/apache.commons.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	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:arg name="project" value="codec" />
-		<flow:arg name="version" value="1.13" />
-		<bean p:version="@{version}.0"
-			parent="template.commonsArchiveWrapper" />
-	</flow:flow>
-
-	<flow:flow name="apache/org.apache.commons.cli"
-		spec="spec.commons">
-		<flow:arg name="project" value="cli" />
-		<flow:arg name="version" value="1.4" />
-		<bean p:version="@{version}.0"
-			parent="template.commonsArchiveWrapper" />
-	</flow:flow>
-
-	<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="@{version}.0"
-			parent="template.commonsArchiveWrapper" />
-	</flow:flow>
-
-	<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:arg name="project" value="collections" />
-		<flow:arg name="version" value="3.2.2" />
-		<bean parent="template.commonsArchiveWrapper" />
-	</flow:flow>
-
-	<flow:flow name="apache/org.apache.commons.collections4"
-		spec="spec.commons">
-		<flow:arg name="project" value="collections4" />
-		<flow:arg name="version" value="4.4" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="uri"
-				value="http://archive.apache.org/dist/commons/collections/binaries/commons-@{project}-@{version}-bin.zip" />
-		</bean>
-	</flow:flow>
-
-
-	<flow:flow name="apache/org.apache.commons.io"
-		spec="spec.commons">
-		<flow:arg name="project" value="io" />
-		<flow:arg name="version" value="2.6" />
-		<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.6"
-									</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.jxpath"
-		spec="spec.commons">
-		<flow:arg name="project" value="jxpath" />
-		<flow:arg name="version" value="1.3" />
-		<bean p:version="1.3.0" parent="template.commonsArchiveWrapper">
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.jxpath"
-							parent="template.org.apache.commons">
-							<property name="bndProperties">
-								<props merge="true">
-									<prop key="Import-Package">
-										javax.servlet.jsp.*;resolution:=optional,
-										org.apache.commons.beanutils.*;resolution:=optional,
-										org.jdom.*;resolution:=optional,
-										*
-									</prop>
-								</props>
-							</property>
-						</bean>
-					</entry>
-				</map>
-			</property>
-		</bean>
-	</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.6" />
-		<bean p:version="@{version}.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.19" />
-		<bean p:version="@{version}.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.brotli.*;resolution:=optional,
-										org.tukaani.*;resolution:=optional,
-										com.github.luben.zstd;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" />
-		<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">
-							<property name="bndProperties">
-								<props merge="true">
-									<prop key="Import-Package">
-										org.apache.tools.ant.*;resolution:=optional,
-										*
-									</prop>
-								</props>
-							</property>
-						</bean>
-					</entry>
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- VFS 2.2 Requires Collections v4 -->
-	<!-- <flow:flow name="apache/org.apache.commons.vfs" -->
-	<!-- spec="spec.commons"> -->
-	<!-- <flow:arg name="project" value="vfs" /> -->
-	<!-- <flow:arg name="version" value="2.2" /> -->
-	<!-- <bean parent="template.commonsArchiveWrapper"> -->
-	<!-- <property name="version" value="@{version}.0" /> -->
-	<!-- <property name="uri" -->
-	<!-- value="http://archive.apache.org/dist/commons/vfs/binaries/commons-vfs2-distribution-@{version}-bin.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"> -->
-	<!-- <property name="bndProperties"> -->
-	<!-- <props merge="true"> -->
-	<!-- <prop key="Import-Package"> -->
-	<!-- org.apache.tools.ant.*;resolution:=optional, -->
-	<!-- org.apache.commons.collections4.*;resolution:=optional, -->
-	<!-- * -->
-	<!-- </prop> -->
-	<!-- </props> -->
-	<!-- </property> -->
-	<!-- </bean> -->
-	<!-- </entry> -->
-	<!-- </map> -->
-	<!-- </property> -->
-	<!-- </bean> -->
-	<!-- </flow:flow> -->
-
-	<flow:flow name="apache/org.apache.commons.math3"
-		spec="spec.commons">
-		<flow:arg name="project" value="math3" />
-		<flow:arg name="version" value="3.6.1" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="version" value="@{version}" />
-			<property name="uri"
-				value="http://archive.apache.org/dist/commons/math/binaries/commons-@{project}-@{version}-bin.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.math3"
-							parent="template.org.apache.commons" />
-					</entry>
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<flow:flow name="apache/org.apache.commons.fileupload"
-		spec="spec.commons">
-		<flow:arg name="project" value="fileupload" />
-		<flow:arg name="version" value="1.4" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="version" value="@{version}.0" />
-			<property name="uri"
-				value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-@{project}-@{version}-bin/commons-@{project}-@{version}.jar">
-						<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>
-			<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.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">
-			<property name="version" value="@{version}.0" />
-			<property name="uri"
-				value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/binary/commons-httpclient-@{version}.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-httpclient-@{version}/commons-httpclient-@{version}.jar">
-						<bean id="org.apache.commons.httpclient"
-							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.lang3"
-		spec="spec.commons">
-		<flow:arg name="project" value="lang3" />
-		<flow:arg name="version" value="3.9" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="version" value="@{version}.0" />
-			<property name="uri"
-				value="http://archive.apache.org/dist/commons/lang/binaries/commons-@{project}-@{version}-bin.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.lang3"
-							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/commons/lang/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>
-
-	<!-- Specs and templates -->
-	<flow:spec id="spec.commons">
-		<flow:primitive name="version" isParameter="true" />
-		<flow:primitive name="project" isParameter="true" />
-	</flow:spec>
-
-	<bean id="template.commonsArchiveWrapper"
-		parent="template.archiveWrapper" abstract="true">
-		<property name="version" value="@{version}" />
-		<property name="license">
-			<util:constant
-				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-		</property>
-		<property name="uri"
-			value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
-		<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" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="template.org.apache.commons"
-		parent="template.bndWrapper" abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.commons" />
-	</bean>
-</beans>
\ No newline at end of file