X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=META-INF%2Fspring%2Fdistribution.xml;h=3ac5c65bd91a69901ea6975ce79e18791ef2f20b;hb=73757a0eee2b296be3cbf0ec394fcf280cbc3f57;hp=8edad39764f972aea30609863c736d899384d2a6;hpb=7bee127dfda4f87ae0353d3ccd35253718cfac18;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 8edad39..3ac5c65 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -1,51 +1,67 @@
 <?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"
+	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">
 
 	<!-- REGISTER -->
-	<bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<bean id="argeo-tp"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.17" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp:2.1.21" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
-				<ref bean="javax.inject" />
+				<!-- <ref bean="javax.inject" /> -->
 				<ref bean="javax.jcr" />
-				<ref bean="javax.mail" />
 				<ref bean="javax.transaction" />
+				<ref bean="javax.mail" />
+				<!-- <ref bean="javax.annotation" /> -->
 
 				<!-- Builder -->
 				<ref bean="biz.aQute.bnd" />
-				<ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" />
+				<!-- <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
 
 				<!-- Standalone projects -->
-				<ref bean="apache/org.apache.log4j" />
 				<ref bean="misc/org.slf4j" />
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
-				<ref bean="org.h2" />
-				<ref bean="org.joda.time" />
+				<!-- <ref bean="org.joda.time" /> -->
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
 				<ref bean="org.objectweb.asm" />
 				<ref bean="org.aspectj.weaver" />
 				<ref bean="misc/org.bouncycastle" />
-				<ref bean="apache/org.apache.ant" />
-				<ref bean="org.quartz-scheduler.quartz" />
-				<ref bean="org.quartz-scheduler.quartz.jobs" />
+				<!-- <ref bean="org.quartz-scheduler.quartz" /> -->
+				<!-- <ref bean="org.quartz-scheduler.quartz.jobs" /> -->
 				<ref bean="bitronix.tm" />
-				<ref bean="misc/org.w3c.css.sac" />
-				<ref bean="com.steadystate.css" />
+				<!-- <ref bean="misc/org.w3c.css.sac" /> -->
+				<!-- <ref bean="com.steadystate.css" /> -->
+				<ref bean="com.googlecode.javaewah.JavaEWAH" />
+				<ref bean="org.w3c.dom.svg" />
+				<ref bean="org.tukaani.xz" />
+
+				<!-- Apache -->
+				<ref bean="apache/org.apache.log4j" />
+				<ref bean="apache/org.apache.ant" />
+				<ref bean="apache/org.apache.xmlgraphics" />
+				<ref bean="apache/org.apache.batik" />
+				<ref bean="apache/org.apache.httpcomponents.httpcore" />
+				<ref bean="apache/org.apache.httpcomponents.httpclient" />
+				<ref bean="org.apache.mina.core" />
+				<ref bean="org.apache.sshd.core" />
 
 				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
 				<ref bean="apache/org.apache.commons.fileupload" />
 				<ref bean="apache/org.apache.commons.collections" />
+				<ref bean="apache/org.apache.commons.collections4" />
 				<ref bean="apache/org.apache.commons.dbcp" />
 				<ref bean="apache/org.apache.commons.pool" />
 				<ref bean="apache/org.apache.commons.codec" />
@@ -53,7 +69,9 @@
 				<ref bean="apache/org.apache.commons.vfs" />
 				<ref bean="apache/org.apache.commons.net" />
 				<ref bean="apache/org.apache.commons.exec" />
-				<ref bean="apache/org.apache.commons.jci" />
+				<ref bean="apache/org.apache.commons.math3" />
+				<!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
+				<!-- <ref bean="apache/org.apache.commons.jci" /> -->
 				<ref bean="apache/org.apache.commons.compress" />
 				<ref bean="apache/org.apache.commons.lang3" />
 
@@ -62,12 +80,12 @@
 				<ref bean="com.google.gson" />
 
 				<!-- Eclipse -->
-				<ref bean="eclipse/org.argeo.tp.jetty" />
+				<!-- <ref bean="eclipse/org.argeo.tp.jetty" /> -->
 				<ref bean="eclipse/org.argeo.tp.equinox" />
 				<ref bean="eclipse/org.argeo.tp.gemini" />
 
 				<!-- Eclipse RAP -->
-				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+				<!-- <ref bean="eclipse/org.argeo.tp.rap.platform" /> -->
 
 				<!-- Jackrabbit -->
 				<ref bean="apache/org.apache.tika" />
@@ -80,22 +98,65 @@
 				<!-- Document generation and management -->
 				<ref bean="net.sf.jxl" />
 				<ref bean="apache/org.apache.pdfbox" />
+				<ref bean="org.apache.xml.security" />
+				<ref bean="org.apache.xmlbeans" />
+				<ref bean="org.apache.xalan" />
+				<ref bean="org.apache.xalan.serializer" />
+				<ref bean="org.apache.xml.resolver" />
+				<ref bean="org.apache.xerces" />
+				<ref bean="apache/org.apache.poi" />
 				<!-- Databases -->
-				<ref bean="org.postgresql.postgresql" />
+				<ref bean="org.postgresql.jdbc42" />
+				<ref bean="org.h2" />
 				<ref bean="org.dbunit" />
 				<!-- ALM -->
-				<ref bean="eclipse/org.eclipse.aether" />
 				<ref bean="org.redline-rpm" />
-				<!-- Needs https://code.google.com/p/javaewah/ -->
-				<!-- <ref bean="org.eclipse.jgit" /> -->
-				<ref bean="misc/org.tmatesoft.svnkit" />
+				<ref bean="org.eclipse.jgit" />
+				<!-- <ref bean="misc/org.tmatesoft.svnkit" /> -->
 			</list>
 		</property>
 	</bean>
 
-	<!-- Factory -->
-	<bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+	<bean id="argeo-tp-rap-e4"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.21" />
+		<property name="modules">
+			<list>
+				<ref bean="eclipse/org.argeo.tp.rap.e4" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="argeo-tp-rcp-e4"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rcp-e4:2.1.21" />
+		<property name="modules">
+			<list>
+				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="argeo-tp-rap-e3"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rap-e3:2.1.21" />
+		<property name="modules">
+			<list>
+				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+			</list>
+		</property>
+	</bean>
+
+	<!-- Factory -->
+	<bean id="osgiFactory"
+		class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" init-method="init"
+		destroy-method="destroy">
 		<property name="workspace" value="argeo-2.1" />
 		<property name="nodeIndexers">
 			<list>
@@ -115,10 +176,12 @@
 				</entry>
 				<entry key="http://www.eclipse.org/downloads">
 					<list>
-						<value>http://eclipse.mirror.garr.it/mirrors/eclipse</value>
-						<value>http://mirror.netcologne.de/eclipse</value>
-						<value>http://mirror.selfnet.de/eclipse</value>
-						<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
+						<value>http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/</value>
+						<value>http://ftp.fau.de/eclipse/</value>
+						<!-- <value>http://eclipse.mirror.garr.it/mirrors/eclipse</value> -->
+						<!-- <value>http://mirror.netcologne.de/eclipse</value> -->
+						<!-- <value>http://mirror.selfnet.de/eclipse</value> -->
+						<!-- <value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value> -->
 					</list>
 				</entry>
 			</map>
@@ -138,6 +201,18 @@
 			<property name="osgiDistribution" ref="argeo-tp" />
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-rap-e4" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-rcp-e4" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-rap-e3" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
 	</flow:flow>
 
 	<!-- Security -->