Merge branch 'master' of

ssh://bsinou@git.argeo.org:322/var/lib/git/git.argeo.org/org.argeo.tp.slc.factory.git/

Conflicts:
	META-INF/MANIFEST.MF
	pom.xml

diff --combined META-INF/spring/distribution.xml
index 23bc0717ed8ab72af673a1de9518d0609b255c26,496d881e91fea2e91eeda5d99b76f7970849e74e..1c2b8cb753ca69fd89d011cdd1743a767afe3fd3
--- 1/META-INF/spring/distribution.xml
--- 2/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@@ -17,7 -17,15 +17,15 @@@
                                <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>
@@@ -25,14 -33,11 +33,14 @@@
        <!-- 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">
@@@ -66,6 -71,13 +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" />
@@@ -99,4 -111,4 +114,4 @@@
                <property name="osgiFactory" ref="osgiFactory" />
        </bean>
  
--</beans>
++</beans>