X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=dca4302d1a159ab73c119f9c2306b977c7000ac1;hb=fb71a8c62deecc47a8bc6ad707676d7bb223daee;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..dca4302 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -5,54 +5,97 @@
 	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="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
+		<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.aopalliance" />
+				<ref bean="org.junit" />
+				<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" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.io" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.fileupload" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.collections" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.dbcp" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.pool" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.codec" />
+				<ref bean="org.argeo.tp.apache/org.apache.commons.httpclient" />
+				<!-- 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" /> -->
+				<!-- Eclipse -->
+				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.jetty" />
+				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.equinox" />
+				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.gemini" />
+				<!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
+				<!-- <ref bean="org.eclipse.gemini.web.core" /> -->
+				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
+				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
+				<!-- Jackrabbit -->
+				<ref bean="org.argeo.tp.javax/javax.jcr" />
+<!-- 				<ref bean="org.argeo.tp.apache/org.apache.jackrabbit" /> -->
+			</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.ModularDistributionIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
 			</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.netcologne.de/apache.org</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="mavenRepositories">
+			<list>
+				<value>http://repo1.maven.org/maven2/</value>
+				<value>http://download.eclipse.org/gemini/mvn/</value>
+			</list>
+		</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>
+	<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,5 +105,4 @@
 			</list>
 		</property>
 	</bean>
-
 </beans>
\ No newline at end of file