Merge branch 'master' of

ssh://bsinou@git.argeo.org:322/var/lib/git/git.argeo.org/org.argeo.tp.slc.factory.git/

Conflicts:
	META-INF/MANIFEST.MF
	pom.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 496d881e91fea2e91eeda5d99b76f7970849e74e..1c2b8cb753ca69fd89d011cdd1743a767afe3fd3 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -33,11 +33,14 @@
        <!-- 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.JarFileIndexer" />
+                               <!--  Added by BSinou - To be checked -->
+                               <!--  <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+                               <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />  -->
                        </list>
                </property>
                <property name="mirrors">
@@ -111,4 +114,4 @@
                <property name="osgiFactory" ref="osgiFactory" />
        </bean>
 
-</beans>
\ No newline at end of file
+</beans>

diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/org.argeo.tp.rap.xml
index 83f1b4f0d74369ea839866b73d04b563370bdb5d..9b7349396e7b3e7ec725162496e1d7d918dd16ca 100644 (file)
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ b/META-INF/spring/org.argeo.tp.rap.xml
@@ -8,13 +8,66 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <!-- RAP 2.2 -->
+       <flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0"
+               parent="template.importRapZip">
+               <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">
                <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" />
@@ -48,7 +101,7 @@
                        <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="workspace" value="eclipse-rap-@{rapBranch}" />
                                        <property name="mirrors">
                                                <map>
                                                        <entry key="http://www.eclipse.org/downloads">
@@ -65,6 +118,8 @@
                                                <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" />
@@ -74,6 +129,28 @@
                </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" /> -->