X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=a48117be61498aabb886db64237f2e6bef48cd20;hb=97978829285da021d51bcca60c24be4fc3e70bde;hp=23bc0717ed8ab72af673a1de9518d0609b255c26;hpb=f495b41a0fe7fce06687fa13185693664dd26515;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 23bc071..a48117b 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,16 +8,50 @@
 	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.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.argeo.tp/org.aopalliance" />
-				<ref bean="org.argeo.tp.spring/org.springframework" />
+				<ref bean="apache/org.apache.log4j" />
+				<ref bean="misc/org.slf4j" />
+				<ref bean="org.aopalliance" />
+				<ref bean="org.junit" />
+				<ref bean="org.h2" />
+				<ref bean="javax.el" />
+				<ref bean="javax.inject" />
+				<ref bean="misc/org.aspectj" />
+				<ref bean="misc/org.bouncycastle" />
+				<ref bean="spring/org.springframework" />
+				<ref bean="org.springframework.ldap" />
+				<ref bean="spring/org.springframework.security" />
+				<ref bean="apache/org.apache.ant" />
+				<ref bean="apache/org.apache.commons.io" />
+				<ref bean="apache/org.apache.commons.fileupload" />
+				<ref bean="apache/org.apache.commons.collections" />
+				<ref bean="apache/org.apache.commons.dbcp" />
+				<ref bean="apache/org.apache.commons.pool" />
+				<ref bean="apache/org.apache.commons.codec" />
+				<ref bean="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="eclipse/org.argeo.tp.jetty" />
+				<ref bean="eclipse/org.argeo.tp.equinox" />
+				<ref bean="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="javax/javax.jcr" />
+				<ref bean="apache/org.apache.tika" />
+				<ref bean="apache/org.apache.lucene" />
+				<ref bean="apache/org.apache.jackrabbit" />
 			</list>
 		</property>
 	</bean>
@@ -28,18 +62,17 @@
 		<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" />
-				<!--  Added by BSinou - To be checked -->
-				<!--  <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">
 			<map>
 				<entry key="http://archive.apache.org/dist">
 					<list>
-						<value>http://mirror.derwebwolf.net/apache</value>
+						<value>http://mirror.netcologne.de/apache.org</value>
 						<value>http://archive.apache.org/dist</value>
 					</list>
 				</entry>
@@ -52,10 +85,24 @@
 				</entry>
 			</map>
 		</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>
 
+	<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" />
@@ -65,38 +112,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