Work on rap migration.

git-svn-id: https://svn.argeo.org/commons/trunk@7651 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.dep.cms/pom.xml b/dep/org.argeo.dep.cms/pom.xml
index 6a9912cd453a8528f4e1587ce4b701ea3e526ab7..e3af6f6fa70f9d82f45df4f562f3e32e455d13b8 100644 (file)
--- a/dep/org.argeo.dep.cms/pom.xml
+++ b/dep/org.argeo.dep.cms/pom.xml
@@ -52,11 +52,11 @@
                </dependency>
 
                <!-- Node (without RAP) -->
-               <dependency>
+               <!-- <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.security.dep.node</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
-               </dependency>
+               </dependency> -->
 
                <!-- Minimal web target platform -->
                <dependency>

diff --git a/dep/org.argeo.eclipse.dep.rwt/pom.xml b/dep/org.argeo.eclipse.dep.rwt/pom.xml
index 1bd1d669bc49b2479f1f152f901cd93d4845a063..6ac2c3b47ab4ec3820a4198ae2520017c0dfa4a8 100644 (file)
--- a/dep/org.argeo.eclipse.dep.rwt/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rwt/pom.xml
@@ -14,7 +14,7 @@
                <!-- Minimal web target platform -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+                       <artifactId>org.argeo.security.dep.node</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
                        <exclusions>

diff --git a/dep/org.argeo.security.dep.node.rap/pom.xml b/dep/org.argeo.security.dep.node.rap/pom.xml
index 547ca23333ca6203d765cc7bf0bcbb50fe201266..80c507473cccc6304133702f0edaaf638dcc0713 100644 (file)
--- a/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -75,13 +75,13 @@
                </dependency>
 
                <!-- RAP -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
-
+ -->
                <!-- For Tomcat deployment <dependency> <groupId>org.argeo.commons</groupId> 
                        <artifactId>org.argeo.server.rap.webapp</artifactId> <version>2.1.1.tp-SNAPSHOT</version> 
                        </dependency> -->

diff --git a/dep/pom.xml b/dep/pom.xml
index 42d9dcdd792be7377ff41ab437825728bbfdca16..1ab8a834cf0870810278903283b82241bff261d8 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -14,15 +14,15 @@
        <modules>
                <!-- <module>org.argeo.dep.log4j</module> -->
                <!-- <module>org.argeo.dep.jackrabbit</module> -->
-               <module>org.argeo.eclipse.dep.rap</module>
-               <module>org.argeo.eclipse.dep.rwt</module>
+               <!--  <module>org.argeo.eclipse.dep.rap</module> -->
                <module>org.argeo.eclipse.dep.rcp</module>
                <!-- <module>org.argeo.server.dep.ads</module> -->
                <!-- <module>org.argeo.server.dep.jackrabbit.server</module> -->
                <module>org.argeo.security.dep.node</module>
-               <module>org.argeo.security.dep.node.rap</module>
+               <module>org.argeo.eclipse.dep.rwt</module>  
+               <module>org.argeo.security.dep.node.rap</module> 
                <module>org.argeo.security.dep.node.rcp</module>
-               <module>org.argeo.dep.cms</module>
+       <!--    <module>org.argeo.dep.cms</module>  -->
        </modules>
        <profiles>
                <profile>

diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 411188bc6eba93b3086be6298e36ce8c237b9e1b..6f338ae2848df904158e493b3a7c2404db3914b5 100644 (file)
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -25,17 +25,17 @@
                </dependency>
 
                <!-- Files -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.tp.rap.addons</groupId>
                        <artifactId>org.eclipse.rap.addons.fileupload</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.rap.addons</groupId>
                        <artifactId>org.eclipse.rap.addons.filedialog</artifactId>
-               </dependency>
+               </dependency> -->
 
                <!-- RAP -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.tp.rap.platform</groupId>
                        <artifactId>org.eclipse.rap.rwt</artifactId>
                </dependency>
