From b5802ca4cfd6bdbb00b3e7ce1b184d3309ff1931 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 6 Jan 2018 15:13:53 +0100
Subject: [PATCH] Better separate various UI platforms. Reintroduce RCP.

---
 META-INF/spring/distribution.xml              | 38 ++++++++++++++++---
 .../{eclipse.rap.xml => eclipse.rap.e3.xml}   |  0
 META-INF/spring/eclipse.rcp.e4.xml            | 37 ++++++++++++++++++
 3 files changed, 70 insertions(+), 5 deletions(-)
 rename META-INF/spring/{eclipse.rap.xml => eclipse.rap.e3.xml} (100%)
 create mode 100644 META-INF/spring/eclipse.rcp.e4.xml

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.xml b/META-INF/spring/eclipse.rap.e3.xml
similarity index 100%
rename from META-INF/spring/eclipse.rap.xml
rename to META-INF/spring/eclipse.rap.e3.xml
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
-- 
2.30.2