Adapt to new features of SLC v1.1.14

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 4329111804571269cce068c98137708076c2c0ca..d9ae45fb8d9073a9e90574224a80ec2897d2bb6a 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -55,8 +55,10 @@
                <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">
+               abstract="true" scope="prototype">
                <property name="bndProperties">
                        <props>
                                <prop key="Export-Package">*</prop>

diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/org.argeo.tp.rap.xml
index c9c3fd3750c59a5fffa353cc3d8154484fc4994f..83f1b4f0d74369ea839866b73d04b563370bdb5d 100644 (file)
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ b/META-INF/spring/org.argeo.tp.rap.xml
@@ -7,25 +7,25 @@
        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-M1"
                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-M1-20130821-1618" />
+       </flow:flow>
+
+       <!-- RAP 2.1 -->
+       <flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-R"
                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.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,12 +35,42 @@
 
        <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="org.argeo.tp.rap-@{rapBranch}.x" />
+                                       <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" />
+                                               </list>
+                                       </property>
+                                       <property name="javaRepository" ref="javaRepository" />
+                                       <property name="distRepository" ref="distRepository" />
+                               </bean>
+                       </property>
                </bean>
        </flow:flow>