Work on Argeo TP v2.1.19

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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index f0d44756a2e753f04f548b53ed0813e91134c08c..b532eb4a5dad81338dae13fbcb33e79ff515f215 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- 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.15" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.19" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -21,26 +21,33 @@
 
                                <!-- 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" />
+
+                               <!-- 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" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -53,8 +60,10 @@
                                <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.jxpath" />
+                               <!-- <ref bean="apache/org.apache.commons.jci" /> -->
                                <ref bean="apache/org.apache.commons.compress" />
+                               <ref bean="apache/org.apache.commons.lang3" />
 
                                <!-- Google -->
                                <ref bean="com.google.guava" />
@@ -67,7 +76,6 @@
 
                                <!-- Eclipse RAP -->
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />
-                               <!-- <ref bean="eclipse/org.argeo.tp.rap.addons" /> -->
 
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />
@@ -81,14 +89,13 @@
                                <ref bean="net.sf.jxl" />
                                <ref bean="apache/org.apache.pdfbox" />
                                <!-- 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>
@@ -115,9 +122,12 @@
                                </entry>
                                <entry key="http://www.eclipse.org/downloads">
                                        <list>
-                                               <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>
@@ -141,12 +151,5 @@
 
        <!-- Security -->
        <bean
-               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <!-- <property name="beanNames"> -->
-               <!-- <list> -->
-               <!-- <value>osgiFactory</value> -->
-               <!-- <value>argeo-tp</value> -->
-               <!-- </list> -->
-               <!-- </property> -->
-       </bean>
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />
 </beans>
\ No newline at end of file