From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 6 Jan 2018 14:13:53 +0000 (+0100)
Subject: Better separate various UI platforms. Reintroduce RCP.
X-Git-Tag: v2.3.9~62
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=b5802ca4cfd6bdbb00b3e7ce1b184d3309ff1931

Better separate various UI platforms. Reintroduce RCP.
---

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 0ba924e..382236b 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,11 +14,11 @@
 		<property name="modules">
 			<list>
 				<!-- Javax -->
-<!-- 				<ref bean="javax.inject" /> -->
+				<!-- <ref bean="javax.inject" /> -->
 				<ref bean="javax.jcr" />
 				<ref bean="javax.transaction" />
 				<ref bean="javax.mail" />
-<!-- 				<ref bean="javax.annotation" /> -->
+				<!-- <ref bean="javax.annotation" /> -->
 
 				<!-- Builder -->
 				<ref bean="biz.aQute.bnd" />
@@ -61,7 +61,7 @@
 				<ref bean="apache/org.apache.commons.vfs" />
 				<ref bean="apache/org.apache.commons.net" />
 				<ref bean="apache/org.apache.commons.exec" />
-<!-- 				<ref bean="apache/org.apache.commons.jxpath" /> -->
+				<!-- <ref bean="apache/org.apache.commons.jxpath" /> -->
 				<!-- <ref bean="apache/org.apache.commons.jci" /> -->
 				<ref bean="apache/org.apache.commons.compress" />
 				<ref bean="apache/org.apache.commons.lang3" />
@@ -71,12 +71,12 @@
 				<ref bean="com.google.gson" />
 
 				<!-- Eclipse -->
-<!-- 				<ref bean="eclipse/org.argeo.tp.jetty" /> -->
+				<!-- <ref bean="eclipse/org.argeo.tp.jetty" /> -->
 				<ref bean="eclipse/org.argeo.tp.equinox" />
 				<ref bean="eclipse/org.argeo.tp.gemini" />
 
 				<!-- Eclipse RAP -->
-				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+				<!-- <ref bean="eclipse/org.argeo.tp.rap.platform" /> -->
 
 				<!-- Jackrabbit -->
 				<ref bean="apache/org.apache.tika" />
@@ -111,6 +111,26 @@
 		</property>
 	</bean>
 
+	<bean id="argeo-tp-rcp-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg value="org.argeo.tp:argeo-tp-rcp-e4:2.1.20-SNAPSHOT" />
+		<property name="modules">
+			<list>
+				<ref bean="eclipse/org.argeo.tp.rcp.e4" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="argeo-tp-rap-e3" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg value="org.argeo.tp:argeo-tp-rap-e3:2.1.20-SNAPSHOT" />
+		<property name="modules">
+			<list>
+				<ref bean="eclipse/org.argeo.tp.rap.platform" />
+			</list>
+		</property>
+	</bean>
+
 	<!-- Factory -->
 	<bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
 		init-method="init" destroy-method="destroy">
@@ -162,6 +182,14 @@
 			<property name="osgiDistribution" ref="argeo-tp-rap-e4" />
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-rcp-e4" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-rap-e3" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
 	</flow:flow>
 
 	<!-- Security -->
diff --git a/META-INF/spring/eclipse.rap.e3.xml b/META-INF/spring/eclipse.rap.e3.xml
new file mode 100644
index 0000000..b0ded12
--- /dev/null
+++ b/META-INF/spring/eclipse.rap.e3.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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">
+
+	<!-- Eclipse rap platform -->
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
+		<flow:arg name="rapRelease" value="3.4" />
+		<flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
+	</flow:flow>
+
+	<!-- Rap specs and templates -->
+	<flow:spec id="rapVersion.spec">
+		<flow:primitive name="rapRelease" isParameter="true" />
+		<flow:primitive name="rapTimestamp" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.importRap" spec="rapVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/rap-@{rapTimestamp}.zip" />
+			<property name="includes">
+				<map>
+					<!-- 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" />
+					<entry key="plugins/org.eclipse.rap.fileupload*.jar" value="org.argeo.tp.rap.platform" />
+					<entry key="plugins/org.eclipse.rap.filedialog*.jar" value="org.argeo.tp.rap.platform" />
+
+					<!-- RAP UI with the workbench -->
+					<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" />
+
+					<!-- Misc -->
+					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
+				</map>
+			</property>
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+
+	<!-- Addons -->
+
+	<!-- 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.6" /> -->
+	<!-- <flow:arg name="rapTimestamp" value="0.6.0.v20150207" /> -->
+	<!-- </flow:flow> -->
+
+	<!-- <flow:flow id="template.importRapAddons" 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/@{rapRelease}/addons-@{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
diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
deleted file mode 100644
index b0ded12..0000000
--- a/META-INF/spring/eclipse.rap.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	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">
-
-	<!-- Eclipse rap platform -->
-	<flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-		<flow:arg name="rapRelease" value="3.4" />
-		<flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
-	</flow:flow>
-
-	<!-- Rap specs and templates -->
-	<flow:spec id="rapVersion.spec">
-		<flow:primitive name="rapRelease" isParameter="true" />
-		<flow:primitive name="rapTimestamp" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.importRap" spec="rapVersion.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/rap-@{rapTimestamp}.zip" />
-			<property name="includes">
-				<map>
-					<!-- 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" />
-					<entry key="plugins/org.eclipse.rap.fileupload*.jar" value="org.argeo.tp.rap.platform" />
-					<entry key="plugins/org.eclipse.rap.filedialog*.jar" value="org.argeo.tp.rap.platform" />
-
-					<!-- RAP UI with the workbench -->
-					<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" />
-
-					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
-				</map>
-			</property>
-			<property name="osgiFactory" ref="osgiFactory" />
-		</bean>
-	</flow:flow>
-
-	<!-- Addons -->
-
-	<!-- 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.6" /> -->
-	<!-- <flow:arg name="rapTimestamp" value="0.6.0.v20150207" /> -->
-	<!-- </flow:flow> -->
-
-	<!-- <flow:flow id="template.importRapAddons" 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/@{rapRelease}/addons-@{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
diff --git a/META-INF/spring/eclipse.rcp.e4.xml b/META-INF/spring/eclipse.rcp.e4.xml
new file mode 100644
index 0000000..d149bf4
--- /dev/null
+++ b/META-INF/spring/eclipse.rcp.e4.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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">
+
+	<!-- RCP 3.8 -->
+	<flow:flow name="eclipse/org.argeo.tp.rcp.e4" parent="template.eclipseRcp">
+		<flow:arg name="version" value="4.7.2" />
+		<flow:arg name="release" value="R-4.7.2-201711300510" />
+	</flow:flow>
+
+	<!-- RAP specs and templates -->
+	<flow:spec id="spec.eclipseRcp">
+		<flow:primitive name="version" isParameter="true" />
+		<flow:primitive name="release" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.eclipseRcp" spec="spec.eclipseRcp"
+		abstract="true">
+		<!-- RCP (platform + OS specific binaries) -->
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{version}" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/@{release}/org.eclipse.rcp.source-@{version}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rcp.e4" />
+				</map>
+			</property>
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+</beans>
\ No newline at end of file