X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Feclipse.rap.xml;h=4c651242555c1d8a025d27fd5342ffa255fd0fd2;hb=870bdf5efa0679c29a3fb340c50b47ef81504c64;hp=068d67b36e1dd92895a91fdae7d0b87ee60241e1;hpb=71ff27e0c1650c4ed15c3bbda082d13bdb56d6e0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 068d67b..4c65124 100644
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -8,12 +8,9 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- Eclipse rap platform -->
-	<!-- <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap"> 
-		<flow:arg name="rapRelease" value="2.3" /> <flow:arg name="rapTimestamp" 
-		value="2.3.1-SR1-20140909-1638" /> </flow:flow> -->
 	<flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-		<flow:arg name="rapRelease" value="2.2" />
-		<flow:arg name="rapTimestamp" value="2.2.0-R-20131204-0942" />
+		<flow:arg name="rapRelease" value="2.3" />
+		<flow:arg name="rapTimestamp" value="2.3.2-SR2-20150128-1013" />
 	</flow:flow>
 
 	<!-- Rap specs and templates -->
@@ -29,54 +26,40 @@
 				value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/rap-@{rapTimestamp}.zip" />
 			<property name="includes">
 				<map>
-					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
-
-					<!-- Javax -->
-					<entry key="plugins/javax.xml_*.jar" value="org.argeo.tp.rap.platform" />
-					<!-- Provided by jetty -->
-					<!-- <entry key="plugins/javax.servlet_*.jar" value="org.argeo.tp.rap.platform" 
-						/> -->
-
 					<!-- Eclipse core -->
 					<entry key="plugins/org.eclipse.core.*.jar" value="org.argeo.tp.rap.platform" />
 
 					<!-- RWT -->
 					<entry key="plugins/org.eclipse.rap.rwt_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.rwt.source_*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.rwt.osgi_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar" value="org.argeo.tp.rap.platform" />
 
 					<!-- RAP UI with the workbench -->
-					<!-- Note: we do not include ui.cheatsheets for the time being -->
 					<entry key="plugins/org.eclipse.rap.ui.workbench*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui_*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.ui.source_*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui.views*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.jface*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.rap.ui.forms*.jar" value="org.argeo.tp.rap.platform" />
 					<entry key="plugins/org.eclipse.help*.jar" value="org.argeo.tp.rap.platform" />
 
-					<!-- Minimal Equinox dependencies, to be refined -->
-					<entry key="plugins/org.eclipse.equinox.*.jar" value="org.argeo.tp.rap" />
+					<!-- Misc -->
+					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
 				</map>
 			</property>
-			<property name="excludes">
-				<list>
-					<value><![CDATA[plugins/org.eclipse.equinox.console*.jar]]></value>
-				</list>
-			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>
 
-	<!-- File upload Addons -->
+	<!-- Addons -->
 
-	<!-- !!!! WARNING !!!! The corresponding zip must be manually imported in 
-		corresponding workspace of the dist repo at path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ 
-		until we implement a cleaner way to directly retrieve the corresponding jars 
-		for eclipse repository -->
+	<!-- The corresponding zip must be manually imported in the dist repo at 
+		path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ -->
 
 	<flow:flow name="eclipse/org.argeo.tp.rap.addons" parent="template.importRapAddons">
-		<flow:arg name="rapRelease" value="0.5" />
-		<flow:arg name="rapTimestamp" value="0.5.0.argeo.20150109" />
+		<flow:arg name="rapRelease" value="0.6" />
+		<flow:arg name="rapTimestamp" value="0.6.0.v20150207" />
 	</flow:flow>
 
 	<flow:flow id="template.importRapAddons" spec="rapVersion.spec"
@@ -92,17 +75,4 @@
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>
-	<!-- !!!! WARNING !!!! The corresponding zip must be manually imported in 
-		corresponding workspace of the dist repo at path org/eclipse/www/downloads/rt/rap/addons/fileupload/@{rapRelease}/ 
-		until we implement a cleaner way to directly retrieve the corresponding jars 
-		for eclipse repository -->
-
-	<!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons.fileupload" parent="template.importRapFileUpload"> 
-		<flow:arg name="rapRelease" value="0.6" /> <flow:arg name="rapTimestamp" 
-		value="0.6.0-20140611-1558" /> </flow:flow> <flow:flow id="template.importRapFileUpload" 
-		spec="rapVersion.spec" abstract="true"> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> 
-		<property name="uri" value="http://www.eclipse.org/downloads/rt/rap/addons/fileupload/@{rapRelease}/fileupload-@{rapTimestamp}.zip" 
-		/> <property name="includes"> <map> <entry key="plugins/org.eclipse.rap.addons.*.jar" 
-		value="org.argeo.tp.rap" /> </map> </property> <property name="osgiFactory" 
-		ref="osgiFactory" /> </bean> </flow:flow> -->
 </beans>
\ No newline at end of file