@@ -46,7 +46,7 @@
                <dependency>
                        <groupId>org.argeo.tp.rap.platform</groupId>
                        <artifactId>org.eclipse.core.commands</artifactId>
-               </dependency>
+               </dependency>  -->
                <!--  Argeo base Eclipse utilities. -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>

diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 576cddf2bf0d88e85fd69614882e0feae1c7aa87..03f3efbf7e88bc7964aa17447f24e16729bd5405 100644 (file)
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -21,12 +21,12 @@
                </dependency>
 
                <!-- Base distribution for RAP projects -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
-               </dependency>
+               </dependency>  -->
 
                <!-- Utils and logging -->
                <dependency>

diff --git a/org.argeo.eclipse.ui.workbench/pom.xml b/org.argeo.eclipse.ui.workbench/pom.xml
index c1ebe46cc54fa09ea38fe9a63704878d3c589551..275421b46ce8c9f99b8e6c8992041ad7a4906ab4 100644 (file)
--- a/org.argeo.eclipse.ui.workbench/pom.xml
+++ b/org.argeo.eclipse.ui.workbench/pom.xml
@@ -18,10 +18,10 @@
                        <exclusions>
                                <!-- version of the org.osgi.framework package provided in this bundle 
                                        is too old -->
-                               <exclusion>
+                               <!--  <exclusion>
                                        <groupId>org.argeo.tp</groupId>
                                        <artifactId>org.osgi.core</artifactId>
-                               </exclusion>
+                               </exclusion>  -->
                        </exclusions>
                </dependency>
 
@@ -33,13 +33,13 @@
                        <scope>provided</scope>
                </dependency>
 
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
-               </dependency>
+               </dependency> -->
 
                <!-- Business dependencies -->
                <dependency>

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 7aa21aa975176fdc56bc0439f04a15a7dabca369..d2bc9b9d4cd70921f07f913639388b6dc0b9bcba 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -16,14 +16,9 @@
                </instructions> </configuration> </plugin> </plugins> </build> -->
        <dependencies>
                <!-- We build against RAP -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-                       <type>pom</type>
-                       <version>2.1.12-SNAPSHOT</version>
-                       <scope>provided</scope>
-               </dependency>
-
+               <!-- <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.eclipse.dep.rap</artifactId> 
+                       <type>pom</type> <version>2.1.12-SNAPSHOT</version> <scope>provided</scope> 
+                       </dependency> -->
                <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
@@ -42,22 +37,22 @@
                </dependency>
 
                <!-- Bridge Spring and OSGi -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp</groupId> -->
-<!--                   <artifactId>org.springframework.osgi.extender</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp</groupId> -->
+               <!-- <artifactId>org.springframework.osgi.extender</artifactId> -->
+               <!-- </dependency> -->
 
                <!-- Spring -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp</groupId> -->
-<!--                   <artifactId>org.springframework.context</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp</groupId> -->
+               <!-- <artifactId>org.springframework.context</artifactId> -->
+               <!-- </dependency> -->
 
 
                <!-- Others -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp</groupId> -->
-<!--                   <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp</groupId> -->
+               <!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+               <!-- </dependency> -->
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml
index b5d80a7224a80b70eda5a5a15cd379aa6553da6a..5cd2ebdc3c47415bd3e88e2ecaa4fc6440c63ee2 100644 (file)
--- a/org.argeo.security.equinox/pom.xml
+++ b/org.argeo.security.equinox/pom.xml
@@ -56,13 +56,13 @@
                </dependency>
                
                <!-- RAP only dependency, needed at compile time -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
-               </dependency>
+               </dependency>  -->
 
                <!-- Commons -->
                <dependency>

diff --git a/org.argeo.security.ui.admin/pom.xml b/org.argeo.security.ui.admin/pom.xml
index d80eb164030fc171dfbdb54c2dff308cde79ea8a..86d1549661e8c79f545ebc1d66324d2b1426e17f 100644 (file)
--- a/org.argeo.security.ui.admin/pom.xml
+++ b/org.argeo.security.ui.admin/pom.xml
@@ -31,13 +31,13 @@
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
-               </dependency>
+               </dependency>  -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>

