X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=META-INF%2Fspring%2Fdistribution.xml;h=fb67db34d3d03dc68171c00535270e89915c7784;hb=c5a22d8223b66c67bd243cffdbda0b2e0f267141;hp=f558095d67370dcac314bd300714f56929b6a394;hpb=8f00798abdebd493d6931b7ab7633418f3ca8517;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index f558095..fb67db3 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -1,24 +1,26 @@
 <?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.19" />
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<!-- Javax -->
-				<ref bean="javax.inject" />
 				<ref bean="javax.jcr" />
 				<ref bean="javax.transaction" />
 				<ref bean="javax.mail" />
-				<ref bean="javax.annotation" />
+				<ref bean="javax.websocket" />
 
 				<!-- Builder -->
 				<ref bean="biz.aQute.bnd" />
@@ -41,19 +43,26 @@
 				<!-- <ref bean="com.steadystate.css" /> -->
 				<ref bean="com.googlecode.javaewah.JavaEWAH" />
 				<ref bean="org.w3c.dom.svg" />
+				<ref bean="org.tukaani.xz" />
+				<ref bean="net.i2p.crypto.eddsa" />
 
 				<!-- 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="apache/org.apache.sshd" />
+				<ref bean="org.apache.tomcat.jni" />
+				<!-- <ref bean="org.apache.aries.util" /> -->
+				<!-- <ref bean="org.apache.aries.spifly.dynamic.bundle" /> -->
 
 				<!-- 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" />
@@ -61,7 +70,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.jxpath" />
+				<ref bean="apache/org.apache.commons.math3" />
+				<ref bean="apache/org.apache.commons.cli" />
+				<!-- <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" />
@@ -73,22 +84,26 @@
 				<!-- Eclipse -->
 				<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" />
 
 				<!-- Jackrabbit -->
 				<ref bean="apache/org.apache.tika" />
 				<ref bean="apache/org.apache.lucene" />
 				<ref bean="apache/org.apache.jackrabbit" />
 
-				<!-- Spring -->
-				<ref bean="spring/org.springframework" />
-
 				<!-- 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" />
+				<ref bean="org.jsoup" />
+				<ref bean="misc/com.vladsch.flexmark" />
+				<ref bean="org.freemarker" />
+
 				<!-- Databases -->
 				<ref bean="org.postgresql.jdbc42" />
 				<ref bean="org.h2" />
@@ -101,9 +116,11 @@
 		</property>
 	</bean>
 
-	<bean id="argeo-tp-rap-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+	<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.19" />
+		<constructor-arg
+			value="org.argeo.tp:argeo-tp-rap-e4:2.1.25-SNAPSHOT" />
 		<property name="modules">
 			<list>
 				<ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -111,9 +128,34 @@
 		</property>
 	</bean>
 
-	<!-- Factory -->
-	<bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+	<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.25-SNAPSHOT" />
+		<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.25-SNAPSHOT" />
+		<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>
@@ -162,6 +204,14 @@
 			<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 -->