check-osgi working

git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7639 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.eclipse.dep.rap/pom.xml b/dep/org.argeo.eclipse.dep.rap/pom.xml
index bffe283c6fff3a2f92e34cae7a8edebc1a4c1724..f8a1574fcf840ff9ac4aea5ac1dad24f0a7da71f 100644 (file)
--- a/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -37,6 +37,46 @@
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
                                </exclusion>
+                               
+                               <!-- Equinox base -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.osgi</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.osgi.services</artifactId>
+                               </exclusion>
+
+                               <!-- Jetty -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.continuation</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.http</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.io</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.security</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.server</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.servlet</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.jetty.util</artifactId>
+                               </exclusion>
 
                                <!-- Example, demos -->
                                <exclusion>
@@ -73,18 +113,27 @@
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.junit</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.junit.runtime</artifactId>
+                               </exclusion>
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.jdt.junit.runtime</artifactId>
                                </exclusion>
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.junit.runtime</artifactId>
+                                       <artifactId>org.eclipse.jdt.junit.runtime</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.hamcrest.core</artifactId>
                                </exclusion>
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>
                                        <artifactId>org.eclipse.rap.rwt.testfixture</artifactId>
                                </exclusion>
+
                                <!-- Felix Gogo shell -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rap.platform</groupId>

diff --git a/dep/org.argeo.eclipse.dep.rcp/pom.xml b/dep/org.argeo.eclipse.dep.rcp/pom.xml
index 7e934cdda04bc21fae09454865fc1d016261d9f2..fbecafe76f99e7a36d09b610ea3377b77d49a2ed 100644 (file)
--- a/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -66,6 +66,16 @@ ex=*.source_*.jar,\
                        <version>${version.eclipseIde}</version>
                        <type>pom</type>
                        <exclusions>
+                               <!-- Equinox base -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.osgi</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.osgi.services</artifactId>
+                               </exclusion>
+
                                <!-- Deprecated update configurator has side effect in PDE -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rcp.platform</groupId>
@@ -132,6 +142,18 @@ ex=*.source_*.jar,\
                                        <groupId>org.argeo.tp.rcp.platform</groupId>
                                        <artifactId>org.eclipse.swt.motif.hpux.ia64_32</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.aix.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.aix.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.swt.gtk.hpux.ia64_32</artifactId>
+                               </exclusion>
 
                                <!-- Equinox Launcher -->
                                <exclusion>
@@ -194,12 +216,42 @@ ex=*.source_*.jar,\
                                        <groupId>org.argeo.tp.rcp.platform</groupId>
                                        <artifactId>org.eclipse.equinox.launcher.motif.hpux.ia64_32</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc64</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rcp.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.launcher.gtk.hpux.ia64_32</artifactId>
+                               </exclusion>
 
                                <!-- Eclipse UI -->
                                <exclusion>
                                        <groupId>org.argeo.tp.rcp.platform</groupId>
                                        <artifactId>org.eclipse.ui.carbon</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>
 

diff --git a/dep/org.argeo.security.dep.node.rap/pom.xml b/dep/org.argeo.security.dep.node.rap/pom.xml
index e8d1df96b6237323e667c940b7ec6e6273a9780b..547ca23333ca6203d765cc7bf0bcbb50fe201266 100644 (file)
--- a/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -46,11 +47,11 @@
                        <artifactId>org.argeo.security.ui.admin</artifactId>
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.commons</groupId> -->
-<!--                   <artifactId>org.argeo.security.mvc</artifactId> -->
-<!--                   <version>2.1.12-SNAPSHOT</version> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons</groupId> -->
+               <!-- <artifactId>org.argeo.security.mvc</artifactId> -->
+               <!-- <version>2.1.12-SNAPSHOT</version> -->
+               <!-- </dependency> -->
 
                <!-- Basis -->
                <dependency>
@@ -59,10 +60,8 @@
                        <version>2.1.12-SNAPSHOT</version>
                        <type>pom</type>
                        <exclusions>
