X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=b5cd3191ed3d59f7796e889520caefec0354eb54;hb=6d7df784c84312522054919737cadb83bc8afd51;hp=d9ae45fb8d9073a9e90574224a80ec2897d2bb6a;hpb=955364482218fe7a9a89d74932e10d2b21b6950f;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index d9ae45f..b5cd319 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,32 +8,69 @@
 	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">
-			<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" />
+				<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>
 
+	<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" />
@@ -43,27 +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="bndProperties">
-			<props>
-				<prop key="Export-Package">*</prop>
-			</props>
-		</property>
-	</bean>
-
 </beans>
\ No newline at end of file