From 1936ce50162c39c8e456015bfcf6f5820c0374d8 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 24 Mar 2014 20:41:35 +0000
Subject: [PATCH] work on migratinf to rap 2.2. Breaks the build until we
 solved the Argeo Repository problem

git-svn-id: https://svn.argeo.org/commons/trunk@6912 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 base/dep/org.argeo.eclipse.dep.rap/pom.xml | 137 ++++++++++++---------
 pom.xml                                    |  11 +-
 2 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 02b22f795..b184000d5 100644
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.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.base</groupId>
@@ -10,7 +11,8 @@
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 	<name>Commons Eclipse RAP Dependencies</name>
 	<properties>
-		<version.rap>2.1.0-R-20130611-2139</version.rap>
+		<version.rap>2.2.0-R-20131204-0942</version.rap>
+		<version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
 	</properties>
 	<build>
 		<plugins>
@@ -21,10 +23,17 @@
 		</plugins>
 	</build>
 	<dependencies>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp</groupId> -->
-<!-- 			<artifactId>org.eclipse.osgi</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp</groupId> -->
+		<!-- <artifactId>org.eclipse.osgi</artifactId> -->
+		<!-- </dependency> -->
+
+		<dependency>
+			<groupId>org.argeo.tp.rap.addons</groupId>
+			<artifactId>binaries</artifactId>
+			<version>${version.rap.addons}</version>
+			<type>pom</type>
+		</dependency>
 
 		<dependency>
 			<groupId>org.argeo.tp.rap.platform</groupId>
@@ -32,53 +41,53 @@
 			<version>${version.rap}</version>
 			<type>pom</type>
 			<exclusions>
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
-<!-- 					<artifactId>javax.servlet</artifactId> -->
-<!-- 				</exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+				<!-- <artifactId>javax.servlet</artifactId> -->
+				<!-- </exclusion> -->
 
 				<!-- Jetty -->
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
-<!-- 					<artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
-<!-- 				</exclusion> -->
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
-<!-- 					<artifactId>org.mortbay.jetty.server</artifactId> -->
-<!-- 				</exclusion> -->
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
-<!-- 					<artifactId>org.mortbay.jetty.util</artifactId> -->
-<!-- 				</exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+				<!-- <artifactId>org.eclipse.equinox.http.jetty</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+				<!-- <artifactId>org.mortbay.jetty.server</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+				<!-- <artifactId>org.mortbay.jetty.util</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.http</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.continuation</artifactId> -->
-<!-- 				</exclusion> -->
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.argeo.tp.rap.platform</groupId> -->
-<!-- 					<artifactId>org.eclipse.jetty.util</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.servlet</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.http</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.continuation</artifactId> -->
+				<!-- </exclusion> -->
+				<!-- <exclusion> -->
+				<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
+				<!-- <artifactId>org.eclipse.jetty.util</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.servlet</artifactId> -->
+				<!-- </exclusion> -->
 
 				<!-- Demo -->
 				<exclusion>
@@ -112,10 +121,10 @@
 
 		<!-- Dependency to enable file upload. Should be included directly in coming 
 			rap distribution -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.rap</groupId> -->
-<!-- 			<artifactId>org.eclipse.rwt.widgets.upload</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rap</groupId> -->
+		<!-- <artifactId>org.eclipse.rwt.widgets.upload</artifactId> -->
+		<!-- </dependency> -->
 		<!-- Needed by the bundle above -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -138,11 +147,11 @@
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
 
-				<dependency>
-					<groupId>org.argeo.commons.base</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>2.1.6-SNAPSHOT</version>
-				</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>2.1.6-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -153,6 +162,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.tp.rap.addons</groupId>
+				<artifactId>binaries</artifactId>
+				<version>${version.rap.addons}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.argeo.tp.rap.platform</groupId>
 				<artifactId>binaries</artifactId>
@@ -228,7 +244,8 @@
 								<configuration>
 									<target>
 										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
diff --git a/pom.xml b/pom.xml
index cfca11da2..06920b2b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -494,7 +494,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.1</url>
 			<releases>
@@ -502,6 +502,15 @@ limitations under the License.
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+		</repository> -->
+		<repository>
+			<id>argeo-tp-rap</id>
+			<url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
 		</repository>
 	</repositories>
 	<pluginRepositories>
-- 
2.30.2