-                               <!--  <exclusion>
-                                       <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-                               </exclusion>  -->
+                               <!-- <exclusion> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.security.dao.jackrabbit</artifactId> 
+                                       </exclusion> -->
                                <exclusion>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.security.dao.os</artifactId>
@@ -75,13 +74,17 @@
                        <version>2.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- For Tomcat deployment
+               <!-- RAP -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.rap.webapp</artifactId>
-                       <version>2.1.1.tp-SNAPSHOT</version>
+                       <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> -->
        </dependencies>
        <profiles>
                <profile>

diff --git a/dep/org.argeo.security.dep.node.rcp/pom.xml b/dep/org.argeo.security.dep.node.rcp/pom.xml
index 31c1f0b450ec3302d1de30efb489194e4340c0b6..4650d17f0158f12e880808dbe7ac893bfa0bb7e0 100644 (file)
--- a/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -78,6 +78,14 @@
                        <version>2.1.12-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
+
+               <!-- RCP -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
        </dependencies>
        <profiles>
                <!-- <profile> -->

diff --git a/dep/org.argeo.security.dep.node/pom.xml b/dep/org.argeo.security.dep.node/pom.xml
index 368f60403be97c1972c675042b97efa903ea945b..c67ad302a5cc8ddbd26070fa191d2fa1bbaee902 100644 (file)
--- a/dep/org.argeo.security.dep.node/pom.xml
+++ b/dep/org.argeo.security.dep.node/pom.xml
@@ -59,19 +59,19 @@
                </dependency>
 
                <!-- Logging -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.commons</groupId> -->
-<!--                   <artifactId>org.argeo.dep.log4j</artifactId> -->
-<!--                   <version>2.1.12-SNAPSHOT</version> -->
-<!--                   <type>pom</type> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons</groupId> -->
+               <!-- <artifactId>org.argeo.dep.log4j</artifactId> -->
+               <!-- <version>2.1.12-SNAPSHOT</version> -->
+               <!-- <type>pom</type> -->
+               <!-- </dependency> -->
 
                <!-- Argeo Server -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.commons</groupId> -->
-<!--                   <artifactId>org.argeo.server.core</artifactId> -->
-<!--                   <version>2.1.12-SNAPSHOT</version> -->
-<!--           </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons</groupId> -->
+               <!-- <artifactId>org.argeo.server.core</artifactId> -->
+               <!-- <version>2.1.12-SNAPSHOT</version> -->
+               <!-- </dependency> -->
 
                <!-- Argeo Security -->
                <dependency>
@@ -187,6 +187,18 @@
                                        <version>2.1.12-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
+
+                               <dependency>
+                                       <groupId>org.argeo.tp</groupId>
+                                       <artifactId>argeo-tp</artifactId>
+                                       <version>${version.argeo-distribution}</version>
+                                       <exclusions>
+                                               <exclusion>
+                                                       <groupId>org.argeo.tp.equinox</groupId>
+                                                       <artifactId>org.eclipse.equinox.security</artifactId>
+                                               </exclusion>
+                                       </exclusions>
+                               </dependency>
                        </dependencies>
                </profile>
                <profile>

diff --git a/dep/pom.xml b/dep/pom.xml
index fa0e1917ebcf624cfb27398ff78c3428d8edef54..42d9dcdd792be7377ff41ab437825728bbfdca16 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,16 +12,16 @@
        <name>Commons Base Dependencies</name>
        <packaging>pom</packaging>
        <modules>
-<!--           <module>org.argeo.dep.log4j</module> -->
-<!--           <module>org.argeo.dep.jackrabbit</module> -->
+               <!-- <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.rcp</module>
-<!--           <module>org.argeo.server.dep.ads</module> -->
-<!--           <module>org.argeo.server.dep.jackrabbit.server</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.security.dep.node.rcp</module> -->
+               <module>org.argeo.security.dep.node.rcp</module>
                <module>org.argeo.dep.cms</module>
        </modules>
        <profiles>