From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 26 Mar 2018 16:28:29 +0000 (+0200)
Subject: Eclipse 4 packaging
X-Git-Tag: argeo-suite-2.1.13~62
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=217603edef20db7913cbe33c69110a323826f95f

Eclipse 4 packaging
---

diff --git a/dep/org.argeo.suite.dep.e4.rap/.gitignore b/dep/org.argeo.suite.dep.e4.rap/.gitignore
new file mode 100644
index 0000000..76df179
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rap/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/*.target
diff --git a/dep/org.argeo.suite.dep.e4.rap/META-INF/.gitignore b/dep/org.argeo.suite.dep.e4.rap/META-INF/.gitignore
new file mode 100644
index 0000000..4854a41
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rap/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/dep/org.argeo.suite.dep.e4.rap/bnd.bnd b/dep/org.argeo.suite.dep.e4.rap/bnd.bnd
new file mode 100644
index 0000000..991aa1a
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rap/bnd.bnd
@@ -0,0 +1 @@
+    
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.e4.rap/p2.inf b/dep/org.argeo.suite.dep.e4.rap/p2.inf
new file mode 100644
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rap/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
new file mode 100644
index 0000000..88c5e2d
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.suite</groupId>
+		<artifactId>dep</artifactId>
+		<version>0.1.13-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
+	<name>Suite E4 Platform</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<!-- Default Assembly for supported minimal set of Argeo Suite Features -->
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.cms</artifactId>
+			<version>0.1.13-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.e4</artifactId>
+			<version>0.1.13-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.e4.rap</artifactId>
+			<version>0.1.13-SNAPSHOT</version>
+		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.suite</groupId> -->
+<!-- 			<artifactId>org.argeo.suite.web</artifactId> -->
+<!-- 			<version>0.1.13-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
+
+		<!-- Base CMS distribution -->
+		<dependency>
+			<groupId>org.argeo.connect</groupId>
+			<artifactId>org.argeo.connect.dep.e4.rap</artifactId>
+			<version>${version.argeo-connect}</version>
+		</dependency>
+		
+		<!-- Argeo TP Extras -->
+		<dependency>
+			<groupId>org.argeo.tp.payment</groupId>
+			<artifactId>com.stripe</artifactId>
+		</dependency>
+		
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+									<includeGroupIds>org.argeo.suite</includeGroupIds>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-suite-e4</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>true</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-argeo</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-connect-e4-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/dep/pom.xml b/dep/pom.xml
index 72f8cdf..6874c75 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,6 +12,7 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.suite.platform</module>
+		<module>org.argeo.suite.dep.e4.rap</module>
 	</modules>
 	<build>
 		<plugins>
diff --git a/org.argeo.suite.cms/META-INF/.gitignore b/org.argeo.suite.cms/META-INF/.gitignore
index e69de29..4854a41 100644
--- a/org.argeo.suite.cms/META-INF/.gitignore
+++ b/org.argeo.suite.cms/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/org.argeo.suite.cms/bnd.bnd b/org.argeo.suite.cms/bnd.bnd
index c3c1aa0..4b4b9bc 100644
--- a/org.argeo.suite.cms/bnd.bnd
+++ b/org.argeo.suite.cms/bnd.bnd
@@ -11,4 +11,20 @@ Service-Component: OSGI-INF/systemAppService.xml,\
  OSGI-INF/resourcesMaintenanceService.xml,\
  OSGI-INF/peopleMaintenanceService.xml,\
  OSGI-INF/trackerMaintenanceService.xml
- 
\ No newline at end of file
+ 
+Import-Package: javax.jcr,\
+javax.transaction,\
+org.osgi.service.useradmin,\
+org.argeo.connect,\
+org.argeo.activities,\
+org.argeo.people,\
+org.argeo.documents,\
+org.argeo.tracker,\
+org.argeo.connect.resources,\
+org.argeo.connect.core,\
+org.argeo.activities.core,\
+org.argeo.people.core,\
+org.argeo.documents.core,\
+org.argeo.tracker.core,\
+org.argeo.connect.resources.core,\
+*
diff --git a/org.argeo.suite.cms/pom.xml b/org.argeo.suite.cms/pom.xml
new file mode 100644
index 0000000..8945b97
--- /dev/null
+++ b/org.argeo.suite.cms/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.suite</groupId>
+		<artifactId>argeo-suite</artifactId>
+		<version>0.1.13-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.suite.cms</artifactId>
+	<name>Suite Deployment</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.connect</groupId>
+			<artifactId>org.argeo.connect.core</artifactId>
+			<version>${version.argeo-connect}</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/org.argeo.suite.e4.rap/.gitignore b/org.argeo.suite.e4.rap/.gitignore
index ae3c172..09e3bc9 100644
--- a/org.argeo.suite.e4.rap/.gitignore
+++ b/org.argeo.suite.e4.rap/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/org.argeo.suite.e4.rap/META-INF/.gitignore b/org.argeo.suite.e4.rap/META-INF/.gitignore
index e69de29..4854a41 100644
--- a/org.argeo.suite.e4.rap/META-INF/.gitignore
+++ b/org.argeo.suite.e4.rap/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/org.argeo.suite.e4.rap/pom.xml b/org.argeo.suite.e4.rap/pom.xml
new file mode 100644
index 0000000..e94b1c2
--- /dev/null
+++ b/org.argeo.suite.e4.rap/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.suite</groupId>
+		<artifactId>argeo-suite</artifactId>
+		<version>0.1.13-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.suite.e4.rap</artifactId>
+	<name>Eclipse 4 RAP</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.suite</groupId>
+			<artifactId>org.argeo.suite.e4</artifactId>
+			<version>0.1.13-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.e4.rap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- Eclipse E4 -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp-rap-e4</artifactId>
+			<version>${version.argeo-tp}</version>
+			<type>pom</type>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/org.argeo.suite.e4/META-INF/.gitignore b/org.argeo.suite.e4/META-INF/.gitignore
index e69de29..4854a41 100644
--- a/org.argeo.suite.e4/META-INF/.gitignore
+++ b/org.argeo.suite.e4/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/org.argeo.suite.e4/bnd.bnd b/org.argeo.suite.e4/bnd.bnd
index a29c7f1..e4e7437 100644
--- a/org.argeo.suite.e4/bnd.bnd
+++ b/org.argeo.suite.e4/bnd.bnd
@@ -1,2 +1,17 @@
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/systemE4Service.xml,OSGI-INF/activitiesE4Service.xml,OSGI-INF/peopleE4Service.xml,OSGI-INF/documentsE4Service.xml
+Service-Component: OSGI-INF/systemE4Service.xml,\
+OSGI-INF/activitiesE4Service.xml,\
+OSGI-INF/peopleE4Service.xml,\
+OSGI-INF/documentsE4Service.xml
+
+Import-Package: org.eclipse.swt,\
+org.eclipse.core.commands.common,\
+javax.jcr.nodetype,\
+org.eclipse.e4.core.contexts,\
+org.argeo.connect.ui,\
+org.argeo.connect.e4,\
+org.argeo.activities.e4,\
+org.argeo.people.e4,\
+org.argeo.documents.e4,\
+org.argeo.tracker.e4,\
+*
diff --git a/org.argeo.suite.e4/pom.xml b/org.argeo.suite.e4/pom.xml
new file mode 100644
index 0000000..3e78d86
--- /dev/null
+++ b/org.argeo.suite.e4/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.suite</groupId>
+		<artifactId>argeo-suite</artifactId>
+		<version>0.1.13-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.suite.e4</artifactId>
+	<name>Eclipse 4</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.connect</groupId>
+			<artifactId>org.argeo.connect.e4</artifactId>
+			<version>${version.argeo-connect}</version>
+		</dependency>
+
+		<!-- Eclipse E4 -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp-rap-e4</artifactId>
+			<version>${version.argeo-tp}</version>
+			<type>pom</type>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index d68ade0..46dc56e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,19 @@
 	<description />
 	<version>0.1.13-SNAPSHOT</version>
 	<modules>
+		<!-- Web -->
 		<module>org.argeo.suite.web</module>
-		<module>org.argeo.suite.workbench.rap</module>
-		<!-- <module>org.argeo.suite.theme.argeo2</module> -->
-		<module>org.argeo.suite.apps</module>
 		<module>org.argeo.suite.apps.web</module>
+
+		<!-- Eclipse 4 -->
+		<module>org.argeo.suite.cms</module>
+		<module>org.argeo.suite.e4</module>
+		<module>org.argeo.suite.e4.rap</module>
+
+		<!-- Workbench -->
+		<module>org.argeo.suite.apps</module>
+		<module>org.argeo.suite.workbench.rap</module>
+
 		<module>dep</module>
 	</modules>
 	<properties>