Prepare next development cycle

[gpl/argeo-tp.git] / META-INF / spring / distribution.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index dca4302d1a159ab73c119f9c2306b977c7000ac1..3a16faf4f8a0ede5a1f8fcef838c1f727bd492a3 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,41 +10,72 @@
        <!-- 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.13" />
                <property name="modules">
                        <list>
-                               <ref bean="org.argeo.tp/org.apache.log4j" />
-                               <ref bean="org.argeo.tp/org.slf4j" />
-                               <!-- <ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" /> -->
+                               <!-- 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.argeo.tp/org.aspectj" />
-                               <ref bean="org.argeo.tp.spring/org.springframework" />
-                               <ref bean="org.argeo.tp.apache.ant/org.apache.ant" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.io" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.fileupload" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.collections" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.dbcp" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.pool" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.codec" />
-                               <ref bean="org.argeo.tp.apache/org.apache.commons.httpclient" />
-                               <!-- 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="org.h2" />
+                               <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="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" />
+                               <ref bean="apache/org.apache.commons.dbcp" />
+                               <ref bean="apache/org.apache.commons.pool" />
+                               <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" />
+                               <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="org.argeo.tp.eclipse/org.argeo.tp.jetty" />
-                               <ref bean="org.argeo.tp.eclipse/org.argeo.tp.equinox" />
-                               <ref bean="org.argeo.tp.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" /> -->
+                               <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.addons" />
+
                                <!-- Jackrabbit -->
-                               <ref bean="org.argeo.tp.javax/javax.jcr" />
-<!--                           <ref bean="org.argeo.tp.apache/org.apache.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" />
                        </list>
                </property>
        </bean>
@@ -56,9 +87,9 @@
                <property name="nodeIndexers">
                        <list>
                                <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                                <bean class="org.argeo.slc.repo.JarFileIndexer" />
                                <bean class="org.argeo.slc.repo.ArtifactIndexer" />
+                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                        </list>
                </property>
                <property name="mirrors">