Merge branch 'master' of

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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index dcec9d1c71f90a9114bb92e0f559f5dcc7fb1aa9..1c2b8cb753ca69fd89d011cdd1743a767afe3fd3 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -12,24 +12,54 @@
                init-method="init" destroy-method="destroy">
                <constructor-arg value="org.argeo.tp:org.argeo.tp:2.1.1" />
                <property name="modules">
-                       <set>
-                               <!-- <ref bean="org.slf4j.log4j12" /> -->
-                               <!-- <ref bean="org.slf4j.api" /> -->
-                               <!-- <ref bean="org.slf4j.commons.logging" /> -->
-                       </set>
+                       <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" />
+                       </list>
                </property>
        </bean>
 
        <!-- Factory -->
        <bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
                init-method="init" destroy-method="destroy">
-               <property name="workspace" value="org.argeo.tp-2.1.x" />
+               <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.JarFileIndexer" />
+                               <!--  Added by BSinou - To be checked -->
+                               <!--  <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                               <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://archive.apache.org/dist</value>
+                                       </list>
+                               </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>
+                                       </list>
+                               </entry>
+                       </map>
+               </property>
                <property name="javaRepository" ref="javaRepository" />
                <property name="distRepository" ref="distRepository" />
        </bean>
@@ -44,6 +74,13 @@
                </property>
        </bean>
 
+       <flow:flow name="processDistribution">
+               <bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+                       <property name="osgiDistribution" ref="org.argeo.tp" />
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
+       </flow:flow>
+
        <!-- Specs and templates -->
        <flow:spec id="spec.version">
                <flow:primitive name="version" isParameter="true" />
@@ -55,13 +92,26 @@
                <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">
+               abstract="true" scope="prototype">
+               <property name="groupId" value="org.argeo.tp" />
                <property name="bndProperties">
-                       <value>
-                               Export-Package=*
-                       </value>
+                       <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>
+               </property>
+               <property name="osgiFactory" ref="osgiFactory" />
+       </bean>
 
-</beans>
\ No newline at end of file
+</beans>