X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=c905ec0b0e57969a7aa299403b661600e33158f7;hb=b02978b5e3cb89efc0d09e13e746e19ed86b5446;hp=3c1eef0d6a571c05186864954e5512ab4a177a6c;hpb=0e6c2a855b169c40d38d63bf1b7a581b9f4a25fb;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 3c1eef0..c905ec0 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,16 +8,24 @@
 	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.1" />
 		<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.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,11 +33,13 @@
 	<!-- 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" />
+				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
 			</list>
 		</property>
 		<property name="mirrors">
@@ -53,6 +63,14 @@
 		<property name="distRepository" ref="distRepository" />
 	</bean>
 
+	<flow:flow name="processDistribution">
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+
+	<!-- Security -->
 	<bean
 		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
 		<property name="authenticationManager" ref="authenticationManager" />
@@ -62,38 +80,4 @@
 			</list>
 		</property>
 	</bean>
-
-	<!-- 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>
-		</property>
-		<property name="osgiFactory" ref="osgiFactory" />
-	</bean>
-
 </beans>
\ No newline at end of file