From 308001aedac299588da2c235c863645482a98c0f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 17 Jan 2011 12:40:59 +0000
Subject: [PATCH] Introduce UI application

git-svn-id: https://svn.argeo.org/commons/trunk@4049 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../security/equinox/SpringLoginModule.java   |   3 ++
 .../.classpath                                |   0
 .../.project                                  |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../SecureRCP.product                         |  11 +++----
 .../argeo_security_rap.properties             |   0
 .../build.properties                          |   0
 .../icons/alt_about.gif                       | Bin
 .../icons/alt_launcher.icns                   | Bin
 .../icons/alt_launcher.ico                    | Bin
 .../icons/alt_launcher.xpm                    |   0
 .../icons/alt_window_16.gif                   | Bin
 .../icons/alt_window_32.gif                   | Bin
 .../log4j.properties                          |   0
 .../plugin.xml                                |   4 +--
 .../pom.xml                                   |  11 ++-----
 .../AbstractSecureApplication.java            |  30 +++++++++++++++---
 .../RapSecureWorkbenchWindowAdvisor.java      |   2 +-
 .../application}/SecureActionBarAdvisor.java  |   2 +-
 .../security/ui/application}/SecureRap.java   |   2 +-
 .../security/ui/application}/SecureRcp.java   |   2 +-
 .../application}/SecureWorkbenchAdvisor.java  |   2 +-
 .../SecureWorkbenchWindowAdvisor.java         |   2 +-
 .../plugins/org.argeo.security.ui.rap/pom.xml |   2 +-
 security/eclipse/plugins/pom.xml              |   2 +-
 security/eclipse/pom.xml                      |   2 +-
 26 files changed, 46 insertions(+), 33 deletions(-)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/.classpath (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/.project (92%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/SecureRCP.product (89%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/argeo_security_rap.properties (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/build.properties (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_about.gif (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_launcher.icns (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_launcher.ico (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_launcher.xpm (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_window_16.gif (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/icons/alt_window_32.gif (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/log4j.properties (100%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/plugin.xml (83%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp => org.argeo.security.ui.application}/pom.xml (94%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/AbstractSecureApplication.java (72%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/RapSecureWorkbenchWindowAdvisor.java (96%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/SecureActionBarAdvisor.java (98%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/SecureRap.java (95%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/SecureRcp.java (91%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/SecureWorkbenchAdvisor.java (93%)
 rename security/eclipse/plugins/{org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp => org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application}/SecureWorkbenchWindowAdvisor.java (95%)

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
index 3f88a00d9..86c26e584 100644
--- a/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
+++ b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
@@ -14,6 +14,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationManager;
+import org.springframework.security.BadCredentialsException;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
 import org.springframework.security.providers.jaas.SecurityContextLoginModule;
@@ -87,6 +88,8 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 						.authenticate(credentials);
 				registerAuthentication(authentication);
 				return super.login();
+			} catch (BadCredentialsException bce) {
+				throw bce;
 			} catch (Exception e) {
 				LoginException loginException = new LoginException(
 						"Bad credentials");
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/.classpath b/security/eclipse/plugins/org.argeo.security.ui.application/.classpath
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/.classpath
rename to security/eclipse/plugins/org.argeo.security.ui.application/.classpath
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/.project b/security/eclipse/plugins/org.argeo.security.ui.application/.project
similarity index 92%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/.project
rename to security/eclipse/plugins/org.argeo.security.ui.application/.project
index feeafcf5b..e83b5d5d9 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/.project
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.security.ui.rcp</name>
+	<name>org.argeo.security.ui.application</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/security/eclipse/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs
rename to security/eclipse/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product b/security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product
similarity index 89%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product
rename to security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product
index f64b05182..b995252f0 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SecureRCP" application="org.argeo.security.ui.rcp.secureUi" useFeatures="false" includeLaunchers="true">
+<product name="SecureRCP" application="org.argeo.security.ui.application.secureUi" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
       <programArgs>-console -clean</programArgs>
-      <vmArgs>-Dlog4j.configuration=file:/home/mbaudier/dev/src/commons/security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties</vmArgs>
+      <vmArgs>-Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
@@ -35,6 +35,7 @@
       <plugin id="com.springsource.org.apache.commons.collections"/>
       <plugin id="com.springsource.org.apache.commons.io"/>
       <plugin id="com.springsource.org.apache.commons.lang"/>
+      <plugin id="com.springsource.org.apache.commons.logging"/>
       <plugin id="com.springsource.org.apache.commons.pool"/>
       <plugin id="com.springsource.org.apache.directory.server.changepw"/>
       <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
@@ -65,7 +66,7 @@
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
       <plugin id="org.argeo.security.ui"/>
-      <plugin id="org.argeo.security.ui.rcp"/>
+      <plugin id="org.argeo.security.ui.application"/>
       <plugin id="org.argeo.server.ads"/>
       <plugin id="org.argeo.server.ads.server"/>
       <plugin id="org.argeo.server.core"/>
@@ -83,13 +84,11 @@
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.equinox.security.ui"/>
       <plugin id="org.eclipse.help"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.ui"/>
@@ -112,10 +111,8 @@
       <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.security.ui" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.security.ui.rcp" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.preferences" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.security.ui" autoStart="true" startLevel="0" />
       <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
    </configurations>
 
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/argeo_security_rap.properties b/security/eclipse/plugins/org.argeo.security.ui.application/argeo_security_rap.properties
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/argeo_security_rap.properties
rename to security/eclipse/plugins/org.argeo.security.ui.application/argeo_security_rap.properties
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/build.properties b/security/eclipse/plugins/org.argeo.security.ui.application/build.properties
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/build.properties
rename to security/eclipse/plugins/org.argeo.security.ui.application/build.properties
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif
rename to security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties b/security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties
similarity index 100%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties
rename to security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml b/security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml
similarity index 83%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml
rename to security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml
index b1829e6f0..a0bd55922 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml
@@ -10,7 +10,7 @@
          thread="main"
          visible="true">
          <run
-               class="org.argeo.security.ui.rcp.SecureRcp">
+               class="org.argeo.security.ui.application.SecureRcp">
          </run>
       </application>
    </extension>
@@ -22,7 +22,7 @@
          thread="main"
          visible="true">
          <run
-               class="org.argeo.security.ui.rcp.SecureRap">
+               class="org.argeo.security.ui.application.SecureRap">
          </run>
       </application>
    </extension>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml b/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
similarity index 94%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml
rename to security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
index f711c69ab..304eea33b 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
@@ -7,8 +7,8 @@
 		<artifactId>plugins</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>org.argeo.security.ui.rcp</artifactId>
-	<name>Commons Security UI RCP</name>
+	<artifactId>org.argeo.security.ui.application</artifactId>
+	<name>Commons Security UI Application</name>
 	<packaging>jar</packaging>
 	<build>
 		<plugins>
@@ -128,13 +128,6 @@
 			<version>0.2.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
-		<dependency>
-			<groupId>org.eclipse.ui</groupId>
-			<artifactId>org.eclipse.ui</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java
similarity index 72%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java
index f7c5fc5d1..5073edf85 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import java.security.PrivilegedAction;
 
@@ -12,10 +12,17 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.ErrorSupportProvider;
+import org.eclipse.jface.util.Policy;
+import org.eclipse.jface.window.Window.IExceptionHandler;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.application.WorkbenchAdvisor;
+import org.eclipse.ui.internal.statushandlers.StackTraceSupportArea;
+import org.eclipse.ui.statushandlers.WorkbenchStatusDialogManager;
 
 public abstract class AbstractSecureApplication implements IApplication {
 	private static final Log log = LogFactory
@@ -29,11 +36,24 @@ public abstract class AbstractSecureApplication implements IApplication {
 		Display display = PlatformUI.createDisplay();
 
 		// Force login
-		String username = CurrentUser.getUsername();
-		if (log.isDebugEnabled())
-			log.debug("Logged in as " + username);
 
 		try {
+			String username = null;
+			Exception loginException = null;
+			try {
+				username = CurrentUser.getUsername();
+			} catch (Exception e) {
+				loginException = e;
+			}
+			if (username == null) {
+				IStatus status = new Status(IStatus.ERROR,
+						"org.argeo.security.application", "Login is mandatory",
+						loginException);
+				ErrorDialog.openError(null, "Error", "Shutdown...", status);
+				return status.getSeverity();
+			}
+			if (log.isDebugEnabled())
+				log.debug("Logged in as " + username);
 			returnCode = (Integer) Subject.doAs(CurrentUser.getSubject(),
 					getRunAction(display));
 			if (log.isDebugEnabled())
@@ -44,7 +64,7 @@ public abstract class AbstractSecureApplication implements IApplication {
 			// e.printStackTrace();
 			IStatus status = new Status(IStatus.ERROR,
 					"org.argeo.security.rcp", "Login failed", e);
-			ErrorDialog.openError(null, "Error", "Login failed", status);
+			ErrorDialog.openError(null, "Error", "Shutdown...", status);
 			return returnCode;
 		} finally {
 			display.dispose();
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java
similarity index 96%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java
index 0025330e7..cd1b0206f 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
similarity index 98%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
index 04e61002c..956467fa2 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IMenuManager;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java
similarity index 95%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java
index 964de7c39..5f2ea3edc 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java
similarity index 91%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java
index cd1d518b4..b8576c4b9 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.ui.PlatformUI;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
similarity index 93%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
index d39bf84d6..dd12e63af 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java
similarity index 95%
rename from security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
rename to security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java
index a1022fe6a..0e875c8b0 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rcp;
+package org.argeo.security.ui.application;
 
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.application.ActionBarAdvisor;
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rap/pom.xml b/security/eclipse/plugins/org.argeo.security.ui.rap/pom.xml
index 1cbb1a457..ea7689d45 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/eclipse/plugins/org.argeo.security.ui.rap/pom.xml
@@ -62,7 +62,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ui.rcp</artifactId>
+			<artifactId>org.argeo.security.ui.application</artifactId>
 			<version>0.2.2-SNAPSHOT</version>
 			<type>pom</type>
 			<exclusions>
diff --git a/security/eclipse/plugins/pom.xml b/security/eclipse/plugins/pom.xml
index f8d71708e..24a5a513c 100644
--- a/security/eclipse/plugins/pom.xml
+++ b/security/eclipse/plugins/pom.xml
@@ -13,7 +13,7 @@
 	<modules>
 		<module>org.argeo.security.equinox</module>
 		<module>org.argeo.security.ui</module>
-		<module>org.argeo.security.ui.rcp</module>
+		<module>org.argeo.security.ui.application</module>
 		<module>org.argeo.security.ui.rap</module>
 	</modules>
 	<build>
diff --git a/security/eclipse/pom.xml b/security/eclipse/pom.xml
index 86a460103..9cc3b1f5e 100644
--- a/security/eclipse/pom.xml
+++ b/security/eclipse/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<version>0.2.2-SNAPSHOT</version>
-		<artifactId>argeo-commons</artifactId>
+		<artifactId>security</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.commons.security</groupId>
-- 
2.30.2