X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=META-INF%2Fspring%2Fdistribution.xml;h=42ef629fef317b6493c301d3829b6a879a01a8af;hb=f1cbf91d380c86c3855b5e2b98a51afc98ed3cc6;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..42ef629 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -5,54 +5,124 @@
 	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.12" />
+		<property name="modules">
+			<list>
+				<!-- Javax -->
+				<ref bean="javax.inject" />
+				<ref bean="javax.jcr" />
+				<ref bean="javax.mail" />
+				<ref bean="javax.transaction" />
+				
+				<!-- Builder -->
+				<ref bean="biz.aQute.bnd" />
+				<ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" />
+
+				<!-- Standalone projects -->
+				<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="org.joda.time" />
+				<ref bean="com.jcraft.jsch" />
+				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
+				<ref bean="org.objectweb.asm" />
+				<ref bean="org.aspectj.weaver" />
+				<ref bean="misc/org.bouncycastle" />
+				<ref bean="apache/org.apache.ant" />
+				<ref bean="org.quartz-scheduler.quartz" />
+				<ref bean="org.quartz-scheduler.quartz.jobs" />
+				<ref bean="bitronix.tm" />
+
+				<!-- Apache Commons -->
+				<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" />
+				<ref bean="apache/org.apache.commons.vfs" />
+				<ref bean="apache/org.apache.commons.net" />
+				<ref bean="apache/org.apache.commons.exec" />
+				<ref bean="apache/org.apache.commons.jci" />
+				<ref bean="apache/org.apache.commons.compress" />
+
+				<!-- Eclipse -->
+				<ref bean="eclipse/org.argeo.tp.jetty" />
+				<ref bean="eclipse/org.argeo.tp.equinox" />
+				<ref bean="eclipse/org.argeo.tp.gemini" />
+
+				<!-- Eclipse RAP -->
+				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+				<ref bean="eclipse/org.argeo.tp.rap.addons" />
+
+				<!-- Jackrabbit -->
+				<ref bean="apache/org.apache.tika" />
+				<ref bean="apache/org.apache.lucene" />
+				<ref bean="apache/org.apache.jackrabbit" />
+				
+				<!-- Spring -->
+				<ref bean="spring/org.springframework" />
+<!-- 				<ref bean="org.springframework.ldap" /> -->
+<!-- 				<ref bean="spring/org.springframework.security" /> -->
+			</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.JarFileIndexer" />
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
 			</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 +132,4 @@
 			</list>
 		</property>
 	</bean>
-
 </beans>
\ No newline at end of file