Working rap Eclipse 4

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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 8edad39764f972aea30609863c736d899384d2a6..0ba924e52cbcb8283ba2ee82d2dd6076ae484cfd 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,37 +10,45 @@
        <!-- 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.17" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.20-SNAPSHOT" />
                <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" />
+
+                               <!-- 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,7 +61,8 @@
                                <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" />
 
@@ -62,7 +71,7 @@
                                <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" />
 
@@ -81,14 +90,23 @@
                                <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>
+
+       <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.20-SNAPSHOT" />
+               <property name="modules">
+                       <list>
+                               <ref bean="eclipse/org.argeo.tp.rap.e4" />
                        </list>
                </property>
        </bean>
@@ -115,10 +133,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 +158,10 @@
                        <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>
        </flow:flow>
 
        <!-- Security -->