Adapt to Argeo TP v2.1.20

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index a98c67b029d80105b2fcceb79549e5cebfedc2b9..afcdaf0bb99f2a76997ebcc3f3649d36b2ac0ea1 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -140,10 +141,6 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.common</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.console</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.event</artifactId>
@@ -160,6 +157,18 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.metatype</artifactId>
                </dependency>
+
+               <!-- SSH -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.mina.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.sshd.core</artifactId>
+               </dependency>
+
+               <!-- Console -->
                <dependency>
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.scr</artifactId>
@@ -172,6 +181,12 @@
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.gogo.shell</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.console</artifactId>
+               </dependency>
+
+               <!-- Jackrabbit client -->
                <dependency>
                        <groupId>org.argeo.tp.apache.jackrabbit</groupId>
                        <artifactId>org.apache.jackrabbit.api</artifactId>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 958509035b83d9d9d3cb879b077ffc9a5cccca16..f92d0abfba6cb3324f68ef9f1ce27059706cdbef 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -158,23 +158,23 @@
 
                <!-- UI -->
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
                        <artifactId>org.eclipse.rap.rwt</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
                        <artifactId>org.eclipse.core.commands</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
                        <artifactId>org.eclipse.rap.jface</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
                        <artifactId>org.eclipse.rap.filedialog</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
                        <artifactId>org.eclipse.rap.fileupload</artifactId>
                </dependency>
 
@@ -243,10 +243,10 @@
                </dependency>
 
                <!-- Jetty -->
-               <dependency>
-                       <groupId>org.argeo.tp.jetty</groupId>
-                       <artifactId>org.eclipse.jetty.client</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.jetty</groupId> -->
+<!--                   <artifactId>org.eclipse.jetty.client</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.jetty</groupId>
                        <artifactId>org.eclipse.jetty.continuation</artifactId>
@@ -259,10 +259,10 @@
                        <groupId>org.argeo.tp.jetty</groupId>
                        <artifactId>org.eclipse.jetty.io</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jetty</groupId>
-                       <artifactId>org.eclipse.jetty.jmx</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.jetty</groupId> -->
+<!--                   <artifactId>org.eclipse.jetty.jmx</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.jetty</groupId>
                        <artifactId>org.eclipse.jetty.security</artifactId>
@@ -275,10 +275,10 @@
                        <groupId>org.argeo.tp.jetty</groupId>
                        <artifactId>org.eclipse.jetty.servlet</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.jetty</groupId>
-                       <artifactId>org.eclipse.jetty.servlets</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.jetty</groupId> -->
+<!--                   <artifactId>org.eclipse.jetty.servlets</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.jetty</groupId>
                        <artifactId>org.eclipse.jetty.util</artifactId>

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 4ac46a8cbd73dee4242c6f8cbec67815ac880589..7b3e6fcc1bd096f4e9d9f8235e409dc9d08822e3 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -250,6 +250,17 @@
                <!-- </dependency> -->
 
        </dependencies>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e3</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 
        <profiles>
                <profile>

diff --git a/dep/org.argeo.dep.cms.rap.e4/pom.xml b/dep/org.argeo.dep.cms.rap.e4/pom.xml
index 319cdef30a96277a08f6de638d685a828c108a74..17bd9592af7ff7aa44b374ce518e9a8a46de6cef 100644 (file)
--- a/dep/org.argeo.dep.cms.rap.e4/pom.xml
+++ b/dep/org.argeo.dep.cms.rap.e4/pom.xml
@@ -69,12 +69,6 @@
                        <artifactId>javax.mail</artifactId>
                </dependency>
 
-               <!-- Required by Eclipse 4 -->
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.jxpath</artifactId>
-               </dependency>
-
                <!-- Spring -->
                <dependency>
                        <groupId>org.argeo.tp.spring</groupId>
@@ -169,6 +163,13 @@
                <!-- <artifactId>org.eclipse.rap.ui.workbench</artifactId> -->
                <!-- </dependency> -->
 
+
+               <!-- Dependencies required / provided by Eclipse 4 -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.apache.commons.jxpath</artifactId>
+               </dependency>
+
                <!-- Eclipse 4 -->
                <dependency>
                        <groupId>org.argeo.tp.rap.e4</groupId>
@@ -276,15 +277,6 @@
 
        </dependencies>
        <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp</groupId>
-                               <artifactId>argeo-tp-rap-e4</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
        </dependencyManagement>
 
        <profiles>

diff --git a/org.argeo.cms.ui.workbench.rap/pom.xml b/org.argeo.cms.ui.workbench.rap/pom.xml
index b7f8b1b5c3ed9254559c497c6b5e2de3af328130..fd1e222c85380c27f62b1f084f0b4900b8ae3b04 100644 (file)
--- a/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/org.argeo.cms.ui.workbench.rap/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -22,5 +23,14 @@
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
                        <version>2.1.71-SNAPSHOT</version>
                </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.cms.ui.workbench/pom.xml b/org.argeo.cms.ui.workbench/pom.xml
index fa7d08d966e4badc25ea6b4794578b5b99137610..ce8bad18c5defea63b91477051a99ae975183fca 100644 (file)
--- a/org.argeo.cms.ui.workbench/pom.xml
+++ b/org.argeo.cms.ui.workbench/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -16,11 +17,21 @@
                        <artifactId>org.argeo.cms.ui</artifactId>
                        <version>2.1.71-SNAPSHOT</version>
                </dependency>
+               
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
                        <version>2.1.71-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml
index 73e74b0f7cd8da11713e3f12cff43516d005f97a..1cee08ac7f0420fe58bb6b35794ffad816c4f7a0 100644 (file)
--- a/org.argeo.cms.ui/pom.xml
+++ b/org.argeo.cms.ui/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -22,5 +23,35 @@
                        <version>2.1.71-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
+
+               <!-- UI -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               
+               <!-- TODO move it to specific -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.filedialog</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.fileupload</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 58a75c1f2c203c43f3c3a8d465728df832b790cf..8501396eb76385f2edc7f03b6bda90e6e3cd5038 100644 (file)
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -20,5 +21,23 @@
                        <artifactId>org.argeo.util</artifactId>
                        <version>2.1.71-SNAPSHOT</version>
                </dependency>
+
+               <!-- UI -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 4348d74149433093b1e44a6171b66ae891ef2694..3f73b98203a638ef1c8138a8bc904392f7b2184b 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -20,5 +21,22 @@
                        <artifactId>org.argeo.jcr</artifactId>
                        <version>2.1.71-SNAPSHOT</version>
                </dependency>
+
+               <!-- UI -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.rwt</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.core.commands</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.rap.e4</groupId>
+                       <artifactId>org.eclipse.rap.jface</artifactId>
+                       <scope>provided</scope>
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.util/pom.xml b/org.argeo.util/pom.xml
index f760b7ca8b256c4333283305103d39158ad883cc..17b3fd8f1fae767b5aedc7949b8c53cb38b1050a 100644 (file)
--- a/org.argeo.util/pom.xml
+++ b/org.argeo.util/pom.xml
@@ -1,5 +1,6 @@
 <?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>

diff --git a/pom.xml b/pom.xml
index 36e7e7e253b04a21ce3d2616bb46ad1bf9c1ae82..7493ec80e5bf9b69b5bd5225b70bbd7774fabe16 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -10,7 +11,7 @@
                <version.argeo-commons>2.1.71-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.19</version.argeo-distribution>
+               <version.argeo-distribution>2.1.20</version.argeo-distribution>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
@@ -410,6 +411,13 @@ limitations under the License.
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp-rap-e4</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
@@ -505,8 +513,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -531,8 +541,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>