From 4bee079e9cd3570d148d6a68d4323d25bf502002 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 30 Apr 2013 12:18:09 +0000
Subject: [PATCH] Maven build working (without check-osgi)

git-svn-id: https://svn.argeo.org/commons/branches/2.tp@6260 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 base/dep/org.argeo.eclipse.dep.rap/pom.xml    | 71 ++++++++++++++-----
 base/runtime/org.argeo.eclipse.ui.rap/pom.xml |  2 +-
 .../ui/specific/DownloadServiceHandler.java   | 12 ++--
 .../eclipse/ui/specific/FileHandler.java      | 26 +++----
 .../ui/specific/GenericUploadControl.java     | 54 +++++++-------
 .../ui/specific/ImportToServerWizardPage.java | 28 ++++----
 .../argeo/eclipse/ui/specific/ThreadNLS.java  |  2 +-
 base/runtime/org.argeo.osgi.boot/pom.xml      |  6 +-
 pom.xml                                       | 11 ++-
 .../org.argeo.security.ui.rap/plugin.xml      |  8 +--
 .../security/ui/rap/AnonymousEntryPoint.java  |  4 +-
 .../security/ui/rap/LogoutEntryPoint.java     |  4 +-
 .../argeo/security/ui/rap/NullEntryPoint.java |  2 +-
 .../security/ui/rap/SecureEntryPoint.java     |  4 +-
 14 files changed, 140 insertions(+), 94 deletions(-)

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 0037ea81e..07b9b9512 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,7 @@
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 	<name>Commons Eclipse RAP Dependencies</name>
 	<properties>
-		<version.rap>1.3.2</version.rap>
+		<version.rap>2.1.0-M1-20130318-2137</version.rap>
 	</properties>
 	<build>
 		<plugins>
@@ -21,15 +22,15 @@
 		</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.platform</groupId>
 			<artifactId>binaries</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.rap}</version>
 			<type>pom</type>
 			<exclusions>
 				<exclusion>
@@ -42,13 +43,41 @@
 					<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.mortbay.jetty.server</artifactId>
+					<artifactId>org.eclipse.jetty.util</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.mortbay.jetty.util</artifactId>
+					<artifactId>org.eclipse.jetty.io</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.jetty.servlet</artifactId>
 				</exclusion>
 
 				<!-- Demo -->
@@ -64,7 +93,7 @@
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.rap.design.example</artifactId>
 				</exclusion>
-				
+
 				<!-- Troublesome bundles -->
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
@@ -74,15 +103,19 @@
 					<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.rap.rwt.testfixture</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<!-- 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>
@@ -105,6 +138,11 @@
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
 
+				<dependency>
+					<groupId>org.argeo.commons.base</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>2.1.1.tp-SNAPSHOT</version>
+				</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -118,7 +156,7 @@
 			<dependency>
 				<groupId>org.argeo.tp.rap.platform</groupId>
 				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.rap}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -190,7 +228,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/base/runtime/org.argeo.eclipse.ui.rap/pom.xml b/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
index 5bb105a5b..7eeed3822 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
+++ b/base/runtime/org.argeo.eclipse.ui.rap/pom.xml
@@ -31,7 +31,7 @@
 					<instructions>
 						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
 						<Bundle-Activator>org.argeo.eclipse.ui.ArgeoUiPlugin</Bundle-Activator>
-						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.rwt.widgets.upload,org.eclipse.core.runtime</Require-Bundle>
+						<Require-Bundle>org.eclipse.rap.ui,org.eclipse.core.runtime</Require-Bundle>
 						<!-- IMPORTANT : Note that we must exclude certain packages that are 
 							provided by dependencies to be sure that packages used in the current workspace 
 							are those provided by the require-bundles. Especially rwt.widgets.upload 
diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
index e12210f1b..099596dee 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
@@ -19,10 +19,11 @@ import java.io.IOException;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 import org.argeo.ArgeoException;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.service.IServiceHandler;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.service.IServiceHandler;
 
 public class DownloadServiceHandler implements IServiceHandler {
 
@@ -32,16 +33,15 @@ public class DownloadServiceHandler implements IServiceHandler {
 		this.provider = provider;
 	}
 
-	public void service() throws IOException, ServletException {
+	public void service( HttpServletRequest request, HttpServletResponse response )  throws IOException, ServletException {
 		// Which file to download?
-		String fileName = RWT.getRequest().getParameter("filename");
-		String fileId = RWT.getRequest().getParameter("fileid");
+		String fileName = request.getParameter("filename");
+		String fileId = request.getParameter("fileid");
 
 		// Get the file content
 		byte[] download = provider.getByteArrayFileFromId(fileId);
 
 		// Send the file in the response
-		HttpServletResponse response = RWT.getResponse();
 		response.setContentType("application/octet-stream");
 		response.setContentLength(download.length);
 		String contentDisposition = "attachment; filename=\"" + fileName + "\"";
diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
index f15dd66d0..27d4f74ee 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
@@ -19,10 +19,6 @@ import java.net.URL;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.service.IServiceHandler;
-import org.eclipse.rwt.service.IServiceManager;
-import org.eclipse.ui.PlatformUI;
 
 /**
  * RAP SPECIFIC handler to enable the opening of a download dialog box triggered
@@ -33,7 +29,7 @@ import org.eclipse.ui.PlatformUI;
  * 
  * Manages the process of forwarding the request to the handler at runtime to
  * open the dialog box
- * 
+ * encodedURL
  */
 public class FileHandler {
 	public final static String FORCED_DOWNLOAD_URL_BASE_PROPERTY = "argeo.rap.specific.forcedDownloadUrlBase";
@@ -42,9 +38,9 @@ public class FileHandler {
 
 	public FileHandler(FileProvider provider) {
 		// Instantiate and register the DownloadServicHandler.
-		IServiceManager manager = RWT.getServiceManager();
-		IServiceHandler handler = new DownloadServiceHandler(provider);
-		manager.registerServiceHandler("downloadServiceHandler", handler);
+		// IServiceManager manager = RWT.getServiceManager();
+		// IServiceHandler handler = new DownloadServiceHandler(provider);
+		// manager.registerServiceHandler("downloadServiceHandler", handler);
 	}
 
 	public void openFile(String fileName, String fileId) {
@@ -59,8 +55,8 @@ public class FileHandler {
 				log.trace("URL : " + createFullDownloadUrl(fileName, fileId));
 
 			URL url = new URL(createFullDownloadUrl(fileName, fileId));
-			PlatformUI.getWorkbench().getBrowserSupport()
-					.createBrowser("DownloadDialog").openURL(url);
+			// PlatformUI.getWorkbench().getBrowserSupport()
+			// .createBrowser("DownloadDialog").openURL(url);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -82,8 +78,8 @@ public class FileHandler {
 				.getProperty(FORCED_DOWNLOAD_URL_BASE_PROPERTY);
 		if (forcedDownloadUrlBase != null)
 			url.append(forcedDownloadUrlBase);
-		else
-			url.append(RWT.getRequest().getRequestURL());
+		// else
+		// url.append(RWT.getRequest().getRequestURL());
 		url.append(createParamUrl(fileName, fileId));
 		return url.toString();
 	}
@@ -91,13 +87,13 @@ public class FileHandler {
 	private String createParamUrl(String filename, String fileId) {
 		StringBuilder url = new StringBuilder();
 		url.append("?");
-		url.append(IServiceHandler.REQUEST_PARAM);
+		// url.append(IServiceHandler.REQUEST_PARAM);
 		url.append("=downloadServiceHandler");
 		url.append("&filename=");
 		url.append(filename);
 		url.append("&fileid=");
 		url.append(fileId);
-		String encodedURL = RWT.getResponse().encodeURL(url.toString());
-		return encodedURL;
+		// String encodedURL = RWT.getResponse().encodeURL(url.toString());
+		return url.toString();
 	}
 }
diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java
index 20a551484..e3b319862 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/GenericUploadControl.java
@@ -21,7 +21,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.eclipse.rwt.widgets.Upload;
+//import org.eclipse.rap.rwt.widgets.Upload;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
@@ -32,7 +32,7 @@ public class GenericUploadControl extends Composite {
 	private final static Log log = LogFactory
 			.getLog(GenericUploadControl.class);
 
-	private Upload upload;
+	//private Upload upload;
 
 	public GenericUploadControl(Composite parent, int style, String browseLabel) {
 		super(parent, style);
@@ -44,9 +44,9 @@ public class GenericUploadControl extends Composite {
 		parent.setLayout(new GridLayout(1, false));
 		parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
-		upload = new Upload(parent, SWT.BORDER);
-		upload.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		upload.setBrowseButtonText(browseLabel);
+//		upload = new Upload(parent, SWT.BORDER);
+//		upload.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+//		upload.setBrowseButtonText(browseLabel);
 		// upload.addModifyListener(new UploadListener());
 		parent.pack();
 	}
@@ -56,11 +56,11 @@ public class GenericUploadControl extends Composite {
 	 * file. This method can be called even if the upload has not finished yet.
 	 */
 	public String getLastFileUploadedName() {
-		return upload.getLastFileUploaded();
+		return "";
 	}
 
 	public boolean isControlEmpty() {
-		String path = upload.getPath();
+		String path = "";
 		if (log.isTraceEnabled())
 			log.trace("UploadControl chosen path : " + path);
 		if (path == null || "".equals(path.trim()))
@@ -70,30 +70,30 @@ public class GenericUploadControl extends Composite {
 	}
 
 	public byte[] performUpload() {
-		boolean success = upload.performUpload();
-		if (success) {
-			if (upload.getUploadItem().getFileSize() == -1)
-				throw new ArgeoException("File "
-						+ upload.getUploadItem().getFileName()
-						+ " has not been uploaded, its size is -1");
-
-			InputStream inStream = null;
-			byte[] fileBA = null;
-			try {
-				inStream = upload.getUploadItem().getFileInputStream();
-				fileBA = IOUtils.toByteArray(inStream);
-			} catch (Exception e) {
-				throw new ArgeoException("Cannot read uploaded data", e);
-			} finally {
-				IOUtils.closeQuietly(inStream);
-			}
-			return fileBA;
-		}
+//		boolean success = upload.performUpload();
+//		if (success) {
+//			if (upload.getUploadItem().getFileSize() == -1)
+//				throw new ArgeoException("File "
+//						+ upload.getUploadItem().getFileName()
+//						+ " has not been uploaded, its size is -1");
+//
+//			InputStream inStream = null;
+//			byte[] fileBA = null;
+//			try {
+//				inStream = upload.getUploadItem().getFileInputStream();
+//				fileBA = IOUtils.toByteArray(inStream);
+//			} catch (Exception e) {
+//				throw new ArgeoException("Cannot read uploaded data", e);
+//			} finally {
+//				IOUtils.closeQuietly(inStream);
+//			}
+//			return fileBA;
+//		}
 		return null;
 	}
 
 	public void addModifyListener(ModifyListener listener) {
-		upload.addModifyListener(listener);
+//		upload.addModifyListener(listener);
 	}
 
 	// private class UploadManager extends UploadAdapter {
diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
index 234985f31..f66a279c6 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ImportToServerWizardPage.java
@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.rwt.widgets.Upload;
+//import org.eclipse.rap.rwt.widgets.Upload;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -35,7 +35,7 @@ public class ImportToServerWizardPage extends WizardPage {
 	public final static String FILE_ITEM_TYPE = "FILE";
 	public final static String FOLDER_ITEM_TYPE = "FOLDER";
 
-	private Upload uploadFile;
+	//private Upload uploadFile;
 
 	public ImportToServerWizardPage() {
 		super("Import from file system");
@@ -47,9 +47,9 @@ public class ImportToServerWizardPage extends WizardPage {
 		composite.setLayout(new GridLayout(2, false));
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		new Label(composite, SWT.NONE).setText("Pick up a file");
-		uploadFile = new Upload(composite, SWT.BORDER);
-		uploadFile.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		uploadFile.setBrowseButtonText("Open...");
+//		uploadFile = new Upload(composite, SWT.BORDER);
+//		uploadFile.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+//		uploadFile.setBrowseButtonText("Open...");
 		setControl(composite);
 	}
 
@@ -59,11 +59,11 @@ public class ImportToServerWizardPage extends WizardPage {
 		// The full path including the directory and file drive are only
 		// returned, if the browser supports reading this properties. In Firefox
 		// 3, only the filename is returned.
-		return uploadFile.getPath();
+		return null;
 	}
 
 	public String getObjectName() {
-		return uploadFile.getUploadItem().getFileName();
+		return null;
 	}
 
 	public String getObjectType() {
@@ -71,17 +71,17 @@ public class ImportToServerWizardPage extends WizardPage {
 	}
 
 	public void performFinish() {
-		boolean success = uploadFile.performUpload();
-		if (!success)
-			throw new ArgeoException("Cannot upload file named "
-					+ uploadFile.getPath());
+//		boolean success = uploadFile.performUpload();
+//		if (!success)
+//			throw new ArgeoException("Cannot upload file named "
+//					+ uploadFile.getPath());
 	}
 
-	protected void handleUploadFinished(final Upload upload) {
-	}
+//	protected void handleUploadFinished(final Upload upload) {
+//	}
 
 	public InputStream getFileInputStream() {
-		return uploadFile.getUploadItem().getFileInputStream();
+		return null;
 	}
 
 	public boolean getNeedsProgressMonitor() {
diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java
index 61607d6ce..8b8837f2e 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/ThreadNLS.java
@@ -16,7 +16,7 @@
 package org.argeo.eclipse.ui.specific;
 
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.rwt.RWT;
+import org.eclipse.rap.rwt.RWT;
 
 /** NLS attached to a given thread */
 public class ThreadNLS<T extends NLS> extends InheritableThreadLocal<T> {
diff --git a/base/runtime/org.argeo.osgi.boot/pom.xml b/base/runtime/org.argeo.osgi.boot/pom.xml
index 9610e101e..be4a7ced8 100644
--- a/base/runtime/org.argeo.osgi.boot/pom.xml
+++ b/base/runtime/org.argeo.osgi.boot/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>
@@ -36,8 +37,9 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
+			<version>3.9.0.v20130305-2200</version>
 		</dependency>
 
 		<!-- TEST -->
diff --git a/pom.xml b/pom.xml
index 79b9209bf..9b7be26a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.2</version>
+					<version>1.1.3-SNAPSHOT</version>
 				</plugin>
 				<!-- Others -->
 				<plugin>
@@ -492,6 +492,15 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<repository>
+			<id>argeo-tp-rap</id>
+			<url>http://alma.vpn:7080/data/public/java/org.argeo.tp.rap-2.1.x</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/security/plugins/org.argeo.security.ui.rap/plugin.xml
index af363bec8..fdc565169 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -6,22 +6,22 @@
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.SecureEntryPoint"
-            parameter="secureWebUi">
+            path="secureWebUi">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.anonymousEntryPoint"
             class="org.argeo.security.ui.rap.AnonymousEntryPoint"
-            parameter="publicWebUi">
+            path="publicWebUi">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.logoutEntryPoint"
             class="org.argeo.security.ui.rap.LogoutEntryPoint"
-            parameter="logout">
+            path="logout">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.nullEntryPoint"
             class="org.argeo.security.ui.rap.NullEntryPoint"
-            parameter="null">
+            path="null">
       </entrypoint>
    </extension>
 
diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java
index 326966f6e..16d24897c 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/AnonymousEntryPoint.java
@@ -24,8 +24,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.eclipse.equinox.security.auth.ILoginContext;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.application.IEntryPoint;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 
diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java
index 003a21820..733754901 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/LogoutEntryPoint.java
@@ -20,8 +20,8 @@ import javax.security.auth.login.LoginException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.equinox.security.auth.ILoginContext;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.application.IEntryPoint;
 import org.eclipse.ui.PlatformUI;
 import org.springframework.security.context.SecurityContextHolder;
 
diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java
index fda6bf132..811cc2821 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/NullEntryPoint.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.security.ui.rap;
 
-import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.application.IEntryPoint;
 import org.eclipse.ui.PlatformUI;
 
 /**
diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
index 6da17d733..288ca623b 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
@@ -29,8 +29,8 @@ import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.util.LocaleUtils;
 import org.eclipse.equinox.security.auth.ILoginContext;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.rwt.RWT;
-import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.application.IEntryPoint;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 import org.springframework.security.BadCredentialsException;
-- 
2.30.2