Add RCP support

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 88c5e2de72d6631fdd4d005d49d9d3f9ff281e99..022b35e72277a91526a894e5c6c76859daa237f0 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -9,7 +9,7 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-       <name>Suite E4 Platform</name>
+       <name>Suite E4 Platform RAP</name>
        <packaging>jar</packaging>
        <dependencies>
                <!-- Default Assembly for supported minimal set of Argeo Suite Features -->

diff --git a/dep/org.argeo.suite.dep.e4.rcp/.gitignore b/dep/org.argeo.suite.dep.e4.rcp/.gitignore
new file mode 100644 (file)
index 0000000..76df179
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rcp/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/*.target

diff --git a/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore b/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF

diff --git a/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd b/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd
new file mode 100644 (file)
index 0000000..991aa1a
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd
@@ -0,0 +1 @@
+    
\ No newline at end of file

diff --git a/dep/org.argeo.suite.dep.e4.rcp/p2.inf b/dep/org.argeo.suite.dep.e4.rcp/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rcp/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.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
new file mode 100644 (file)
index 0000000..02d06ab
--- /dev/null
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -0,0 +1,112 @@
+<?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.rcp</artifactId>
+       <name>Suite E4 Platform RCP</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> -->
+
+               <!-- Base CMS distribution -->
+               <dependency>
+                       <groupId>org.argeo.connect</groupId>
+                       <artifactId>org.argeo.connect.dep.e4.rcp</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 6874c75612c70dbd4f96d6171cafd08943863a6b..35b76e7e04217e41828d0a32a639e7cd9d4279ae 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -13,6 +13,7 @@
        <modules>
                <module>org.argeo.suite.platform</module>
                <module>org.argeo.suite.dep.e4.rap</module>
+               <module>org.argeo.suite.dep.e4.rcp</module>
        </modules>
        <build>
                <plugins>

diff --git a/sdk/argeo-suite-desktop.properties b/sdk/argeo-suite-desktop.properties
new file mode 100644 (file)
index 0000000..80d51c5
--- /dev/null
+++ b/sdk/argeo-suite-desktop.properties
@@ -0,0 +1,23 @@
+argeo.osgi.start.2.node=\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.metatype,\
+org.eclipse.equinox.cm,\
+
+argeo.osgi.start.3.node=\
+org.argeo.cms
+
+applicationXMI=org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
+#applicationXMI=org.argeo.cms.e4.rcp/argeo-companion.e4xmi
+
+lifeCycleURI=bundleclass://org.argeo.cms.e4.rcp/org.argeo.cms.e4.rcp.CmsRcpLifeCycle
+clearPersistedState=true
+#argeo.cms.desktop.inTray=true
+
+org.osgi.service.http.port=7070
+
+log4j.configuration=file:../../log4j.properties
+argeo.node.useradmin.uris=os:///
+eclipse.application=org.argeo.cms.e4.rcp.CmsE4Application
+#eclipse.application=org.eclipse.e4.ui.workbench.swt.E4Application
+org.eclipse.equinox.http.jetty.autostart=false