From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 7 Jan 2015 10:58:58 +0000 (+0000)
Subject: check-osgi working
X-Git-Tag: argeo-commons-2.1.30~464^2~4
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3eae0d113baaeb21388bf8079cdf8f1c49eb97c3;p=lgpl%2Fargeo-commons.git

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 bffe283c6..f8a1574fc 100644
--- 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 7e934cdda..fbecafe76 100644
--- 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 e8d1df96b..547ca2333 100644
--- 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 31c1f0b45..4650d17f0 100644
--- 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 368f60403..c67ad302a 100644
--- 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 fa0e1917e..42d9dcdd7 100644
--- 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>