Enhancements to security

git-svn-id: https://svn.argeo.org/commons/trunk@4289 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product b/security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product
index be468c8aea894fa9fab5cd10c2456e4ffdda34d5..c410c4ed52928185bdb40691ef034f28a191fd51 100644 (file)
--- a/security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product
+++ b/security/plugins/org.argeo.security.ui.application/org.argeo.security.ui.application.product
@@ -8,7 +8,7 @@
 
    <launcherArgs>
       <programArgs>-console -clean</programArgs>
-      <vmArgs>-Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties</vmArgs>
+      <vmArgs>-Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/security/plugins/org.argeo.security.ui.application/log4j.properties</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
@@ -60,6 +60,8 @@
       <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
       <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
       <plugin id="org.argeo.eclipse.ui"/>
+      <plugin id="org.argeo.infra.core"/>
+      <plugin id="org.argeo.infra.security.services" fragment="true"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.equinox"/>
       <plugin id="org.argeo.security.ldap"/>

diff --git a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java b/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
index 4179816646d172c83c2ff8b6d6613090a491a24f..698fdf743a3112b2974fc9adf18bf3f61cf9492d 100644 (file)
--- a/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
+++ b/security/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
@@ -6,7 +6,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
 
-       static final String DEFAULT_PERSPECTIVE_ID = "org.argeo.security.ui.securityPerspective"; //$NON-NLS-1$
+       static final String DEFAULT_PERSPECTIVE_ID = "org.argeo.security.ui.adminSecurityPerspective"; //$NON-NLS-1$
 
        public final static String INITIAL_PERSPECTIVE_PROPERTY = "org.argeo.security.ui.initialPerspective";
        private String initialPerspective = System.getProperty(

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
index d6bff90f3c69baebead087b70d8f374b3f73bb09..8183de518c3189064c3fa9cfba568fcbdfa0563b 100644 (file)
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityPerspective.java
@@ -1,8 +1,5 @@
 package org.argeo.security.ui;
 
-import org.argeo.security.ui.internal.CurrentUser;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;