projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 66a14b8)
RCP RPMs
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 28 Oct 2018 15:23:52 +0000 (16:23 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 28 Oct 2018 15:23:52 +0000 (16:23 +0100)
dep/org.argeo.dep.cms.client/pom.xml patch | blob | history
dep/org.argeo.dep.cms.e4.rap/pom.xml patch | blob | history
dep/org.argeo.dep.cms.node/pom.xml patch | blob | history
dep/org.argeo.dep.cms.platform/pom.xml patch | blob | history
org.argeo.cms.e4/bnd.bnd patch | blob | history
rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml patch | blob | history
rcp/dep/pom.xml patch | blob | history
rcp/dist/argeo-companion/rpm/etc/argeo-companion/argeo-companion.ini [new file with mode: 0644] patch | blob
rcp/dist/argeo-companion/rpm/etc/argeo-companion/log4j.properties [new file with mode: 0644] patch | blob
rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion [new file with mode: 0755] patch | blob

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index a3b02e8641e107f7d2ef752135d5b8a1992f3afb..51eed5145df4e05f09c321b258eff3e0c41fc078 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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.commons</groupId>
@@ -112,6 +114,8 @@
                        <groupId>org.argeo.tp.javax</groupId>
                        <artifactId>javax.servlet</artifactId>
                </dependency>
+
+               <!-- Equinox -->
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.osgi.util</artifactId>
@@ -256,28 +260,28 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-<!--                                   <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.commons</includeGroupIds> -->
-<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeScope>runtime</includeScope> -->
-<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
+                                       <!-- <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.commons</includeGroupIds> -->
+                                       <!-- <excludeTransitive>true</excludeTransitive> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <includeScope>runtime</includeScope> -->
+                                       <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+                                       <!-- </configuration> -->
+                                       <!-- </execution> -->
+                                       <!-- </executions> -->
+                                       <!-- </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -306,13 +310,13 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
-<!--                                                                           <mapping> -->
-<!--                                                                                   <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
-<!--                                                                                   <username>root</username> -->
-<!--                                                                                   <groupname>root</groupname> -->
-<!--                                                                                   <directoryIncluded>false</directoryIncluded> -->
-<!--                                                                                   <artifact /> -->
-<!--                                                                           </mapping> -->
+                                                                               <!-- <mapping> -->
+                                                                               <!-- <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory> -->
+                                                                               <!-- <username>root</username> -->
+                                                                               <!-- <groupname>root</groupname> -->
+                                                                               <!-- <directoryIncluded>false</directoryIncluded> -->
+                                                                               <!-- <artifact /> -->
+                                                                               <!-- </mapping> -->
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client-tp</require>
@@ -346,28 +350,28 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <id>copy-tp</id> -->
-<!--                                                           <phase>package</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>copy-dependencies</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
-<!--                                                                   <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
-<!--                                                                   <excludeTransitive>true</excludeTransitive> -->
-<!--                                                                   <includeTypes>jar</includeTypes> -->
-<!--                                                                   <includeScope>runtime</includeScope> -->
-<!--                                                                   <useRepositoryLayout>true</useRepositoryLayout> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
+                                       <!-- <plugin> -->
+                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                                       <!-- <artifactId>maven-dependency-plugin</artifactId> -->
+                                       <!-- <executions> -->
+                                       <!-- <execution> -->
+                                       <!-- <id>copy-tp</id> -->
+                                       <!-- <phase>package</phase> -->
+                                       <!-- <goals> -->
+                                       <!-- <goal>copy-dependencies</goal> -->
+                                       <!-- </goals> -->
+                                       <!-- <configuration> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <outputDirectory>${project.build.directory}/lib-tp</outputDirectory> -->
+                                       <!-- <excludeGroupIds>org.argeo.commons</excludeGroupIds> -->
+                                       <!-- <excludeTransitive>true</excludeTransitive> -->
+                                       <!-- <includeTypes>jar</includeTypes> -->
+                                       <!-- <includeScope>runtime</includeScope> -->
+                                       <!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+                                       <!-- </configuration> -->
+                                       <!-- </execution> -->
+                                       <!-- </executions> -->
+                                       <!-- </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 9f530155d21553b182401a150f1599b8d0f9d102..79f85131c42632ac307482f8ea670e13553b858b 100644 (file)
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -20,6 +20,52 @@
                        <version>2.1.76-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
+
+               <!-- RWT -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.filedialog</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.fileupload</artifactId>
+               </dependency>
+
+               <!-- Argeo Commons UI -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.theme</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+
+               <!-- E4 Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 286beb7e17ea78c8d00b3e6e2663a11d523b3f9e..199e168fdf7487114c81fc5e3de67905af677bf2 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -30,17 +30,6 @@
                        <artifactId>org.argeo.cms</artifactId>
                        <version>2.1.76-SNAPSHOT</version>
                </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.1.76-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.1.76-SNAPSHOT</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
@@ -52,18 +41,6 @@
                        <version>2.1.76-SNAPSHOT</version>
                </dependency>
 
-               <!-- Argeo Commons UI -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.1.76-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.1.76-SNAPSHOT</version>
-               </dependency>
-
                <!-- CMS Dependencies -->
                <!-- TODO: not bitronix dependent -->
                <dependency>
@@ -162,28 +139,6 @@
                        <artifactId>org.apache.lucene</artifactId>
                </dependency>
 
-               <!-- UI -->
-               <dependency>
-                       <groupId>org.argeo.tp.rap.e4</groupId>
-                       <artifactId>org.eclipse.rap.rwt</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.rap.e4</groupId>
-                       <artifactId>org.eclipse.core.commands</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.rap.e4</groupId>
-                       <artifactId>org.eclipse.rap.jface</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.rap.e4</groupId>
-                       <artifactId>org.eclipse.rap.filedialog</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.rap.e4</groupId>
-                       <artifactId>org.eclipse.rap.fileupload</artifactId>
-               </dependency>
-
                <!-- TODO: remove Spring dependency -->
                <dependency>
                        <groupId>org.argeo.tp.spring</groupId>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index a22c7a9b768c3c6b877a84f250943e06268a2f78..79e6da89ed1b6640af5354822cc6faa4290a4f6d 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -19,7 +19,51 @@
                        <type>pom</type>
                </dependency>
 
-               <!-- Argeo Commons -->
+               <!-- RWT -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.filedialog</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.fileupload</artifactId>
+               </dependency>
+
+               <!-- Argeo Commons UI -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.theme</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Eclipse 3 specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.workbench</artifactId>
diff --git a/org.argeo.cms.e4/bnd.bnd b/org.argeo.cms.e4/bnd.bnd
index a851c7739fe5941d37145892a0803bf698617a3a..700bdcb524e889c17a3a36a437aea2edf6ab82e4 100644 (file)
--- a/org.argeo.cms.e4/bnd.bnd
+++ b/org.argeo.cms.e4/bnd.bnd
@@ -12,4 +12,5 @@ org.argeo.jcr.docbook,\
 org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.argeo.cms.widgets.auth,\
+org.eclipse.nebula.widgets.richtext;resolution:=optional,\
 *
diff --git a/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml b/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
index 4b7b0f7bcb74207f847841578733692982d10098..4e9a6556fbce9c87554b969c75834fcc2419b4e8 100644 (file)
--- a/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
+++ b/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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.commons.rcp</groupId>
@@ -16,204 +18,524 @@
                        <version>3.106.100.v20180305-0927</version>
                </dependency>
 
-               <!-- RCP -->
+               <!-- Eclipse launcher -->
                <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>argeo-tp-rcp-e4</artifactId>
-                       <version>${version.argeo-tp}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.osgi</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.osgi.services</artifactId>
-                               </exclusion>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher</artifactId>
+                       <version>1.5.100.v20180827-1352</version>
+               </dependency>
 
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-                               </exclusion>
+               <!-- RCP -->
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.css.swt.theme</artifactId>
+                       <version>0.12.100.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
+                       <version>0.14.300.v20180906-1121</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.contenttype</artifactId>
+                       <version>3.7.100.v20180817-1401</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.batik.constants</artifactId>
+                       <version>1.10.0.v20180703-1553</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.di</artifactId>
+                       <version>1.7.100.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.runtime</artifactId>
+                       <version>3.15.0.v20180817-1401</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.databinding</artifactId>
+                       <version>1.7.0.v20180827-2028</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.bindings</artifactId>
+                       <version>0.12.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.model.workbench</artifactId>
+                       <version>2.1.100.v20180904-1914</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.ui.cocoa</artifactId>
+                       <version>1.2.100.v20180828-0838</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.felix.scr</artifactId>
+                       <version>2.0.14.v20180822-1822</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.w3c.dom.svg</artifactId>
+                       <version>1.1.0.v201011041433</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.jface.databinding</artifactId>
+                       <version>1.8.300.v20180828-0836</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId>
+                       <version>1.3.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.services</artifactId>
+                       <version>2.1.200.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.felix.gogo.shell</artifactId>
+                       <version>1.1.0.v20180713-1646</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.widgets</artifactId>
+                       <version>1.2.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.commands</artifactId>
+                       <version>0.12.300.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId>
+                       <version>0.15.200.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.expressions</artifactId>
+                       <version>3.6.200.v20180817-1401</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
+                       <version>1.1.800.v20180827-1352</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>com.ibm.icu</artifactId>
+                       <version>62.1.0.v20180727-1652</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.batik.css</artifactId>
+                       <version>1.10.0.v20180703-1553</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.css.swt</artifactId>
+                       <version>0.13.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.swt.gtk</artifactId>
+                       <version>1.0.400.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.batik.i18n</artifactId>
+                       <version>1.10.0.v20180703-1553</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.w3c.css.sac</artifactId>
+                       <version>1.3.1.v200903091627</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
+                       <version>1.1.800.v20180827-1352</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.jface</artifactId>
+                       <version>3.14.100.v20180828-0836</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.emf.xpath</artifactId>
+                       <version>0.2.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
+                       <version>1.1.800.v20180827-1352</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId>
+                       <version>1.1.800.v20180827-1352</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.felix.gogo.runtime</artifactId>
+                       <version>1.1.0.v20180713-1646</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.databinding.observable</artifactId>
+                       <version>1.6.300.v20180827-2028</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.rcp</artifactId>
+                       <version>4.9.100.v20180906-0745</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId>
+                       <version>1.1.800.v20180827-1352</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.help</artifactId>
+                       <version>3.8.200.v20180821-0700</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId>
+                       <version>0.14.300.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.w3c.dom.smil</artifactId>
+                       <version>1.0.1.v200903091627</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.databinding.property</artifactId>
+                       <version>1.6.300.v20180827-2028</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
+                       <version>2.2.0.v201405211200</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.w3c.dom.events</artifactId>
+                       <version>3.0.0.draft20060413_v201105210656</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.di</artifactId>
+                       <version>1.2.300.v20180906-1121</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.dialogs</artifactId>
+                       <version>1.1.300.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.di.extensions</artifactId>
+                       <version>0.15.200.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.equinox.bidi</artifactId>
+                       <version>1.1.200.v20180827-1235</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.di.annotations</artifactId>
+                       <version>1.6.200.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.commons.logging</artifactId>
+                       <version>1.2.0.v20180409-1502</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.felix.gogo.command</artifactId>
+                       <version>1.0.2.v20170914-1324</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench3</artifactId>
+                       <version>0.14.200.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.jobs</artifactId>
+                       <version>3.10.100.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.commons.jxpath</artifactId>
+                       <version>1.3.0.v200911051830</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.core.contexts</artifactId>
+                       <version>1.7.100.v20180817-1215</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.databinding.beans</artifactId>
+                       <version>1.4.200.v20180827-2028</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.css.core</artifactId>
+                       <version>0.12.300.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.ui.workbench</artifactId>
+                       <version>3.112.0.v20180906-1121</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.batik.util</artifactId>
+                       <version>1.10.0.v20180703-1553</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+                       <version>3.9.200.v20180827-1727</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.services</artifactId>
+                       <version>1.3.200.v20180906-1121</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.ui</artifactId>
+                       <version>3.110.0.v20180828-1350</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.apache.xmlgraphics</artifactId>
+                       <version>2.2.0.v20180809-1640</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench.renderers.swt.cocoa</artifactId>
+                       <version>0.12.100.v20180828-0227</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.e4.ui.workbench</artifactId>
+                       <version>1.7.0.v20180906-1121</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rcp.e4</groupId>
+                       <artifactId>org.eclipse.swt</artifactId>
+                       <version>3.108.0.v20180904-1901</version>
+               </dependency>
 
-                               <!-- Deprecated update configurator has side effect in PDE -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.update.configurator</artifactId>
-                               </exclusion>
-                               <!-- SWT -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
-                               <!-- <artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId> -->
-                               <!-- </exclusion> -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.carbon.macosx</artifactId>
-                               </exclusion>
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
-                               <!-- <artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId> -->
-                               <!-- </exclusion> -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.solaris.sparc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.solaris.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.motif.solaris.sparc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.linux.s390</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.linux.s390x</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.linux.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.motif.linux.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.linux.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.photon.qnx.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.motif.aix.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.motif.aix.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.motif.hpux.ia64_32</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.aix.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.aix.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.swt.gtk.hpux.ia64_32</artifactId>
-                               </exclusion>
+               <!-- RCP -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp</groupId> -->
+               <!-- <artifactId>argeo-tp-rcp-e4</artifactId> -->
+               <!-- <version>${version.argeo-tp}</version> -->
+               <!-- <exclusions> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.osgi</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.osgi.services</artifactId> -->
+               <!-- </exclusion> -->
 
-                               <!-- Equinox Launcher -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
-                               <!-- <artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId> -->
-                               <!-- </exclusion> -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.carbon.macosx</artifactId>
-                               </exclusion>
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
-                               <!-- <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId> -->
-                               <!-- </exclusion> -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.solaris.sparc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.motif.solaris.sparc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.motif.linux.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.photon.qnx.x86</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.motif.hpux.ia64_32</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc64</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.equinox.launcher.gtk.hpux.ia64_32</artifactId>
-                               </exclusion>
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.osgi.compatibility.state</artifactId> -->
+               <!-- </exclusion> -->
 
-                               <!-- Eclipse UI -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rcp.e4</groupId>
-                                       <artifactId>org.eclipse.ui.carbon</artifactId>
-                               </exclusion>
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.update.configurator</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.carbon.macosx</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.solaris.sparc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.solaris.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.motif.solaris.sparc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.linux.s390</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.linux.s390x</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.linux.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.motif.linux.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.linux.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.photon.qnx.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.motif.aix.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.motif.aix.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.motif.hpux.ia64_32</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.aix.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.aix.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.swt.gtk.hpux.ia64_32</artifactId> -->
+               <!-- </exclusion> -->
 
-                               <!-- Felix Gogo shell -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.apache.felix.gogo.runtime</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.apache.felix.gogo.shell</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.apache.felix.gogo.command</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-                               <!-- <artifactId>org.eclipse.equinox.console</artifactId> -->
-                               <!-- </exclusion> -->
-                       </exclusions>
-               </dependency>
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.carbon.macosx</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.solaris.sparc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.motif.solaris.sparc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.motif.linux.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.photon.qnx.x86</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.motif.hpux.ia64_32</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc64</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.equinox.launcher.gtk.hpux.ia64_32</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- <exclusion> -->
+               <!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+               <!-- <artifactId>org.eclipse.ui.carbon</artifactId> -->
+               <!-- </exclusion> -->
+               <!-- </exclusions> -->
+               <!-- </dependency> -->
 
                <!-- From RAP -->
                <dependency>
@@ -281,6 +603,28 @@
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>2.1.76-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.rcp</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.theme</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
+
+               <!-- E4 specific -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.e4</artifactId>
+                       <version>2.1.76-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.rcp</groupId>
                        <artifactId>org.argeo.cms.e4.rcp</artifactId>
@@ -301,148 +645,9 @@
 
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.dep.cms.sdk</artifactId>
+                       <artifactId>org.argeo.dep.cms.node</artifactId>
                        <version>2.1.76-SNAPSHOT</version>
                        <type>pom</type>
-                       <exclusions>
-                               <!-- Equinox base -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.equinox</groupId> -->
-                               <!-- <artifactId>org.eclipse.osgi</artifactId> -->
-                               <!-- </exclusion> -->
-                               <!-- <exclusion> -->
-                               <!-- <groupId>org.argeo.tp.equinox</groupId> -->
-                               <!-- <artifactId>org.eclipse.osgi.services</artifactId> -->
-                               <!-- </exclusion> -->
-
-                               <exclusion>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.cms.ui.workbench</artifactId>
-                               </exclusion>
-                               <!-- Argeo RAP -->
-                               <exclusion>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.ext.rap.ui.workbench</artifactId>
-                               </exclusion>
-
-                               <!-- RAP minimal -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.e4</groupId>
-                                       <artifactId>org.eclipse.rap.rwt</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.e4</groupId>
-                                       <artifactId>org.eclipse.rap.jface</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.e4</groupId>
-                                       <artifactId>org.eclipse.rap.filedialog</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.e4</groupId>
-                                       <artifactId>org.eclipse.rap.fileupload</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.e4</groupId>
-                                       <artifactId>org.eclipse.core.commands</artifactId>
-                               </exclusion>
-
-                               <!-- RAP UI -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.ui.forms</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.rwt</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.jface</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.ui</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.ui.views</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.ui.workbench</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.rwt.osgi</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.jface.databinding</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.jobs</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.expressions</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.databinding.observable</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.help</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.databinding</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.databinding.beans</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.runtime</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.databinding.property</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>com.ibm.icu.base</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.contenttype</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.core.commands</artifactId>
-                               </exclusion>
-
-                               <!-- Addons -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.filedialog</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.fileupload</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
 
                <!-- SDK -->
@@ -453,19 +658,44 @@
                </dependency>
 
        </dependencies>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rcp-e4</artifactId>
+                               <version>${version.argeo-tp}</version>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
        <profiles>
                <profile>
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
-                                               <configuration>
-                                               </configuration>
                                                <executions>
                                                        <execution>
-                                                               <id>rpm-node-rcp</id>
+                                                               <id>rpm-argeo</id>
                                                                <phase>package</phase>
                                                                <goals>
                                                                        <goal>rpm</goal>
@@ -474,21 +704,98 @@
                                                                        <name>argeo-cms-e4-rcp</name>
                                                                        <mappings>
                                                                                <mapping>
-                                                                                       <directory>/usr/share/osgi/rcp</directory>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-node</require>
+                                                                               <require>argeo-cms-e4-rcp-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source-tp</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-cms-e4-rcp-tp</name>
+                                                                       <projversion>${version.argeo-tp}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/boot</directory>
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
+                                                                                               <stripVersion>true</stripVersion>
                                                                                                <includes>
-                                                                                                       <include>org.argeo.commons.rcp:org.argeo.eclipse.ui.rcp</include>
-                                                                                                       <include>org.argeo.commons.rcp:org.argeo.cms.e4.rcp</include>
+                                                                                                       <include>org.argeo.tp.rcp.e4:org.eclipse.equinox.launcher</include>
                                                                                                </includes>
                                                                                        </dependency>
                                                                                </mapping>
                                                                        </mappings>
                                                                        <requires>
-                                                                               <!-- <require>argeo-node</require> -->
+                                                                               <require>argeo-cms-node-tp</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/rcp/dep/pom.xml b/rcp/dep/pom.xml
index 70f2532edb3f838d94589558655848dbc1d5a80c..2db2e5026e72a906ea4d1f8d0ae6788008b6b4e4 100644 (file)
--- a/rcp/dep/pom.xml
+++ b/rcp/dep/pom.xml
@@ -13,8 +13,6 @@
        <modules>
                <module>org.argeo.dep.cms.e4.rcp</module>
        </modules>
-       <dependencies>
-       </dependencies>
        <build>
                <plugins>
                        <plugin>
@@ -39,8 +37,33 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.argeo.commons</groupId>
+                                               <artifactId>assembly-descriptors</artifactId>
+                                               <version>2.1.76-SNAPSHOT</version>
+                                       </dependency>
+                               </dependencies>
+                               <configuration>
+                                       <attach>false</attach>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>org.junit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
        <profiles>
                <profile>
                        <id>check-osgi</id>
diff --git a/rcp/dist/argeo-companion/rpm/etc/argeo-companion/argeo-companion.ini b/rcp/dist/argeo-companion/rpm/etc/argeo-companion/argeo-companion.ini
new file mode 100644 (file)
index 0000000..444c39d
--- /dev/null
+++ b/rcp/dist/argeo-companion/rpm/etc/argeo-companion/argeo-companion.ini
@@ -0,0 +1,25 @@
+osgi.bundles=org.argeo.osgi.boot@start
+osgi.clean=true
+
+argeo.osgi.start.2.rcp=\
+org.eclipse.core.runtime
+
+argeo.osgi.start.2.node=\
+org.eclipse.equinox.metatype,\
+org.eclipse.equinox.ds,\
+org.eclipse.equinox.cm,\
+
+argeo.osgi.start.3.node=\
+org.argeo.cms
+
+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
+
+# Remote node:
+#argeo.node.repo.labeledUri=http://root:demo@localhost:7070/jcr/node
+
+log4j.configuration=file:../../log4j.properties
+argeo.node.useradmin.uris=os:///
+eclipse.application=org.argeo.cms.e4.rcp.CmsE4Application
diff --git a/rcp/dist/argeo-companion/rpm/etc/argeo-companion/log4j.properties b/rcp/dist/argeo-companion/rpm/etc/argeo-companion/log4j.properties
new file mode 100644 (file)
index 0000000..13f949f
--- /dev/null
+++ b/rcp/dist/argeo-companion/rpm/etc/argeo-companion/log4j.properties
@@ -0,0 +1,32 @@
+log4j.rootLogger=WARN, development
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN
+log4j.logger.org.argeo.server.webextender.TomcatDeployer=INFO
+
+#log4j.logger.org.springframework.security=DEBUG
+#log4j.logger.org.apache.commons.exec=DEBUG
+#log4j.logger.org.apache.jackrabbit.webdav=DEBUG
+#log4j.logger.org.apache.jackrabbit.remote=DEBUG
+#log4j.logger.org.apache.jackrabbit.core.observation=DEBUG
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+
+log4j.logger.org.apache.directory=INFO
+log4j.logger.org.apache.directory.server=ERROR
+log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
+
+# development appender (slow!)
+log4j.appender.development=org.apache.log4j.ConsoleAppender
+log4j.appender.development.layout=org.apache.log4j.PatternLayout
+log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss} [%16.16t] %5p %m (%F:%L) %c%n
diff --git a/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion b/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion
new file mode 100755 (executable)
index 0000000..ab25dc7
--- /dev/null
+++ b/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion
@@ -0,0 +1,54 @@
+#!/bin/sh
+APP=argeo-companion
+
+JVM=java
+
+# Directories and files
+CONF_DIR=/etc/$APP
+CONF_DIRS=/etc/$APP/conf.d
+BASE_POLICY_ALL=/usr/share/$APP/all.policy
+BASE_CONFIG_INI=/usr/share/$APP/config.ini
+
+EXEC_DIR=$HOME/.local/share/argeo-companion
+DATA_DIR=$EXEC_DIR/data
+CONF_RW=$EXEC_DIR/state
+CONFIG_INI=$CONF_RW/config.ini
+
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
+OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
+ECLIPSE_LAUNCHER=$OSGI_INSTALL_AREA/org.eclipse.equinox.launcher.jar
+
+# Overwrite variables
+if [ -f $CONF_DIR/settings.sh ];then
+       . $CONF_DIR/settings.sh
+fi
+
+RETVAL=0
+
+start() {
+       mkdir -p $CONF_RW
+       mkdir -p $DATA_DIR
+
+    # Merge config files
+    printf "## Equinox configuration - Generated by /usr/sbin/nodectl ##\n\n" > $CONFIG_INI
+#    cat $BASE_CONFIG_INI >> $CONFIG_INI
+    printf "\n##\n## $CONF_DIR/$APP.ini\n##\n\n" >> $CONFIG_INI
+    cat $CONF_DIR/$APP.ini >> $CONFIG_INI
+    for file in `ls -v $CONF_DIRS/*.ini`; do
+            printf "\n##\n## $file\n##\n\n" >> $CONFIG_INI
+            cat $file >> $CONFIG_INI
+    done;
+
+#              $JAVA_OPTS -jar $OSGI_FRAMEWORK \
+
+       cd $EXEC_DIR
+       $JVM \
+               -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
+               -Dosgi.framework=$OSGI_FRAMEWORK \
+               $JAVA_OPTS -classpath $ECLIPSE_LAUNCHER org.eclipse.equinox.launcher.Main \
+               -configuration "$CONF_RW" \
+               -data "$DATA_DIR"
+}
+
+start
+
Argeo Commons - Lightweight integration framework in pure Java/OSGi