X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=71dfa6b48bb16bcf0a7e9c5d049f3315a38c97e3;hb=1e22914984c5a2bb8ded714e29ae09b8e7d88ba4;hp=2ae116c8ad8b31ff12eb31b5cddd7bd43dbc2733;hpb=1434522acfcc29690ddd23aa8e122c0ef0710dc6;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 2ae116c..71dfa6b 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,27 +10,39 @@
 	<!-- REGISTER -->
 	<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.2" />
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.12" />
 		<property name="modules">
 			<list>
+				<!-- Javax -->
+				<ref bean="javax.inject" />
+				<ref bean="javax.jcr" />
+				<ref bean="javax.mail" />
+				<ref bean="javax.transaction" />
+				
+				<!-- Builder -->
+				<ref bean="biz.aQute.bnd" />
+				<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="joda-time" />
-				<!-- This has been defined as optional via bnd -->
-				<!--   <ref bean="com.jcraft.jzlib" /> -->
+				<ref bean="org.joda.time" />
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
-				<ref bean="javax.el" />
-				<ref bean="javax.inject" />
-				<ref bean="misc/org.aspectj" />
+				<ref bean="org.objectweb.asm" />
+				<ref bean="org.aspectj.weaver" />
 				<ref bean="misc/org.bouncycastle" />
-				<ref bean="spring/org.springframework" />
-				<ref bean="org.springframework.ldap" />
-				<ref bean="spring/org.springframework.security" />
 				<ref bean="apache/org.apache.ant" />
+				<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"/>
+
+				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
 				<ref bean="apache/org.apache.commons.fileupload" />
 				<ref bean="apache/org.apache.commons.collections" />
@@ -39,26 +51,31 @@
 				<ref bean="apache/org.apache.commons.codec" />
 				<ref bean="apache/org.apache.commons.httpclient" />
 				<ref bean="apache/org.apache.commons.vfs" />
+				<ref bean="apache/org.apache.commons.net" />
 				<ref bean="apache/org.apache.commons.exec" />
-				<!-- Felix -->
-				<!-- <ref bean="org.apache.felix.framework" /> -->
-				<!-- <ref bean="org.apache.felix.bundlerepository" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.command" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.runtime" /> -->
-				<!-- <ref bean="org.apache.felix.gogo.shell" /> -->
+				<ref bean="apache/org.apache.commons.jci" />
+				<ref bean="apache/org.apache.commons.compress" />
+				
+				<!-- Google -->
+				<ref bean="com.google.guava" />
+				<ref bean="com.google.gson" />
+
 				<!-- Eclipse -->
 				<ref bean="eclipse/org.argeo.tp.jetty" />
 				<ref bean="eclipse/org.argeo.tp.equinox" />
 				<ref bean="eclipse/org.argeo.tp.gemini" />
-				<!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.core" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
-				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
+
+				<!-- Eclipse RAP -->
+				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+				<ref bean="eclipse/org.argeo.tp.rap.addons" />
+
 				<!-- Jackrabbit -->
-				<ref bean="javax/javax.jcr" />
 				<ref bean="apache/org.apache.tika" />
 				<ref bean="apache/org.apache.lucene" />
 				<ref bean="apache/org.apache.jackrabbit" />
+				
+				<!-- Spring -->
+				<ref bean="spring/org.springframework" />
 			</list>
 		</property>
 	</bean>