X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fdistribution.xml;h=56ea078d96ec63a640780b2677902c6eceb54a99;hb=1eca051a1450429f2c5a6f4898329283c2649d24;hp=496d881e91fea2e91eeda5d99b76f7970849e74e;hpb=4e5ce28f625c47d17403c2a584fa5cd8121b5dda;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 496d881..56ea078 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -8,24 +8,35 @@
 	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.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.commons/org.apache.commons.io" />
+				<ref bean="org.argeo.tp.apache.commons/org.apache.commons.fileupload" />
 				<!-- 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" />
+				<!-- Gemini -->
+				<ref bean="org.argeo.tp.gemini/org.gemini.blueprint" />
+				<!-- <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" />
 			</list>
 		</property>
 	</bean>
@@ -33,11 +44,13 @@
 	<!-- 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="mirrors">
@@ -57,58 +70,31 @@
 				</entry>
 			</map>
 		</property>
-		<property name="javaRepository" ref="javaRepository" />
-		<property name="distRepository" ref="distRepository" />
-	</bean>
-
-	<bean
-		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-		<property name="authenticationManager" ref="authenticationManager" />
-		<property name="beanNames">
+		<property name="mavenRepositories">
 			<list>
-				<value>osgiFactory</value>
+				<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="org.argeo.tp" />
+			<property name="osgiDistribution" ref="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>
+	<!-- Security -->
+	<bean
+		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+		<property name="authenticationManager" ref="authenticationManager" />
+		<property name="beanNames">
+			<list>
+				<value>osgiFactory</value>
+			</list>
 		</property>
-		<property name="osgiFactory" ref="osgiFactory" />
 	</bean>
-
 </beans>
\ No newline at end of file