X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=e7c6246239f50dc515b873d13033b3b6ff2d356d;hb=73f682918f55df00a2fcdba9dff486e95c93c17d;hp=64d3f44b83b05221931268eaa6b36783ccda49b8;hpb=07c5218be139107a564491388390af16b0208c15;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 64d3f44..e7c6246 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -5,8 +5,30 @@
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+	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"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg value="org.argeo.tp:org.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.argeo.tp.spring/org.springframework" />
+				<!-- 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" />
@@ -16,43 +38,27 @@
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
 			</list>
 		</property>
-		<property name="javaRepository" ref="javaRepository" />
-		<property name="distRepository" ref="distRepository" />
-	</bean>
-
-	<bean name="org.argeo.tp/org.slf4j" parent="template.wrapDistribution">
-		<constructor-arg>
+		<property name="mirrors">
 			<map>
-				<entry key="version" value="1.7.5" />
+				<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>
-		</constructor-arg>
+		</property>
+		<property name="javaRepository" ref="javaRepository" />
+		<property name="distRepository" ref="distRepository" />
 	</bean>
 
-	<!-- Specs and templates -->
-	<flow:spec id="wrapDistribution.spec">
-		<flow:primitive name="version" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.wrapDistribution" spec="wrapDistribution.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.DistributionWrapper">
-			<property name="groupId" value="org.argeo.tp" />
-			<property name="uri"
-				value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
-			<property name="wrappers">
-				<map>
-					<entry key="slf4j-@{version}/slf4j-api-@{version}.jar">
-						<bean class="org.argeo.slc.repo.osgi.BndWrapper">
-							<property name="bsn" value="org.slf4j.api" />
-							<property name="version" value="@{version}" />
-						</bean>
-					</entry>
-				</map>
-			</property>
-			<property name="osgiFactory" ref="osgiFactory" />
-		</bean>
-	</flow:flow>
-
 	<bean
 		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
 		<property name="authenticationManager" ref="authenticationManager" />
@@ -63,4 +69,44 @@
 		</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" />
+	</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