diff --git a/org.argeo.security.ui.rap/pom.xml b/org.argeo.security.ui.rap/pom.xml
index ea6aa46d52edb7ead0ddac6b8669c6b3d08f37ab..43664b38e00bd69bf04f06dd237ae0d3ab52f457 100644 (file)
--- a/org.argeo.security.ui.rap/pom.xml
+++ b/org.argeo.security.ui.rap/pom.xml
@@ -72,12 +72,12 @@
                </dependency>
 
                <!-- RAP specific -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
-               </dependency>
+               </dependency>  -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>

diff --git a/org.argeo.security.ui.rcp/pom.xml b/org.argeo.security.ui.rcp/pom.xml
index 8c250929fb08055f05e94cf2101541c26c895fb5..92a6b8755b61a8934844a2cb48daac0a90447ff4 100644 (file)
--- a/org.argeo.security.ui.rcp/pom.xml
+++ b/org.argeo.security.ui.rcp/pom.xml
@@ -33,10 +33,10 @@
                </dependency>
 
                <!-- Logging -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp</groupId> -->
-<!--                   <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.tp</groupId> -->
+               <!-- <artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+               <!-- </dependency> -->
 
                <!-- Argeo Security -->
                <dependency>

diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml
index 1d0164e6c5c65359102141d6a1db263e5e6f95fe..6a5d4f0d1e86d0c2dad221dd51c6667e93fdcbf8 100644 (file)
--- a/org.argeo.security.ui/pom.xml
+++ b/org.argeo.security.ui/pom.xml
@@ -27,13 +27,13 @@
                </dependency>
 
                <!-- We build against RAP -->
-               <dependency>
+               <!--  <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
                        <type>pom</type>
                        <version>2.1.12-SNAPSHOT</version>
                        <scope>provided</scope>
-               </dependency>
+               </dependency>  -->
 
                <!-- Others: Commons utils, Spring, Logging -->
                <dependency>

diff --git a/pom.xml b/pom.xml
index e2abe3aafcbc7989cd484e4f77e506d368dc50b9..5e7ddf01a8754491c3eca8515ad90b9d95c65f04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,10 +11,10 @@
                <version.argeo-commons>2.1.12-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.2</version.argeo-distribution>
+               <version.argeo-distribution>2.1.3</version.argeo-distribution>
                <version.eclipseIde>3.8.2</version.eclipseIde>
-               <version.rap>2.2.0-R-20131204-0942</version.rap>
-               <version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
+               <!--  <version.rap>2.2.0-R-20131204-0942</version.rap>
+               <version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>  -->
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -462,7 +462,7 @@ limitations under the License.
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
-                       <dependency>
+                       <!--  <dependency>
                                <groupId>org.argeo.tp.rap.addons</groupId>
                                <artifactId>binaries</artifactId>
                                <version>${version.rap.addons}</version>
@@ -475,19 +475,28 @@ limitations under the License.
                                <version>${version.rap}</version>
                                <type>pom</type>
                                <scope>import</scope>
-                       </dependency>
+                       </dependency>  -->
                </dependencies>
        </dependencyManagement>
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>https://forge.argeo.org/data/public/java/argeo-tp-2.1</url>
+                       <url>http://localhost:7080/data/public/java/argeo-tp-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!--  <repository>
+                       <id>argeo-tp</id>
+                       <url>https://forge.argeo.org/data/public/java/argeo-tp-2.1</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+               </repository>  -->
                <repository>
                        <id>argeo-tp-eclipseIde</id>
                        <url>https://forge.argeo.org/data/public/java/eclipse-ide-3.8</url>
@@ -497,7 +506,7 @@ limitations under the License.
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
-               <repository>
+               <!--  <repository>
                        <id>argeo-tp-rap</id>
                        <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
                        <releases>
@@ -505,7 +514,7 @@ limitations under the License.
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
-               </repository>
+               </repository>  -->
        </repositories>
        <pluginRepositories>
                <pluginRepository>