Upgrade to rap 2.3.2 service release
[gpl/argeo-tp.git] / META-INF / spring / distribution.xml
index 1c2b8cb753ca69fd89d011cdd1743a767afe3fd3..894e44056eafab113809089c463c812ccfdf3b4b 100644 (file)
@@ -8,24 +8,68 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
        <!-- REGISTER -->
-       <bean id="org.argeo.tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistribution"
+       <bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:org.argeo.tp:2.1.1" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.8" />
                <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" />
-                               <ref bean="org.argeo.tp/org.aopalliance" />
-                               <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" />
-                               <!-- 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" />
+                               <!-- Javax -->
+                               <ref bean="javax.inject" />
+                               <ref bean="javax.jcr" />
+                               <ref bean="javax.mail" />
+                               
+                               <!-- 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="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" />
+
+                               <!-- 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" />
+
+                               <!-- 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" />
+                               <ref bean="eclipse/org.argeo.tp.rap.addons" />
+
+                               <!-- 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" />
+                               <ref bean="org.springframework.ldap" />
+                               <ref bean="spring/org.springframework.security" />
                        </list>
                </property>
        </bean>
                <property name="workspace" value="argeo-tp-2.1" />
                <property name="nodeIndexers">
                        <list>
-                               <bean class="org.argeo.slc.repo.ArtifactIndexer" />
+                               <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
                                <bean class="org.argeo.slc.repo.JarFileIndexer" />
-                               <!--  Added by BSinou - To be checked -->
-                               <!--  <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />  -->
+                               <bean class="org.argeo.slc.repo.ArtifactIndexer" />
+                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
                        </list>
                </property>
                <property name="mirrors">
                        <map>
                                <entry key="http://archive.apache.org/dist">
                                        <list>
-                                               <value>http://mirror.derwebwolf.net/apache</value>
+                                               <value>http://mirror.netcologne.de/apache.org</value>
                                                <value>http://archive.apache.org/dist</value>
                                        </list>
                                </entry>
                                </entry>
                        </map>
                </property>
-               <property name="javaRepository" ref="javaRepository" />
-               <property name="distRepository" ref="distRepository" />
-       </bean>
-
-       <bean
-               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <property name="authenticationManager" ref="authenticationManager" />
-               <property name="beanNames">
+               <property name="mavenRepositories">
                        <list>
-                               <value>osgiFactory</value>
+                               <value>http://repo1.maven.org/maven2/</value>
+                               <value>http://download.eclipse.org/gemini/mvn/</value>
                        </list>
                </property>
+               <property name="javaRepository" ref="javaRepository" />
+               <property name="distRepository" ref="distRepository" />
        </bean>
 
        <flow:flow name="processDistribution">
                <bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
-                       <property name="osgiDistribution" ref="org.argeo.tp" />
+                       <property name="osgiDistribution" ref="argeo-tp" />
                        <property name="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>
 
-       <!-- Specs and templates -->
-       <flow:spec id="spec.version">
-               <flow:primitive name="version" isParameter="true" />
-       </flow:spec>
-
-       <bean id="template.archiveWrapper" class="org.argeo.slc.repo.osgi.ArchiveWrapper"
-               init-method="init" destroy-method="destroy" abstract="true">
-               <property name="version" value="@{version}" />
-               <property name="osgiFactory" ref="osgiFactory" />
-       </bean>
-
-       <!-- Must be a prototype since wrapper are stateful objects, properties 
-               such as version can be set by caller. -->
-       <bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
-               abstract="true" scope="prototype">
-               <property name="groupId" value="org.argeo.tp" />
-               <property name="bndProperties">
-                       <props>
-                               <prop key="Export-Package">*</prop>
-                       </props>
-               </property>
-       </bean>
-       <bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
-               abstract="true" scope="prototype">
-               <property name="groupId" value="org.argeo.tp" />
-               <property name="bndProperties">
-                       <props>
-                               <prop key="Export-Package">*</prop>
-                       </props>
+       <!-- Security -->
+       <bean
+               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+               <property name="authenticationManager" ref="authenticationManager" />
+               <property name="beanNames">
+                       <list>
+                               <value>osgiFactory</value>
+                       </list>
                </property>
-               <property name="osgiFactory" ref="osgiFactory" />
        </bean>
-
-</beans>
+</beans>
\ No newline at end of file