X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Forg.argeo.tp.rap.xml;h=9b7349396e7b3e7ec725162496e1d7d918dd16ca;hb=599838298beef142a5c1addfc13735e85d6397bc;hp=c9c3fd3750c59a5fffa353cc3d8154484fc4994f;hpb=34864e9fb29db71a671a5e4536f8034a06bde99b;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/org.argeo.tp.rap.xml
index c9c3fd3..9b73493 100644
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ b/META-INF/spring/org.argeo.tp.rap.xml
@@ -7,25 +7,78 @@
 	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">
 
-	<bean name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0-M1"
+	<!-- RAP 2.2 -->
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0"
 		parent="template.importRapZip">
-		<constructor-arg>
-			<map>
-				<entry key="rapBranch" value="2.2" />
-				<entry key="rapVersion" value="2.2.0-M1-20130821-1618" />
-			</map>
-		</constructor-arg>
-	</bean>
-
-	<bean name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-M1"
+		<flow:arg name="rapBranch" value="2.2" />
+		<flow:arg name="rapVersion" value="2.2.0-R-20131204-0942" />
+	</flow:flow>
+
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0-M1"
 		parent="template.importRapZip">
-		<constructor-arg>
-			<map>
-				<entry key="rapBranch" value="2.1" />
-				<entry key="rapVersion" value="2.1.0-M1-20130318-2137" />
-			</map>
-		</constructor-arg>
-	</bean>
+		<flow:arg name="rapBranch" value="2.2" />
+		<flow:arg name="rapVersion" value="2.2.0-M1-20130821-1618" />
+	</flow:flow>
+
+	<!-- RAP ADDONS - experimental: use a zip that has been manually uploaded 
+		in the dist repo -->
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.addons_0.2.0"
+		parent="template.importRapAddonsZip">
+		<flow:arg name="rapBranch" value="2.2" />
+		<flow:arg name="rapVersion" value="0.2.0.20131212-1229" />
+	</flow:flow>
+
+	<flow:flow id="template.importRapAddonsZip" spec="rapVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{rapVersion}" />
+			<property name="mavenGroupIndexes" value="true" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-addons-@{rapVersion}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" />
+				</map>
+			</property>
+			<property name="osgiFactory">
+				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+					init-method="init" destroy-method="destroy">
+					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
+
+					<property name="nodeIndexers">
+						<list>
+							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+							<bean class="org.argeo.slc.repo.JarFileIndexer" />
+							<!-- Works with SLC 1.1.17+ <bean class="org.argeo.slc.repo.ModularDistributionIndexer" 
+								/> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" /> -->
+						</list>
+					</property>
+					<property name="javaRepository" ref="javaRepository" />
+					<property name="distRepository" ref="distRepository" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+
+	<!-- RAP 2.1 -->
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.2"
+		parent="template.importRapZip">
+		<flow:arg name="rapBranch" value="2.1" />
+		<flow:arg name="rapVersion" value="2.1.2-R-20140210-0628" />
+	</flow:flow>
+
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-R"
+		parent="template.importRapZip">
+		<flow:arg name="rapBranch" value="2.1" />
+		<flow:arg name="rapVersion" value="2.1.0-R-20130611-2139" />
+	</flow:flow>
+
+	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-M1"
+		parent="template.importRapZip">
+		<flow:arg name="rapBranch" value="2.1" />
+		<flow:arg name="rapVersion" value="2.1.0-M1-20130318-2137" />
+	</flow:flow>
 
 	<!-- RAP specs and templates -->
 	<flow:spec id="rapVersion.spec">
@@ -35,15 +88,69 @@
 
 	<flow:flow id="template.importRapZip" spec="rapVersion.spec"
 		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ImportBundlesZip">
-			<property name="workspace" value="org.argeo.tp.rap-@{rapBranch}.x" />
-			<property name="groupId" value="org.argeo.tp.rap.platform" />
-			<property name="zipFile"
-				value="http://mirror.netcologne.de/eclipse//rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" />
-			<property name="repository" ref="javaRepository" />
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{rapVersion}" />
+			<property name="mavenGroupIndexes" value="true" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rap.platform" />
+				</map>
+			</property>
+			<property name="osgiFactory">
+				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+					init-method="init" destroy-method="destroy">
+					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
+					<property name="mirrors">
+						<map>
+							<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>
+					</property>
+
+					<property name="nodeIndexers">
+						<list>
+							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+							<bean class="org.argeo.slc.repo.JarFileIndexer" />
+							<!-- Works with SLC 1.1.17+ <bean class="org.argeo.slc.repo.ModularDistributionIndexer" 
+								/> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" /> -->
+						</list>
+					</property>
+					<property name="javaRepository" ref="javaRepository" />
+					<property name="distRepository" ref="distRepository" />
+				</bean>
+			</property>
 		</bean>
 	</flow:flow>
 
+
+
+
+	<!-- WORK IN PROGRESS add bundle from the incubator to the platform <flow:flow 
+		id="org.argeo.tp.rap.addons/org.argeo.tp.rap.dropdown_2.2" spec="rapVersion.spec" 
+		abstract="true"> <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" 
+		value="0.2.0.20131212-1229" /> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> 
+		<property name="version" value="@{rapVersion}" /> <property name="mavenGroupIndexes" 
+		value="true" /> <property name="uri" value="file:///tmp/" /> <property name="includes"> 
+		<map> <entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" /> </map> 
+		</property> <property name="osgiFactory"> <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" 
+		init-method="init" destroy-method="destroy"> <property name="workspace" value="eclipse-rap-@{rapBranch}" 
+		/> <property name="mirrors"> <map> <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> </property> <property name="nodeIndexers"> <list> 
+		<bean class="org.argeo.slc.repo.ArtifactIndexer" /> <bean class="org.argeo.slc.repo.JarFileIndexer" 
+		/> <bean class="org.argeo.slc.repo.ModularDistributionIndexer" /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" 
+		/> </list> </property> <property name="javaRepository" ref="javaRepository" 
+		/> <property name="distRepository" ref="distRepository" /> </bean> </property> 
+		</bean> </flow:flow> -->
+
 	<!-- Import bundles zip -->
 	<!-- <flow:spec id="importZip.spec"> -->
 	<!-- <flow:primitive name="groupId" /> -->