Introduce UI application
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 17 Jan 2011 12:40:59 +0000 (12:40 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 17 Jan 2011 12:40:59 +0000 (12:40 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@4049 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

48 files changed:
security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
security/eclipse/plugins/org.argeo.security.ui.application/.classpath [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/.project [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/argeo_security_rap.properties [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/build.properties [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/pom.xml [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java [new file with mode: 0644]
security/eclipse/plugins/org.argeo.security.ui.rap/pom.xml
security/eclipse/plugins/org.argeo.security.ui.rcp/.classpath [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/.project [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/.settings/org.eclipse.jdt.core.prefs [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/argeo_security_rap.properties [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/build.properties [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java [deleted file]
security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java [deleted file]
security/eclipse/plugins/pom.xml
security/eclipse/pom.xml

index 3f88a00d94aac235fa6e0f136c606a151a0eb187..86c26e584c10d06394f86f85c0d56e3ed98b79c9 100644 (file)
@@ -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.application/.classpath b/security/eclipse/plugins/org.argeo.security.ui.application/.classpath
new file mode 100644 (file)
index 0000000..92f19d2
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/.project b/security/eclipse/plugins/org.argeo.security.ui.application/.project
new file mode 100644 (file)
index 0000000..e83b5d5
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.security.ui.application</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs b/security/eclipse/plugins/org.argeo.security.ui.application/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..1f382cb
--- /dev/null
@@ -0,0 +1,8 @@
+#Sat Jan 15 17:51:30 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product b/security/eclipse/plugins/org.argeo.security.ui.application/SecureRCP.product
new file mode 100644 (file)
index 0000000..b995252
--- /dev/null
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<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:${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>
+
+   <launcher>
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="com.springsource.antlr"/>
+      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
+      <plugin id="com.springsource.javax.servlet"/>
+      <plugin id="com.springsource.javax.xml.stream"/>
+      <plugin id="com.springsource.jdbm"/>
+      <plugin id="com.springsource.junit"/>
+      <plugin id="com.springsource.org.aopalliance"/>
+      <plugin id="com.springsource.org.apache.commons.codec"/>
+      <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"/>
+      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
+      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
+      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
+      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
+      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
+      <plugin id="com.springsource.org.apache.log4j"/>
+      <plugin id="com.springsource.org.apache.mina"/>
+      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
+      <plugin id="com.springsource.org.codehaus.jackson"/>
+      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
+      <plugin id="com.springsource.slf4j.api"/>
+      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
+      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
+      <plugin id="org.argeo.basic.nodeps"/>
+      <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
+      <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.security.core"/>
+      <plugin id="org.argeo.security.equinox"/>
+      <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.application"/>
+      <plugin id="org.argeo.server.ads"/>
+      <plugin id="org.argeo.server.ads.server"/>
+      <plugin id="org.argeo.server.core"/>
+      <plugin id="org.argeo.server.json"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <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_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.springframework.aop"/>
+      <plugin id="org.springframework.beans"/>
+      <plugin id="org.springframework.context"/>
+      <plugin id="org.springframework.core"/>
+      <plugin id="org.springframework.osgi.core"/>
+      <plugin id="org.springframework.osgi.extender"/>
+      <plugin id="org.springframework.osgi.io"/>
+      <plugin id="org.springframework.oxm"/>
+      <plugin id="org.springframework.security.core"/>
+      <plugin id="org.springframework.transaction"/>
+      <plugin id="org.springframework.web.servlet"/>
+      <plugin id="org.springframework.xml"/>
+   </plugins>
+
+   <configurations>
+      <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.server.ads.server" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.preferences" autoStart="true" startLevel="0" />
+      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
+   </configurations>
+
+</product>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/argeo_security_rap.properties b/security/eclipse/plugins/org.argeo.security.ui.application/argeo_security_rap.properties
new file mode 100644 (file)
index 0000000..3557749
--- /dev/null
@@ -0,0 +1,24 @@
+argeo.osgi.start=\
+com.springsource.javax.servlet,\
+org.eclipse.core.runtime,\
+org.eclipse.equinox.common,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.http.registry,\
+org.eclipse.equinox.launcher,\
+org.eclipse.rap.demo,\
+org.mortbay.jetty.server,\
+org.springframework.osgi.extender,\
+org.argeo.server.ads.server,\
+org.argeo.security.manager.ldap,\
+org.argeo.security.services,\
+org.argeo.security.equinox,\
+org.argeo.security.ui,\
+org.argeo.security.ui.rcp,\
+
+eclipse.ignoreApp=true
+osgi.noShutdown=true
+
+log4j.configuration=file:../../log4j.properties
+
+org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
+org.osgi.service.http.port=9090
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/build.properties b/security/eclipse/plugins/org.argeo.security.ui.application/build.properties
new file mode 100644 (file)
index 0000000..ac478ab
--- /dev/null
@@ -0,0 +1,7 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               log4j.properties,\
+               jaas_config.txt
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif
new file mode 100644 (file)
index 0000000..20d9ad2
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_about.gif differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns
new file mode 100644 (file)
index 0000000..b77a6a6
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.icns differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico
new file mode 100644 (file)
index 0000000..d548f71
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.ico differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_launcher.xpm
new file mode 100644 (file)
index 0000000..b0c139e
--- /dev/null
@@ -0,0 +1,307 @@
+/* XPM */\r
+static char * icon48_xpm[] = {\r
+"48 48 256 2",\r
+"      c #4B4B3B3B9090",\r
+".     c #0D0D0E0E5454",\r
+"X     c #11110E0E5B5B",\r
+"o     c #17170F0F6363",\r
+"O     c #1D1D13136969",\r
+"+     c #212114146C6C",\r
+"@     c #252514147171",\r
+"#     c #282811116C6C",\r
+"$     c #26260D0D6363",\r
+"%     c #22220B0B5E5E",\r
+"&     c #1C1C0B0B5A5A",\r
+"*     c #1C1C0B0B5252",\r
+"=     c #1B1B05055353",\r
+"-     c #161606064D4D",\r
+";     c #161605054949",\r
+":     c #111104044848",\r
+">     c #131304044545",\r
+",     c #131305054242",\r
+"<     c #141410105E5E",\r
+"1     c #2C2C15157373",\r
+"2     c #2B2B1B1B7575",\r
+"3     c #343416167272",\r
+"4     c #313113136E6E",\r
+"5     c #222209095757",\r
+"6     c #1B1B06064D4D",\r
+"7     c #15150B0B4242",\r
+"8     c #13130C0C5555",\r
+"9     c #2E2E1B1B7878",\r
+"0     c #33331F1F7C7C",\r
+"q     c #343418187878",\r
+"w     c #3B3B1C1C7575",\r
+"e     c #2E2E10106767",\r
+"r     c #1B1B07074747",\r
+"t     c #18180B0B4646",\r
+"y     c #151513136262",\r
+"u     c #1A1A15156464",\r
+"i     c #34341F1F7777",\r
+"p     c #40401E1E8080",\r
+"a     c #42421B1B7A7A",\r
+"s     c #3B3B15157474",\r
+"d     c #2B2B0B0B5B5B",\r
+"f     c #222207075252",\r
+"g     c #373727277A7A",\r
+"h     c #474724248484",\r
+"j     c #393915156E6E",\r
+"k     c #373711116A6A",\r
+"l     c #343413136363",\r
+"z     c #232319196E6E",\r
+"x     c #292919197070",\r
+"c     c #3C3C2C2C8282",\r
+"v     c #444431318585",\r
+"b     c #494934348A8A",\r
+"n     c #505026268A8A",\r
+"m     c #3D3D1B1B6E6E",\r
+"M     c #31310E0E5C5C",\r
+"N     c #2B2B0D0D5353",\r
+"B     c #222207074A4A",\r
+"V     c #52523C3C9292",\r
+"C     c #58583C3C9494",\r
+"Z     c #5D5D44449797",\r
+"A     c #5C5C2E2E9292",\r
+"S     c #676733339595",\r
+"D     c #424228287575",\r
+"F     c #29290A0A4F4F",\r
+"G     c #6C6C4A4A9E9E",\r
+"H     c #72725454A7A7",\r
+"J     c #8C8C6D6DB2B2",\r
+"K     c #343424246E6E",\r
+"L     c #3A3A23236A6A",\r
+"P     c #3A3A1C1C6767",\r
+"I     c #24240A0A4B4B",\r
+"U     c #151518186161",\r
+"Y     c #76766F6FA5A5",\r
+"T     c #ADAD9191CCCC",\r
+"R     c #98988989D3D3",\r
+"E     c #45453B3B8686",\r
+"W     c #3C3C35357979",\r
+"Q     c #363631317575",\r
+"!     c #32322D2D6B6B",\r
+"~     c #323229296363",\r
+"^     c #30301F1F6262",\r
+"/     c #323218185E5E",\r
+"(     c #272707074B4B",\r
+")     c #202028286C6C",\r
+"_     c #1E1E1D1D6868",\r
+"`     c #9A9A8282BBBB",\r
+"'     c #C8C8B3B3D3D3",\r
+"]     c #B3B3AFAFE7E7",\r
+"[     c #84847272C6C6",\r
+"{     c #58585757A3A3",\r
+"}     c #3F3F3C3C8A8A",\r
+"|     c #3B3B3A3A8484",\r
+" .    c #414139397D7D",\r
+"..    c #3D3D39397A7A",\r
+"X.    c #37372E2E6E6E",\r
+"o.    c #2C2C21215A5A",\r
+"O.    c #2E2E1B1B5B5B",\r
+"+.    c #F5F5EFEFF5F5",\r
+"@.    c #656566669A9A",\r
+"#.    c #47474B4B8E8E",\r
+"$.    c #3C3C44447B7B",\r
+"%.    c #444442428080",\r
+"&.    c #45453E3E8181",\r
+"*.    c #40403C3C8181",\r
+"=.    c #3D3D33337474",\r
+"-.    c #3B3B30306E6E",\r
+";.    c #38382D2D6969",\r
+":.    c #303026265D5D",\r
+">.    c #2C2C15155A5A",\r
+",.    c #1F1F1C1C7070",\r
+"<.    c #25251E1E7171",\r
+"1.    c #59595C5C9191",\r
+"2.    c #4D4D53538989",\r
+"3.    c #4C4C49498484",\r
+"4.    c #484845458585",\r
+"5.    c #494941418585",\r
+"6.    c #494940408181",\r
+"7.    c #2F2F1C1C5353",\r
+"8.    c #2B2B28287676",\r
+"9.    c #323231317F7F",\r
+"0.    c #545452528B8B",\r
+"q.    c #51514E4E8989",\r
+"w.    c #4E4E4B4B8C8C",\r
+"e.    c #4C4C47478686",\r
+"r.    c #46463D3D7E7E",\r
+"t.    c #434336367A7A",\r
+"y.    c #2B2B13135555",\r
+"u.    c #47473D3D8D8D",\r
+"i.    c #575757578E8E",\r
+"p.    c #48483E3E7F7F",\r
+"a.    c #46463A3A7D7D",\r
+"s.    c #424235357575",\r
+"d.    c #404034347171",\r
+"f.    c #BFBFCBCBFAFA",\r
+"g.    c #B8B8A8A8DDDD",\r
+"h.    c #5E5E60609292",\r
+"j.    c #565655558C8C",\r
+"k.    c #4B4B44448282",\r
+"l.    c #454539397B7B",\r
+"z.    c #434338387878",\r
+"x.    c #3F3F32326D6D",\r
+"c.    c #3D3D30306969",\r
+"v.    c #3A3A2E2E6363",\r
+"b.    c #36362A2A5C5C",\r
+"n.    c #343424245555",\r
+"m.    c #30301E1E4D4D",\r
+"M.    c #49493C3C8282",\r
+"N.    c #5E5E4F4F8C8C",\r
+"B.    c #56563B3B8B8B",\r
+"V.    c #545407078585",\r
+"C.    c #424234347272",\r
+"Z.    c #9797A4A4F7F7",\r
+"A.    c #444436367676",\r
+"S.    c #7D7D7979D5D5",\r
+"D.    c #464640408A8A",\r
+"F.    c #44444B4B8282",\r
+"G.    c #414107077777",\r
+"H.    c #71716161C1C1",\r
+"J.    c #303039397979",\r
+"K.    c #8E8E8E8EE6E6",\r
+"L.    c #404033338B8B",\r
+"P.    c #4A4A45458C8C",\r
+"I.    c #46463A3A8080",\r
+"U.    c #363629295454",\r
+"Y.    c #303022224848",\r
+"T.    c #424237377575",\r
+"R.    c #2E2E1D1D6363",\r
+"E.    c #79798383EAEA",\r
+"W.    c #74747B7BE4E4",\r
+"Q.    c #6D6D7676D6D6",\r
+"!.    c #6A6A7171CECE",\r
+"~.    c #66666969C6C6",\r
+"^.    c #62626565BCBC",\r
+"/.    c #5F5F6060B5B5",\r
+"(.    c #5B5B5B5BACAC",\r
+").    c #535353539898",\r
+"_.    c #4F4F4F4FA4A4",\r
+"`.    c #54544D4DA4A4",\r
+"'.    c #323204046B6B",\r
+"].    c #303035357979",\r
+"[.    c #313122224343",\r
+"{.    c #5A5A5B5BB7B7",\r
+"}.    c #484846468080",\r
+"|.    c #454541417575",\r
+" X    c #4B4B31318282",\r
+".X    c #47473C3C8484",\r
+"XX    c #3E3E35356E6E",\r
+"oX    c #2F2F26264040",\r
+"OX    c #2B2B23233A3A",\r
+"+X    c #262619195C5C",\r
+"@X    c #252515155A5A",\r
+"#X    c #55555151B3B3",\r
+"$X    c #3C3C2D2D5D5D",\r
+"%X    c #39392F2F5656",\r
+"&X    c #37372D2D5050",\r
+"*X    c #25251F1F3030",\r
+"=X    c #24241D1D4343",\r
+"-X    c #202013135656",\r
+";X    c #41413B3B6C6C",\r
+":X    c #444442429696",\r
+">X    c #212100005E5E",\r
+",X    c #444436367272",\r
+"<X    c #444436366F6F",\r
+"1X    c #424236366868",\r
+"2X    c #3F3F34346161",\r
+"3X    c #3C3C32325A5A",\r
+"4X    c #34342A2A4A4A",\r
+"5X    c #21211B1B2121",\r
+"6X    c #22221C1C6363",\r
+"7X    c #2D2D01015E5E",\r
+"8X    c #20201B1B2525",\r
+"9X    c #49492F2F7B7B",\r
+"0X    c #434334346C6C",\r
+"qX    c #323229294545",\r
+"wX    c #1C1C10104F4F",\r
+"eX    c #222217176363",\r
+"rX    c #37371E1E6B6B",\r
+"tX    c #424232326E6E",\r
+"yX    c #444433336969",\r
+"uX    c #424233336565",\r
+"iX    c #1E1E1A1A1E1E",\r
+"pX    c #161601014C4C",\r
+"aX    c #1C1C11115454",\r
+"sX    c #252503035B5B",\r
+"dX    c #414131316A6A",\r
+"fX    c #22221F1F7878",\r
+"gX    c #272724246767",\r
+"hX    c #1D1D16165E5E",\r
+"jX    c #131305055151",\r
+"kX    c #40402F2F6464",\r
+"lX    c #111107074E4E",\r
+"zX    c #0C0C05054B4B",\r
+"xX    c #22221E1E5757",\r
+"cX    c #1A1A0D0D4D4D",\r
+"vX    c #16160B0B4D4D",\r
+"bX    c #060604044747",\r
+"nX    c #040403034343",\r
+"mX    c #3B3B27276565",\r
+"MX    c #0E0E03034141",\r
+"NX    c #111106064A4A",\r
+"BX    c #0E0E04044646",\r
+"VX    c #111105053B3B",\r
+"CX    c #0D0D01013A3A",\r
+"ZX    c #030305053F3F",\r
+"AX    c #0F0F0F0F4C4C",\r
+"SX    c #020207073B3B",\r
+"DX    c #0D0D03034646",\r
+"FX    c #0B0B02023F3F",\r
+"GX    c #0D0D02023434",\r
+"HX    c #0A0A0E0E4444",\r
+"JX    c #161614145252",\r
+"KX    c #0B0B04044646",\r
+"LX    c #0A0A03034444",\r
+"PX    c #1D1D21215757",\r
+"IX    c #090910104040",\r
+"UX    c #18181E1E5353",\r
+"                                                                                                ",\r
+"  . . . . X X o o o o O + + @ @ @ @ @ @ @ # # # # # # $ $ % % & & & & * = - - - ; : > > , , ,   ",\r
+"  . . X X < < o o O O + @ 1 2 2 1 1 1 1 1 1 1 1 3 4 # # $ $ $ % % % 5 = = 6 6 - ; ; > > , , 7   ",\r
+"  . 8 < < < o O O + @ @ 2 9 9 0 0 q q q q q q q w 3 4 4 e e $ $ $ $ % 5 = = 6 6 6 ; ; > > r t   ",\r
+"  . X < y u O O + @ 1 2 i 0 0 p p p p p p p a a p a s 3 4 4 e e e e d 5 5 f f 6 6 6 ; ; r r t   ",\r
+"  X < y u O + + @ 2 9 0 g p p h h h h h h h p h h a a s s j k k j l d d 5 5 f f 6 6 r r r r r   ",\r
+"  X < y O z x x 9 0 g c v b n n n n n n n n n n n h a a s s j j m l M d d N f f B B B B r r r   ",\r
+"  < y u + z 2 0 c c b V C Z C C A A A A A S S S n h D w w m m m m k l M d d N f F F F B r r r   ",\r
+"  < y O z z 9 c b V Z G H H H G S G G J J H V v c g g K K K K L P l l l M M N N N N I B B r r   ",\r
+"  U u + z x i v C H Y J J J J H J T R H V E W W Q Q Q Q ! ! ! ~ ^ ^ / / M M M M M N ( B B r r   ",\r
+"  ) _ z x 9 g b Z Y ` ' ' ' T T ] [ { } |  .........W W Q Q X.! ~ ~ o.O./ / / / N F ( B B B r   ",\r
+"  ) ) z x i c V G J ' +.+.+.+.] [ @.#.$.%.%.%.&.*. . .....W =.-.X.;.~ :.o.O.^ >.N F ( B B B B   ",\r
+"  ) ,.<.2 g v C H J ' +.+.+.+.T Y 1.2.3.4.4.4.5.6.&.&. . ...W =.=.-.;.~ :.o.7.>.N F F ( B I I   ",\r
+"  ) ,.<.8.9.b C H J T +.+.+.' J @.1.0.q.q.w.e.4.5.6.&.r. . .t.W =.=.-.;.~ :.o.7.y.N F ( ( I I   ",\r
+"  8.8.8.9.| u.C G J T +.+.' ` Y @.1.i.0.q.q.e.e.5.6.p.r.a. .t.t.s.d.d.-.;.~ :.7.7.y.F F ( I I   ",\r
+"  9.c c c v b A S H ' f.g.` Y @.h.1.i.j.0.q.q.e.k.6.p.r.a.l.t.z.s.s.d.x.c.v.b.n.m.7.N F F F I   ",\r
+"  <.g M.N.B.B.n V.J f.R J @.h.h.1.i.i.j.j.0.q.3.k.6.p.r.a.l.l.z.s.C.d.x.x.c.v.b.n.m.y.N F F F   ",\r
+"  + x i v B.Z Z G g.Z.[ @.2.i.i.j.j.j.j.j.0.q.3.k.6.p.p.a.l.l.A.s.C.C.d.x.c.v.b.n.m.7.y.N N y.  ",\r
+"  O # 3 w p n Z ` f.S.H D.F.q.0.0.0.0.j.0.q.q.3.k.6.p.r.a.a.l.A.s.s.C.d.x.x.c.v.b.n.m.y.y.y.y.  ",\r
+"  O # 4 s a G.V.T Z.H.V J.%.e.w.q.0.0.0.0.q.q.e.k.6.p.r.a.a.l.z.A.s.C.d.d.x.c.v.b.n.m.7.>.y.y.  ",\r
+"  O # 4 s w G.A f.K.H L...4.P.w.w.w.q.q.q.q.e.e.5.6.M.I.I.a.a.l.z.A.s.d.d.x.c.v.v.U.Y.7.O.>.y.  ",\r
+"  $ # 4 3 s G.G f.S.Z 9.*.D.P.P.w.w.w.w.w.e.e.5.5.M.M.I.I.a.a.l.z.T.s.d.d.x.x.c.v.U.Y.m.R.>.>.  ",\r
+"  E.E.W.W.W.W.E.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { )._.`._.  ",\r
+"  + # 3 w s '.` f.H.V ].*.D.P.P.P.P.P.P.P.5.5.5.M.M.M.I.I.a.l.z.z.T.T.s.d.d.x.c.v.U.Y.[.^ O.>.  ",\r
+"  ~.~.~.~.~.~.K.Z.S.~.{.^.^.^.^.^.^.^.^././././././.(.(.(.(.(.(.{ { { { { ).).).w.w.}.|.P.u.}   ",\r
+"   .I.6. X X XT f.H.b ].*.E D.D.D.D.5.5..X.XM.M.I.I.a.a.l.l.z.z.T.T.T.d.XXx.c.v.b.U.oXOXR.+X@X  ",\r
+"  E.E.E.W.W.W.K.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { ).).#X_._.  ",\r
+"  & % $ e '.= H f.H.b 8.W *.E E E .X.X.XI.I.I.I.a.a.l.l.z.z.T.T.T.C.XXXXc.v.$X%X&XY.*X=X2 @X-X  ",\r
+"  {.{.{.{.{.#X~.Z.W.~.{.{./././././././././.(.(.(.(.(.(.(.{ { { { { { ).).).w.w.3.}.;X%.:X} }   ",\r
+"  & & % $ e >XV.f.S.C K X.W t. . .l.l.t.t.t.t.A.A.A.,X,X,X,X,X<X;X1X1X2X3X%X&X4XoX*X5Xo.6X-X-X  ",\r
+"  & & % $ $ >X7X` Z.Z D ! =.=.s.t.t.t.A.A.s.A.,X,X,X,X<X<X<X<X;X1X2X2X3X%X&X4XoXOX8X5X<.@X-X-X  ",\r
+"  8 & & $ e K 9XJ f.^. XK X.=.=.s.s.s.s.s.C.C.C.C.<X0X0X0X1X1X1X2X2X3X%X&X4XqXOX*X8X=X<.-X-XwX  ",\r
+"  8 & eXK k.@.M. Xg.E.B.rX~ -.d.d.C.C.C.C.C.tX0X0X0XyXyX1X1XuX2X2X3X%X&X4XqXoXOX8XiX6XeX-X-XwX  ",\r
+"  6XQ h.Y N.K e pXB.f./.9Xo.;.-.x.d.tXtXtXtXtX0X0XyXyXyXuXuX2X2X3X%X&X4XqXoXOX*XiX=X_ aX-XaXwX  ",\r
+"  Y Y  .R.@X% sX= 7XT Z.V P :.;.c.x.x.x.tXdXdXdXyXyXuXuX2X2X3X3X%X&X4XqXoXOX*X8X*XfXaXaXaXwXwX  ",\r
+"  gXhX& * & 5 5 sXjXa ] S.9X/ ~ v.c.dXdXdXdXdXuXuXuXkX2X2X3X%X%X&X4XqXoXOX*X8XiX<.hXwXwXaXwXwX  ",\r
+"  8 lXlXjX= * 5 5 = zX9X] H.D 7.b.v.v.kXc.kXkXkXkXkX2X$X3X%X&X&X4XqXoXOX*X8XiXxXhXwXcXcXwXwXwX  ",\r
+"  zXzXlXlXjX= = f f sXD Y ] ~.D 7.n.b.v.v.kXkXkXkX$X$X%X%X&X4XqXoXoXOX*X8X5XgXu cXvXvXcXcXwXwX  ",\r
+"  bXbXzXlXlX- = * @XX.h.e D T S.D n.m.b.$X$X$X$X$X%X%X&X&X4XqXoXOX*X8X8X*X<.hXvX; ; vXvXvXcXwX  ",\r
+"  nXbXzXzXlXlX- -XX.Y R.pXpXP J K.Z mXm.n.U.U.U.U.U.4X4XY.oXOX*X8X8X8X=X,.aXvX; > > > t t t cX  ",\r
+"  nXbXbXzXzXlXaXXXY +Xf = f = 7XtXR R   mXn.Y.[.[.[.[.OX*X*X8X5X*X=X,.u vXvX; > > MXMX, 7 t t   ",\r
+"  nXnXnXbXzXvX-.Y +XcX6 6 = = = d L B.G H `.X.:.7.m.=X=X=X=X=X6X,.u cXvXNX: BX> MXVXCXVX7 7 7   ",\r
+"  ZXZXnXbXAXgX@.+XvX; - - - - * @XR.>.sX>.R.i 0 x eXeXeXeXO hXaXcXvXNX: BXMXMXMXVXCXCXCXVX7 7   ",\r
+"  SXZXZXAXgXN.aXNX: : NXNXNX- * +X+X* 6 6 6 * * * * * * * vXvX- NX: DXBXMXMXFXCXCXCXCXGXVXVX7   ",\r
+"  SXSXHXgX0.JXKXLXKXKXDX: : NX* @X-X- - - - - - - - - - - NX: DXDXDXMXMXFXFXCXCXCXCXGXGXGXVXVX  ",\r
+"  SXHXPX3.JXnXnXnXnXbXLXKXKXNXaX-XvX: : NX: : : : : : : BXDXDXLXMXMXFXFXCXCXCXCXGXGXGXGXGXGXGX  ",\r
+"  IXUX$.AXZXZXZXZXnXnXnXLXLXNXJXvXBXDXBXBXBXBXDXDXDXDXLXDXLXLXFXFXFXFXCXCXCXCXGXGXGXGXGXGXGXGX  ",\r
+"                                                                                                "};\r
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif
new file mode 100644 (file)
index 0000000..05626b1
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_16.gif differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif
new file mode 100644 (file)
index 0000000..b432f88
Binary files /dev/null and b/security/eclipse/plugins/org.argeo.security.ui.application/icons/alt_window_32.gif differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties b/security/eclipse/plugins/org.argeo.security.ui.application/log4j.properties
new file mode 100644 (file)
index 0000000..8a89a4a
--- /dev/null
@@ -0,0 +1,24 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.springframework.security=DEBUG
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+log4j.logger.org.apache.directory.server=INFO
+log4j.logger.org.apache.directory.server.core.partition=ERROR
+log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
+
+log4j.logger.org.apache.jackrabbit=WARN
+log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml b/security/eclipse/plugins/org.argeo.security.ui.application/plugin.xml
new file mode 100644 (file)
index 0000000..a0bd559
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         id="secureUi"
+         name="Argeo Secure UI"
+         point="org.eclipse.core.runtime.applications">
+      <application cardinality="singleton-global"
+         thread="main"
+         visible="true">
+         <run
+               class="org.argeo.security.ui.application.SecureRcp">
+         </run>
+      </application>
+   </extension>
+   <extension
+         id="secureWebUi"
+         name="Argeo Secure Web UI"
+         point="org.eclipse.core.runtime.applications">
+      <application cardinality="singleton-global"
+         thread="main"
+         visible="true">
+         <run
+               class="org.argeo.security.ui.application.SecureRap">
+         </run>
+      </application>
+   </extension>
+
+</plugin>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml b/security/eclipse/plugins/org.argeo.security.ui.application/pom.xml
new file mode 100644 (file)
index 0000000..304eea3
--- /dev/null
@@ -0,0 +1,152 @@
+<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.security</groupId>
+               <version>0.2.2-SNAPSHOT</version>
+               <artifactId>plugins</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.ui.application</artifactId>
+       <name>Commons Security UI Application</name>
+       <packaging>jar</packaging>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
+                                               <Import-Package>*</Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>resolve-pde-sources</id>
+                                               <goals>
+                                                       <goal>pde-sources</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>check-osgi</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>equinox</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <onlyCheck>true</onlyCheck>
+                                                       <argsToAppend>
+                                                               <arg>-clean</arg>
+                                                       </argsToAppend>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- Argeo Security -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.equinox</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ui</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.ads</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.ads.server</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.services</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.manager.ldap</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.ads</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+               </dependency>
+
+               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+               
+               <!-- TODO: to be removed -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.json</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.nodeps</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+               </dependency>
+
+
+               <!-- Others -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+               </dependency>
+               <!-- Commons Dep -->
+               <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
+                       <version>0.2.2-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/AbstractSecureApplication.java
new file mode 100644 (file)
index 0000000..5073edf
--- /dev/null
@@ -0,0 +1,121 @@
+package org.argeo.security.ui.application;
+
+import java.security.PrivilegedAction;
+
+import javax.security.auth.Subject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.security.equinox.CurrentUser;
+import org.eclipse.core.runtime.IStatus;
+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
+                       .getLog(AbstractSecureApplication.class);
+
+       protected abstract WorkbenchAdvisor createWorkbenchAdvisor();
+
+       public Object start(IApplicationContext context) throws Exception {
+
+               Integer returnCode = null;
+               Display display = PlatformUI.createDisplay();
+
+               // Force login
+
+               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())
+                               log.debug("secure action completed");
+                       CurrentUser.logout();
+                       return processReturnCode(returnCode);
+               } catch (Exception e) {
+                       // e.printStackTrace();
+                       IStatus status = new Status(IStatus.ERROR,
+                                       "org.argeo.security.rcp", "Login failed", e);
+                       ErrorDialog.openError(null, "Error", "Shutdown...", status);
+                       return returnCode;
+               } finally {
+                       display.dispose();
+               }
+       }
+
+       protected Integer processReturnCode(Integer returnCode) {
+               return returnCode;
+       }
+
+       @SuppressWarnings("rawtypes")
+       private PrivilegedAction getRunAction(final Display display) {
+               return new PrivilegedAction() {
+
+                       public Object run() {
+                               int result = createAndRunWorkbench(display);
+                               return new Integer(result);
+                       }
+               };
+       }
+
+       protected Integer createAndRunWorkbench(Display display) {
+               return PlatformUI.createAndRunWorkbench(display,
+                               createWorkbenchAdvisor());
+       }
+
+       public void stop() {
+               final IWorkbench workbench;
+               try {
+                       workbench = PlatformUI.getWorkbench();
+               } catch (Exception e) {
+                       return;
+               }
+               if (workbench == null)
+                       return;
+               final Display display = workbench.getDisplay();
+               if (display != null && !display.isDisposed())
+                       display.syncExec(new Runnable() {
+
+                               public void run() {
+                                       if (!display.isDisposed())
+                                               workbench.close();
+                               }
+                       });
+
+               if (log.isDebugEnabled())
+                       log.debug("workbench stopped");
+               String username = CurrentUser.getUsername();
+               if (log.isDebugEnabled())
+                       log.debug("workbench stopped, logged in as " + username);
+
+       }
+
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/RapSecureWorkbenchWindowAdvisor.java
new file mode 100644 (file)
index 0000000..cd1b020
--- /dev/null
@@ -0,0 +1,39 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.application.ActionBarAdvisor;
+import org.eclipse.ui.application.IActionBarConfigurer;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+
+public class RapSecureWorkbenchWindowAdvisor extends
+               SecureWorkbenchWindowAdvisor {
+
+       public RapSecureWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+               super(configurer);
+       }
+
+       @Override
+       public ActionBarAdvisor createActionBarAdvisor(
+                       IActionBarConfigurer configurer) {
+               return new SecureActionBarAdvisor(configurer, false);
+       }
+
+       public void preWindowOpen() {
+               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
+               // configurer.setInitialSize(new Point(800, 600));
+               configurer.setShowCoolBar(false);
+               configurer.setShowMenuBar(true);
+               configurer.setShowStatusLine(false);
+               configurer.setShowPerspectiveBar(true);
+               configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
+               // Full screen, see
+               // http://dev.eclipse.org/newslists/news.eclipse.technology.rap/msg02697.html
+               configurer.setShellStyle(SWT.NONE);
+               Rectangle bounds = Display.getDefault().getBounds();
+               configurer.setInitialSize(new Point(bounds.width, bounds.height));
+       }
+
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
new file mode 100644 (file)
index 0000000..956467f
--- /dev/null
@@ -0,0 +1,87 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.jface.action.GroupMarker;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
+import org.eclipse.ui.application.ActionBarAdvisor;
+import org.eclipse.ui.application.IActionBarConfigurer;
+
+public class SecureActionBarAdvisor extends ActionBarAdvisor {
+       private IWorkbenchAction exitAction;
+       private IWorkbenchAction openPerspectiveDialogAction;
+       private IWorkbenchAction showViewMenuAction;
+       private IWorkbenchAction newWindowAction;
+       private IWorkbenchAction preferences;
+       private IWorkbenchAction helpContentAction;
+       // private IWorkbenchAction aboutAction;
+
+       private final Boolean isRcp;
+
+       public SecureActionBarAdvisor(IActionBarConfigurer configurer, Boolean isRcp) {
+               super(configurer);
+               this.isRcp = isRcp;
+       }
+
+       protected void makeActions(IWorkbenchWindow window) {
+               preferences = ActionFactory.PREFERENCES.create(window);
+               register(preferences);
+               openPerspectiveDialogAction = ActionFactory.OPEN_PERSPECTIVE_DIALOG
+                               .create(window);
+               register(openPerspectiveDialogAction);
+               showViewMenuAction = ActionFactory.SHOW_VIEW_MENU.create(window);
+               register(showViewMenuAction);
+               helpContentAction = ActionFactory.HELP_CONTENTS.create(window);
+               register(helpContentAction);
+
+               exitAction = ActionFactory.QUIT.create(window);
+               register(exitAction);
+               if (isRcp) {
+                       // aboutAction = ActionFactory.ABOUT.create(window);
+                       // register(aboutAction);
+                       newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
+                       register(newWindowAction);
+               }
+       }
+
+       protected void fillMenuBar(IMenuManager menuBar) {
+               MenuManager fileMenu = new MenuManager("&File",
+                               IWorkbenchActionConstants.M_FILE);
+               MenuManager editMenu = new MenuManager("&Edit",
+                               IWorkbenchActionConstants.M_EDIT);
+               MenuManager windowMenu = new MenuManager("&Window",
+                               IWorkbenchActionConstants.M_WINDOW);
+               MenuManager helpMenu = new MenuManager("&Help",
+                               IWorkbenchActionConstants.M_HELP);
+
+               menuBar.add(fileMenu);
+               menuBar.add(editMenu);
+               menuBar.add(windowMenu);
+               // Add a group marker indicating where action set menus will appear.
+               menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
+               menuBar.add(helpMenu);
+
+               // File
+               if (isRcp) {
+                       fileMenu.add(newWindowAction);
+                       fileMenu.add(new Separator());
+               }
+               fileMenu.add(exitAction);
+
+               // Edit
+               editMenu.add(preferences);
+
+               // Window
+               windowMenu.add(openPerspectiveDialogAction);
+               windowMenu.add(showViewMenuAction);
+
+               // Help
+               helpMenu.add(helpContentAction);
+               // helpMenu.add(aboutAction);
+       }
+
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRap.java
new file mode 100644 (file)
index 0000000..5f2ea3e
--- /dev/null
@@ -0,0 +1,38 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.eclipse.ui.application.WorkbenchAdvisor;
+import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+
+/** Generic secure application for RAP. */
+public class SecureRap extends AbstractSecureApplication {
+
+       @Override
+       protected WorkbenchAdvisor createWorkbenchAdvisor() {
+               return new SecureWorkbenchAdvisor() {
+                       public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
+                                       IWorkbenchWindowConfigurer configurer) {
+                               return new RapSecureWorkbenchWindowAdvisor(configurer);
+                       }
+
+               };
+       }
+
+       public void stop() {
+               final IWorkbench workbench = PlatformUI.getWorkbench();
+               if (workbench == null)
+                       return;
+               final Display display = workbench.getDisplay();
+               display.syncExec(new Runnable() {
+
+                       public void run() {
+                               if (!display.isDisposed())
+                                       workbench.close();
+                       }
+               });
+       }
+
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureRcp.java
new file mode 100644 (file)
index 0000000..b8576c4
--- /dev/null
@@ -0,0 +1,21 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.application.WorkbenchAdvisor;
+
+public class SecureRcp extends AbstractSecureApplication {
+
+       @Override
+       protected WorkbenchAdvisor createWorkbenchAdvisor() {
+               return new SecureWorkbenchAdvisor();
+       }
+
+       protected Integer processReturnCode(Integer returnCode) {
+               if (returnCode == PlatformUI.RETURN_RESTART)
+                       return IApplication.EXIT_RESTART;
+               else
+                       return IApplication.EXIT_OK;
+       }
+
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchAdvisor.java
new file mode 100644 (file)
index 0000000..dd12e63
--- /dev/null
@@ -0,0 +1,18 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.eclipse.ui.application.WorkbenchAdvisor;
+import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+
+public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
+
+       static final String PERSPECTIVE_ID = "org.argeo.security.ui.securityPerspective"; //$NON-NLS-1$
+
+    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+        return new SecureWorkbenchWindowAdvisor(configurer);
+    }
+
+       public String getInitialWindowPerspectiveId() {
+               return PERSPECTIVE_ID;
+       }
+}
diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureWorkbenchWindowAdvisor.java
new file mode 100644 (file)
index 0000000..0e875c8
--- /dev/null
@@ -0,0 +1,30 @@
+package org.argeo.security.ui.application;
+
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.ui.application.ActionBarAdvisor;
+import org.eclipse.ui.application.IActionBarConfigurer;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+
+public class SecureWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
+
+       public SecureWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+               super(configurer);
+       }
+
+       public ActionBarAdvisor createActionBarAdvisor(
+                       IActionBarConfigurer configurer) {
+               return new SecureActionBarAdvisor(configurer, true);
+       }
+
+       public void preWindowOpen() {
+               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
+               configurer.setInitialSize(new Point(800, 600));
+               configurer.setShowCoolBar(false);
+               configurer.setShowMenuBar(true);
+               configurer.setShowStatusLine(false);
+               configurer.setShowPerspectiveBar(true);
+               configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
+       }
+
+}
index 1cbb1a457f004d4a9b02eeafcfc36ee39a969a14..ea7689d454b45d00043b549e349ac5b602cfff42 100644 (file)
@@ -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/org.argeo.security.ui.rcp/.classpath b/security/eclipse/plugins/org.argeo.security.ui.rcp/.classpath
deleted file mode 100644 (file)
index 92f19d2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/.project b/security/eclipse/plugins/org.argeo.security.ui.rcp/.project
deleted file mode 100644 (file)
index feeafcf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.security.ui.rcp</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
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.rcp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 1f382cb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#Sat Jan 15 17:51:30 CET 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product b/security/eclipse/plugins/org.argeo.security.ui.rcp/SecureRCP.product
deleted file mode 100644 (file)
index f64b051..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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">
-
-   <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>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.springsource.antlr"/>
-      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
-      <plugin id="com.springsource.javax.servlet"/>
-      <plugin id="com.springsource.javax.xml.stream"/>
-      <plugin id="com.springsource.jdbm"/>
-      <plugin id="com.springsource.junit"/>
-      <plugin id="com.springsource.org.aopalliance"/>
-      <plugin id="com.springsource.org.apache.commons.codec"/>
-      <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.pool"/>
-      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
-      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
-      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
-      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
-      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
-      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
-      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
-      <plugin id="com.springsource.org.apache.log4j"/>
-      <plugin id="com.springsource.org.apache.mina"/>
-      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
-      <plugin id="com.springsource.org.codehaus.jackson"/>
-      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
-      <plugin id="com.springsource.slf4j.api"/>
-      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
-      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
-      <plugin id="org.argeo.basic.nodeps"/>
-      <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
-      <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.security.core"/>
-      <plugin id="org.argeo.security.equinox"/>
-      <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.server.ads"/>
-      <plugin id="org.argeo.server.ads.server"/>
-      <plugin id="org.argeo.server.core"/>
-      <plugin id="org.argeo.server.json"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <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"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.springframework.aop"/>
-      <plugin id="org.springframework.beans"/>
-      <plugin id="org.springframework.context"/>
-      <plugin id="org.springframework.core"/>
-      <plugin id="org.springframework.osgi.core"/>
-      <plugin id="org.springframework.osgi.extender"/>
-      <plugin id="org.springframework.osgi.io"/>
-      <plugin id="org.springframework.oxm"/>
-      <plugin id="org.springframework.security.core"/>
-      <plugin id="org.springframework.transaction"/>
-      <plugin id="org.springframework.web.servlet"/>
-      <plugin id="org.springframework.xml"/>
-   </plugins>
-
-   <configurations>
-      <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>
-
-</product>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/argeo_security_rap.properties b/security/eclipse/plugins/org.argeo.security.ui.rcp/argeo_security_rap.properties
deleted file mode 100644 (file)
index 3557749..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-argeo.osgi.start=\
-com.springsource.javax.servlet,\
-org.eclipse.core.runtime,\
-org.eclipse.equinox.common,\
-org.eclipse.equinox.http.jetty,\
-org.eclipse.equinox.http.registry,\
-org.eclipse.equinox.launcher,\
-org.eclipse.rap.demo,\
-org.mortbay.jetty.server,\
-org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
-org.argeo.security.manager.ldap,\
-org.argeo.security.services,\
-org.argeo.security.equinox,\
-org.argeo.security.ui,\
-org.argeo.security.ui.rcp,\
-
-eclipse.ignoreApp=true
-osgi.noShutdown=true
-
-log4j.configuration=file:../../log4j.properties
-
-org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
-org.osgi.service.http.port=9090
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/build.properties b/security/eclipse/plugins/org.argeo.security.ui.rcp/build.properties
deleted file mode 100644 (file)
index ac478ab..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               log4j.properties,\
-               jaas_config.txt
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif
deleted file mode 100644 (file)
index 20d9ad2..0000000
Binary files a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_about.gif and /dev/null differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns
deleted file mode 100644 (file)
index b77a6a6..0000000
Binary files a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.icns and /dev/null differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico
deleted file mode 100644 (file)
index d548f71..0000000
Binary files a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.ico and /dev/null differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_launcher.xpm
deleted file mode 100644 (file)
index b0c139e..0000000
+++ /dev/null
@@ -1,307 +0,0 @@
-/* XPM */\r
-static char * icon48_xpm[] = {\r
-"48 48 256 2",\r
-"      c #4B4B3B3B9090",\r
-".     c #0D0D0E0E5454",\r
-"X     c #11110E0E5B5B",\r
-"o     c #17170F0F6363",\r
-"O     c #1D1D13136969",\r
-"+     c #212114146C6C",\r
-"@     c #252514147171",\r
-"#     c #282811116C6C",\r
-"$     c #26260D0D6363",\r
-"%     c #22220B0B5E5E",\r
-"&     c #1C1C0B0B5A5A",\r
-"*     c #1C1C0B0B5252",\r
-"=     c #1B1B05055353",\r
-"-     c #161606064D4D",\r
-";     c #161605054949",\r
-":     c #111104044848",\r
-">     c #131304044545",\r
-",     c #131305054242",\r
-"<     c #141410105E5E",\r
-"1     c #2C2C15157373",\r
-"2     c #2B2B1B1B7575",\r
-"3     c #343416167272",\r
-"4     c #313113136E6E",\r
-"5     c #222209095757",\r
-"6     c #1B1B06064D4D",\r
-"7     c #15150B0B4242",\r
-"8     c #13130C0C5555",\r
-"9     c #2E2E1B1B7878",\r
-"0     c #33331F1F7C7C",\r
-"q     c #343418187878",\r
-"w     c #3B3B1C1C7575",\r
-"e     c #2E2E10106767",\r
-"r     c #1B1B07074747",\r
-"t     c #18180B0B4646",\r
-"y     c #151513136262",\r
-"u     c #1A1A15156464",\r
-"i     c #34341F1F7777",\r
-"p     c #40401E1E8080",\r
-"a     c #42421B1B7A7A",\r
-"s     c #3B3B15157474",\r
-"d     c #2B2B0B0B5B5B",\r
-"f     c #222207075252",\r
-"g     c #373727277A7A",\r
-"h     c #474724248484",\r
-"j     c #393915156E6E",\r
-"k     c #373711116A6A",\r
-"l     c #343413136363",\r
-"z     c #232319196E6E",\r
-"x     c #292919197070",\r
-"c     c #3C3C2C2C8282",\r
-"v     c #444431318585",\r
-"b     c #494934348A8A",\r
-"n     c #505026268A8A",\r
-"m     c #3D3D1B1B6E6E",\r
-"M     c #31310E0E5C5C",\r
-"N     c #2B2B0D0D5353",\r
-"B     c #222207074A4A",\r
-"V     c #52523C3C9292",\r
-"C     c #58583C3C9494",\r
-"Z     c #5D5D44449797",\r
-"A     c #5C5C2E2E9292",\r
-"S     c #676733339595",\r
-"D     c #424228287575",\r
-"F     c #29290A0A4F4F",\r
-"G     c #6C6C4A4A9E9E",\r
-"H     c #72725454A7A7",\r
-"J     c #8C8C6D6DB2B2",\r
-"K     c #343424246E6E",\r
-"L     c #3A3A23236A6A",\r
-"P     c #3A3A1C1C6767",\r
-"I     c #24240A0A4B4B",\r
-"U     c #151518186161",\r
-"Y     c #76766F6FA5A5",\r
-"T     c #ADAD9191CCCC",\r
-"R     c #98988989D3D3",\r
-"E     c #45453B3B8686",\r
-"W     c #3C3C35357979",\r
-"Q     c #363631317575",\r
-"!     c #32322D2D6B6B",\r
-"~     c #323229296363",\r
-"^     c #30301F1F6262",\r
-"/     c #323218185E5E",\r
-"(     c #272707074B4B",\r
-")     c #202028286C6C",\r
-"_     c #1E1E1D1D6868",\r
-"`     c #9A9A8282BBBB",\r
-"'     c #C8C8B3B3D3D3",\r
-"]     c #B3B3AFAFE7E7",\r
-"[     c #84847272C6C6",\r
-"{     c #58585757A3A3",\r
-"}     c #3F3F3C3C8A8A",\r
-"|     c #3B3B3A3A8484",\r
-" .    c #414139397D7D",\r
-"..    c #3D3D39397A7A",\r
-"X.    c #37372E2E6E6E",\r
-"o.    c #2C2C21215A5A",\r
-"O.    c #2E2E1B1B5B5B",\r
-"+.    c #F5F5EFEFF5F5",\r
-"@.    c #656566669A9A",\r
-"#.    c #47474B4B8E8E",\r
-"$.    c #3C3C44447B7B",\r
-"%.    c #444442428080",\r
-"&.    c #45453E3E8181",\r
-"*.    c #40403C3C8181",\r
-"=.    c #3D3D33337474",\r
-"-.    c #3B3B30306E6E",\r
-";.    c #38382D2D6969",\r
-":.    c #303026265D5D",\r
-">.    c #2C2C15155A5A",\r
-",.    c #1F1F1C1C7070",\r
-"<.    c #25251E1E7171",\r
-"1.    c #59595C5C9191",\r
-"2.    c #4D4D53538989",\r
-"3.    c #4C4C49498484",\r
-"4.    c #484845458585",\r
-"5.    c #494941418585",\r
-"6.    c #494940408181",\r
-"7.    c #2F2F1C1C5353",\r
-"8.    c #2B2B28287676",\r
-"9.    c #323231317F7F",\r
-"0.    c #545452528B8B",\r
-"q.    c #51514E4E8989",\r
-"w.    c #4E4E4B4B8C8C",\r
-"e.    c #4C4C47478686",\r
-"r.    c #46463D3D7E7E",\r
-"t.    c #434336367A7A",\r
-"y.    c #2B2B13135555",\r
-"u.    c #47473D3D8D8D",\r
-"i.    c #575757578E8E",\r
-"p.    c #48483E3E7F7F",\r
-"a.    c #46463A3A7D7D",\r
-"s.    c #424235357575",\r
-"d.    c #404034347171",\r
-"f.    c #BFBFCBCBFAFA",\r
-"g.    c #B8B8A8A8DDDD",\r
-"h.    c #5E5E60609292",\r
-"j.    c #565655558C8C",\r
-"k.    c #4B4B44448282",\r
-"l.    c #454539397B7B",\r
-"z.    c #434338387878",\r
-"x.    c #3F3F32326D6D",\r
-"c.    c #3D3D30306969",\r
-"v.    c #3A3A2E2E6363",\r
-"b.    c #36362A2A5C5C",\r
-"n.    c #343424245555",\r
-"m.    c #30301E1E4D4D",\r
-"M.    c #49493C3C8282",\r
-"N.    c #5E5E4F4F8C8C",\r
-"B.    c #56563B3B8B8B",\r
-"V.    c #545407078585",\r
-"C.    c #424234347272",\r
-"Z.    c #9797A4A4F7F7",\r
-"A.    c #444436367676",\r
-"S.    c #7D7D7979D5D5",\r
-"D.    c #464640408A8A",\r
-"F.    c #44444B4B8282",\r
-"G.    c #414107077777",\r
-"H.    c #71716161C1C1",\r
-"J.    c #303039397979",\r
-"K.    c #8E8E8E8EE6E6",\r
-"L.    c #404033338B8B",\r
-"P.    c #4A4A45458C8C",\r
-"I.    c #46463A3A8080",\r
-"U.    c #363629295454",\r
-"Y.    c #303022224848",\r
-"T.    c #424237377575",\r
-"R.    c #2E2E1D1D6363",\r
-"E.    c #79798383EAEA",\r
-"W.    c #74747B7BE4E4",\r
-"Q.    c #6D6D7676D6D6",\r
-"!.    c #6A6A7171CECE",\r
-"~.    c #66666969C6C6",\r
-"^.    c #62626565BCBC",\r
-"/.    c #5F5F6060B5B5",\r
-"(.    c #5B5B5B5BACAC",\r
-").    c #535353539898",\r
-"_.    c #4F4F4F4FA4A4",\r
-"`.    c #54544D4DA4A4",\r
-"'.    c #323204046B6B",\r
-"].    c #303035357979",\r
-"[.    c #313122224343",\r
-"{.    c #5A5A5B5BB7B7",\r
-"}.    c #484846468080",\r
-"|.    c #454541417575",\r
-" X    c #4B4B31318282",\r
-".X    c #47473C3C8484",\r
-"XX    c #3E3E35356E6E",\r
-"oX    c #2F2F26264040",\r
-"OX    c #2B2B23233A3A",\r
-"+X    c #262619195C5C",\r
-"@X    c #252515155A5A",\r
-"#X    c #55555151B3B3",\r
-"$X    c #3C3C2D2D5D5D",\r
-"%X    c #39392F2F5656",\r
-"&X    c #37372D2D5050",\r
-"*X    c #25251F1F3030",\r
-"=X    c #24241D1D4343",\r
-"-X    c #202013135656",\r
-";X    c #41413B3B6C6C",\r
-":X    c #444442429696",\r
-">X    c #212100005E5E",\r
-",X    c #444436367272",\r
-"<X    c #444436366F6F",\r
-"1X    c #424236366868",\r
-"2X    c #3F3F34346161",\r
-"3X    c #3C3C32325A5A",\r
-"4X    c #34342A2A4A4A",\r
-"5X    c #21211B1B2121",\r
-"6X    c #22221C1C6363",\r
-"7X    c #2D2D01015E5E",\r
-"8X    c #20201B1B2525",\r
-"9X    c #49492F2F7B7B",\r
-"0X    c #434334346C6C",\r
-"qX    c #323229294545",\r
-"wX    c #1C1C10104F4F",\r
-"eX    c #222217176363",\r
-"rX    c #37371E1E6B6B",\r
-"tX    c #424232326E6E",\r
-"yX    c #444433336969",\r
-"uX    c #424233336565",\r
-"iX    c #1E1E1A1A1E1E",\r
-"pX    c #161601014C4C",\r
-"aX    c #1C1C11115454",\r
-"sX    c #252503035B5B",\r
-"dX    c #414131316A6A",\r
-"fX    c #22221F1F7878",\r
-"gX    c #272724246767",\r
-"hX    c #1D1D16165E5E",\r
-"jX    c #131305055151",\r
-"kX    c #40402F2F6464",\r
-"lX    c #111107074E4E",\r
-"zX    c #0C0C05054B4B",\r
-"xX    c #22221E1E5757",\r
-"cX    c #1A1A0D0D4D4D",\r
-"vX    c #16160B0B4D4D",\r
-"bX    c #060604044747",\r
-"nX    c #040403034343",\r
-"mX    c #3B3B27276565",\r
-"MX    c #0E0E03034141",\r
-"NX    c #111106064A4A",\r
-"BX    c #0E0E04044646",\r
-"VX    c #111105053B3B",\r
-"CX    c #0D0D01013A3A",\r
-"ZX    c #030305053F3F",\r
-"AX    c #0F0F0F0F4C4C",\r
-"SX    c #020207073B3B",\r
-"DX    c #0D0D03034646",\r
-"FX    c #0B0B02023F3F",\r
-"GX    c #0D0D02023434",\r
-"HX    c #0A0A0E0E4444",\r
-"JX    c #161614145252",\r
-"KX    c #0B0B04044646",\r
-"LX    c #0A0A03034444",\r
-"PX    c #1D1D21215757",\r
-"IX    c #090910104040",\r
-"UX    c #18181E1E5353",\r
-"                                                                                                ",\r
-"  . . . . X X o o o o O + + @ @ @ @ @ @ @ # # # # # # $ $ % % & & & & * = - - - ; : > > , , ,   ",\r
-"  . . X X < < o o O O + @ 1 2 2 1 1 1 1 1 1 1 1 3 4 # # $ $ $ % % % 5 = = 6 6 - ; ; > > , , 7   ",\r
-"  . 8 < < < o O O + @ @ 2 9 9 0 0 q q q q q q q w 3 4 4 e e $ $ $ $ % 5 = = 6 6 6 ; ; > > r t   ",\r
-"  . X < y u O O + @ 1 2 i 0 0 p p p p p p p a a p a s 3 4 4 e e e e d 5 5 f f 6 6 6 ; ; r r t   ",\r
-"  X < y u O + + @ 2 9 0 g p p h h h h h h h p h h a a s s j k k j l d d 5 5 f f 6 6 r r r r r   ",\r
-"  X < y O z x x 9 0 g c v b n n n n n n n n n n n h a a s s j j m l M d d N f f B B B B r r r   ",\r
-"  < y u + z 2 0 c c b V C Z C C A A A A A S S S n h D w w m m m m k l M d d N f F F F B r r r   ",\r
-"  < y O z z 9 c b V Z G H H H G S G G J J H V v c g g K K K K L P l l l M M N N N N I B B r r   ",\r
-"  U u + z x i v C H Y J J J J H J T R H V E W W Q Q Q Q ! ! ! ~ ^ ^ / / M M M M M N ( B B r r   ",\r
-"  ) _ z x 9 g b Z Y ` ' ' ' T T ] [ { } |  .........W W Q Q X.! ~ ~ o.O./ / / / N F ( B B B r   ",\r
-"  ) ) z x i c V G J ' +.+.+.+.] [ @.#.$.%.%.%.&.*. . .....W =.-.X.;.~ :.o.O.^ >.N F ( B B B B   ",\r
-"  ) ,.<.2 g v C H J ' +.+.+.+.T Y 1.2.3.4.4.4.5.6.&.&. . ...W =.=.-.;.~ :.o.7.>.N F F ( B I I   ",\r
-"  ) ,.<.8.9.b C H J T +.+.+.' J @.1.0.q.q.w.e.4.5.6.&.r. . .t.W =.=.-.;.~ :.o.7.y.N F ( ( I I   ",\r
-"  8.8.8.9.| u.C G J T +.+.' ` Y @.1.i.0.q.q.e.e.5.6.p.r.a. .t.t.s.d.d.-.;.~ :.7.7.y.F F ( I I   ",\r
-"  9.c c c v b A S H ' f.g.` Y @.h.1.i.j.0.q.q.e.k.6.p.r.a.l.t.z.s.s.d.x.c.v.b.n.m.7.N F F F I   ",\r
-"  <.g M.N.B.B.n V.J f.R J @.h.h.1.i.i.j.j.0.q.3.k.6.p.r.a.l.l.z.s.C.d.x.x.c.v.b.n.m.y.N F F F   ",\r
-"  + x i v B.Z Z G g.Z.[ @.2.i.i.j.j.j.j.j.0.q.3.k.6.p.p.a.l.l.A.s.C.C.d.x.c.v.b.n.m.7.y.N N y.  ",\r
-"  O # 3 w p n Z ` f.S.H D.F.q.0.0.0.0.j.0.q.q.3.k.6.p.r.a.a.l.A.s.s.C.d.x.x.c.v.b.n.m.y.y.y.y.  ",\r
-"  O # 4 s a G.V.T Z.H.V J.%.e.w.q.0.0.0.0.q.q.e.k.6.p.r.a.a.l.z.A.s.C.d.d.x.c.v.b.n.m.7.>.y.y.  ",\r
-"  O # 4 s w G.A f.K.H L...4.P.w.w.w.q.q.q.q.e.e.5.6.M.I.I.a.a.l.z.A.s.d.d.x.c.v.v.U.Y.7.O.>.y.  ",\r
-"  $ # 4 3 s G.G f.S.Z 9.*.D.P.P.w.w.w.w.w.e.e.5.5.M.M.I.I.a.a.l.z.T.s.d.d.x.x.c.v.U.Y.m.R.>.>.  ",\r
-"  E.E.W.W.W.W.E.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { )._.`._.  ",\r
-"  + # 3 w s '.` f.H.V ].*.D.P.P.P.P.P.P.P.5.5.5.M.M.M.I.I.a.l.z.z.T.T.s.d.d.x.c.v.U.Y.[.^ O.>.  ",\r
-"  ~.~.~.~.~.~.K.Z.S.~.{.^.^.^.^.^.^.^.^././././././.(.(.(.(.(.(.{ { { { { ).).).w.w.}.|.P.u.}   ",\r
-"   .I.6. X X XT f.H.b ].*.E D.D.D.D.5.5..X.XM.M.I.I.a.a.l.l.z.z.T.T.T.d.XXx.c.v.b.U.oXOXR.+X@X  ",\r
-"  E.E.E.W.W.W.K.Z.E.W.Q.Q.Q.Q.Q.Q.Q.Q.!.!.!.!.!.!.~.~.~.~.~.~.^.^.^.^.^./././.(.{ { ).).#X_._.  ",\r
-"  & % $ e '.= H f.H.b 8.W *.E E E .X.X.XI.I.I.I.a.a.l.l.z.z.T.T.T.C.XXXXc.v.$X%X&XY.*X=X2 @X-X  ",\r
-"  {.{.{.{.{.#X~.Z.W.~.{.{./././././././././.(.(.(.(.(.(.(.{ { { { { { ).).).w.w.3.}.;X%.:X} }   ",\r
-"  & & % $ e >XV.f.S.C K X.W t. . .l.l.t.t.t.t.A.A.A.,X,X,X,X,X<X;X1X1X2X3X%X&X4XoX*X5Xo.6X-X-X  ",\r
-"  & & % $ $ >X7X` Z.Z D ! =.=.s.t.t.t.A.A.s.A.,X,X,X,X<X<X<X<X;X1X2X2X3X%X&X4XoXOX8X5X<.@X-X-X  ",\r
-"  8 & & $ e K 9XJ f.^. XK X.=.=.s.s.s.s.s.C.C.C.C.<X0X0X0X1X1X1X2X2X3X%X&X4XqXOX*X8X=X<.-X-XwX  ",\r
-"  8 & eXK k.@.M. Xg.E.B.rX~ -.d.d.C.C.C.C.C.tX0X0X0XyXyX1X1XuX2X2X3X%X&X4XqXoXOX8XiX6XeX-X-XwX  ",\r
-"  6XQ h.Y N.K e pXB.f./.9Xo.;.-.x.d.tXtXtXtXtX0X0XyXyXyXuXuX2X2X3X%X&X4XqXoXOX*XiX=X_ aX-XaXwX  ",\r
-"  Y Y  .R.@X% sX= 7XT Z.V P :.;.c.x.x.x.tXdXdXdXyXyXuXuX2X2X3X3X%X&X4XqXoXOX*X8X*XfXaXaXaXwXwX  ",\r
-"  gXhX& * & 5 5 sXjXa ] S.9X/ ~ v.c.dXdXdXdXdXuXuXuXkX2X2X3X%X%X&X4XqXoXOX*X8XiX<.hXwXwXaXwXwX  ",\r
-"  8 lXlXjX= * 5 5 = zX9X] H.D 7.b.v.v.kXc.kXkXkXkXkX2X$X3X%X&X&X4XqXoXOX*X8XiXxXhXwXcXcXwXwXwX  ",\r
-"  zXzXlXlXjX= = f f sXD Y ] ~.D 7.n.b.v.v.kXkXkXkX$X$X%X%X&X4XqXoXoXOX*X8X5XgXu cXvXvXcXcXwXwX  ",\r
-"  bXbXzXlXlX- = * @XX.h.e D T S.D n.m.b.$X$X$X$X$X%X%X&X&X4XqXoXOX*X8X8X*X<.hXvX; ; vXvXvXcXwX  ",\r
-"  nXbXzXzXlXlX- -XX.Y R.pXpXP J K.Z mXm.n.U.U.U.U.U.4X4XY.oXOX*X8X8X8X=X,.aXvX; > > > t t t cX  ",\r
-"  nXbXbXzXzXlXaXXXY +Xf = f = 7XtXR R   mXn.Y.[.[.[.[.OX*X*X8X5X*X=X,.u vXvX; > > MXMX, 7 t t   ",\r
-"  nXnXnXbXzXvX-.Y +XcX6 6 = = = d L B.G H `.X.:.7.m.=X=X=X=X=X6X,.u cXvXNX: BX> MXVXCXVX7 7 7   ",\r
-"  ZXZXnXbXAXgX@.+XvX; - - - - * @XR.>.sX>.R.i 0 x eXeXeXeXO hXaXcXvXNX: BXMXMXMXVXCXCXCXVX7 7   ",\r
-"  SXZXZXAXgXN.aXNX: : NXNXNX- * +X+X* 6 6 6 * * * * * * * vXvX- NX: DXBXMXMXFXCXCXCXCXGXVXVX7   ",\r
-"  SXSXHXgX0.JXKXLXKXKXDX: : NX* @X-X- - - - - - - - - - - NX: DXDXDXMXMXFXFXCXCXCXCXGXGXGXVXVX  ",\r
-"  SXHXPX3.JXnXnXnXnXbXLXKXKXNXaX-XvX: : NX: : : : : : : BXDXDXLXMXMXFXFXCXCXCXCXGXGXGXGXGXGXGX  ",\r
-"  IXUX$.AXZXZXZXZXnXnXnXLXLXNXJXvXBXDXBXBXBXBXDXDXDXDXLXDXLXLXFXFXFXFXCXCXCXCXGXGXGXGXGXGXGXGX  ",\r
-"                                                                                                "};\r
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif
deleted file mode 100644 (file)
index 05626b1..0000000
Binary files a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_16.gif and /dev/null differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif b/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif
deleted file mode 100644 (file)
index b432f88..0000000
Binary files a/security/eclipse/plugins/org.argeo.security.ui.rcp/icons/alt_window_32.gif and /dev/null differ
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties b/security/eclipse/plugins/org.argeo.security.ui.rcp/log4j.properties
deleted file mode 100644 (file)
index 8a89a4a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.springframework.security=DEBUG
-
-log4j.logger.org.apache.catalina=INFO
-log4j.logger.org.apache.coyote=INFO
-log4j.logger.org.apache.tomcat=INFO
-
-log4j.logger.org.apache.directory.server=INFO
-log4j.logger.org.apache.directory.server.core.partition=ERROR
-log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
-
-log4j.logger.org.apache.jackrabbit=WARN
-log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml b/security/eclipse/plugins/org.argeo.security.ui.rcp/plugin.xml
deleted file mode 100644 (file)
index b1829e6..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         id="secureUi"
-         name="Argeo Secure UI"
-         point="org.eclipse.core.runtime.applications">
-      <application cardinality="singleton-global"
-         thread="main"
-         visible="true">
-         <run
-               class="org.argeo.security.ui.rcp.SecureRcp">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="secureWebUi"
-         name="Argeo Secure Web UI"
-         point="org.eclipse.core.runtime.applications">
-      <application cardinality="singleton-global"
-         thread="main"
-         visible="true">
-         <run
-               class="org.argeo.security.ui.rcp.SecureRap">
-         </run>
-      </application>
-   </extension>
-
-</plugin>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml b/security/eclipse/plugins/org.argeo.security.ui.rcp/pom.xml
deleted file mode 100644 (file)
index f711c69..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<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.security</groupId>
-               <version>0.2.2-SNAPSHOT</version>
-               <artifactId>plugins</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.security.ui.rcp</artifactId>
-       <name>Commons Security UI RCP</name>
-       <packaging>jar</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-                                               <Require-Bundle>org.eclipse.ui;resolution:=optional,org.eclipse.rap.ui;resolution:=optional,org.eclipse.core.runtime</Require-Bundle>
-                                               <Import-Package>*</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>resolve-pde-sources</id>
-                                               <goals>
-                                                       <goal>pde-sources</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>generate-descriptors</id>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Argeo Security -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.equinox</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.ui</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.ads</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads.server</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.services</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.manager.ldap</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-               </dependency>
-
-               <!-- Argeo Eclipse distribution (common dependencies for both RAP and RCP) -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-               
-               <!-- TODO: to be removed -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.json</artifactId>
-                       <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>
-                       <artifactId>org.argeo.basic.nodeps</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-               </dependency>
-
-
-               <!-- Others -->
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-               <!-- Commons Dep -->
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>0.2.2-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-       </dependencies>
-</project>
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.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
deleted file mode 100644 (file)
index f7c5fc5..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import java.security.PrivilegedAction;
-
-import javax.security.auth.Subject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.security.equinox.CurrentUser;
-import org.eclipse.core.runtime.IStatus;
-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.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-public abstract class AbstractSecureApplication implements IApplication {
-       private static final Log log = LogFactory
-                       .getLog(AbstractSecureApplication.class);
-
-       protected abstract WorkbenchAdvisor createWorkbenchAdvisor();
-
-       public Object start(IApplicationContext context) throws Exception {
-
-               Integer returnCode = null;
-               Display display = PlatformUI.createDisplay();
-
-               // Force login
-               String username = CurrentUser.getUsername();
-               if (log.isDebugEnabled())
-                       log.debug("Logged in as " + username);
-
-               try {
-                       returnCode = (Integer) Subject.doAs(CurrentUser.getSubject(),
-                                       getRunAction(display));
-                       if (log.isDebugEnabled())
-                               log.debug("secure action completed");
-                       CurrentUser.logout();
-                       return processReturnCode(returnCode);
-               } catch (Exception e) {
-                       // e.printStackTrace();
-                       IStatus status = new Status(IStatus.ERROR,
-                                       "org.argeo.security.rcp", "Login failed", e);
-                       ErrorDialog.openError(null, "Error", "Login failed", status);
-                       return returnCode;
-               } finally {
-                       display.dispose();
-               }
-       }
-
-       protected Integer processReturnCode(Integer returnCode) {
-               return returnCode;
-       }
-
-       @SuppressWarnings("rawtypes")
-       private PrivilegedAction getRunAction(final Display display) {
-               return new PrivilegedAction() {
-
-                       public Object run() {
-                               int result = createAndRunWorkbench(display);
-                               return new Integer(result);
-                       }
-               };
-       }
-
-       protected Integer createAndRunWorkbench(Display display) {
-               return PlatformUI.createAndRunWorkbench(display,
-                               createWorkbenchAdvisor());
-       }
-
-       public void stop() {
-               final IWorkbench workbench;
-               try {
-                       workbench = PlatformUI.getWorkbench();
-               } catch (Exception e) {
-                       return;
-               }
-               if (workbench == null)
-                       return;
-               final Display display = workbench.getDisplay();
-               if (display != null && !display.isDisposed())
-                       display.syncExec(new Runnable() {
-
-                               public void run() {
-                                       if (!display.isDisposed())
-                                               workbench.close();
-                               }
-                       });
-
-               if (log.isDebugEnabled())
-                       log.debug("workbench stopped");
-               String username = CurrentUser.getUsername();
-               if (log.isDebugEnabled())
-                       log.debug("workbench stopped, logged in as " + username);
-
-       }
-
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
deleted file mode 100644 (file)
index 0025330..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-
-public class RapSecureWorkbenchWindowAdvisor extends
-               SecureWorkbenchWindowAdvisor {
-
-       public RapSecureWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-               super(configurer);
-       }
-
-       @Override
-       public ActionBarAdvisor createActionBarAdvisor(
-                       IActionBarConfigurer configurer) {
-               return new SecureActionBarAdvisor(configurer, false);
-       }
-
-       public void preWindowOpen() {
-               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-               // configurer.setInitialSize(new Point(800, 600));
-               configurer.setShowCoolBar(false);
-               configurer.setShowMenuBar(true);
-               configurer.setShowStatusLine(false);
-               configurer.setShowPerspectiveBar(true);
-               configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
-               // Full screen, see
-               // http://dev.eclipse.org/newslists/news.eclipse.technology.rap/msg02697.html
-               configurer.setShellStyle(SWT.NONE);
-               Rectangle bounds = Display.getDefault().getBounds();
-               configurer.setInitialSize(new Point(bounds.width, bounds.height));
-       }
-
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/SecureActionBarAdvisor.java
deleted file mode 100644 (file)
index 04e6100..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-public class SecureActionBarAdvisor extends ActionBarAdvisor {
-       private IWorkbenchAction exitAction;
-       private IWorkbenchAction openPerspectiveDialogAction;
-       private IWorkbenchAction showViewMenuAction;
-       private IWorkbenchAction newWindowAction;
-       private IWorkbenchAction preferences;
-       private IWorkbenchAction helpContentAction;
-       // private IWorkbenchAction aboutAction;
-
-       private final Boolean isRcp;
-
-       public SecureActionBarAdvisor(IActionBarConfigurer configurer, Boolean isRcp) {
-               super(configurer);
-               this.isRcp = isRcp;
-       }
-
-       protected void makeActions(IWorkbenchWindow window) {
-               preferences = ActionFactory.PREFERENCES.create(window);
-               register(preferences);
-               openPerspectiveDialogAction = ActionFactory.OPEN_PERSPECTIVE_DIALOG
-                               .create(window);
-               register(openPerspectiveDialogAction);
-               showViewMenuAction = ActionFactory.SHOW_VIEW_MENU.create(window);
-               register(showViewMenuAction);
-               helpContentAction = ActionFactory.HELP_CONTENTS.create(window);
-               register(helpContentAction);
-
-               exitAction = ActionFactory.QUIT.create(window);
-               register(exitAction);
-               if (isRcp) {
-                       // aboutAction = ActionFactory.ABOUT.create(window);
-                       // register(aboutAction);
-                       newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
-                       register(newWindowAction);
-               }
-       }
-
-       protected void fillMenuBar(IMenuManager menuBar) {
-               MenuManager fileMenu = new MenuManager("&File",
-                               IWorkbenchActionConstants.M_FILE);
-               MenuManager editMenu = new MenuManager("&Edit",
-                               IWorkbenchActionConstants.M_EDIT);
-               MenuManager windowMenu = new MenuManager("&Window",
-                               IWorkbenchActionConstants.M_WINDOW);
-               MenuManager helpMenu = new MenuManager("&Help",
-                               IWorkbenchActionConstants.M_HELP);
-
-               menuBar.add(fileMenu);
-               menuBar.add(editMenu);
-               menuBar.add(windowMenu);
-               // Add a group marker indicating where action set menus will appear.
-               menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-               menuBar.add(helpMenu);
-
-               // File
-               if (isRcp) {
-                       fileMenu.add(newWindowAction);
-                       fileMenu.add(new Separator());
-               }
-               fileMenu.add(exitAction);
-
-               // Edit
-               editMenu.add(preferences);
-
-               // Window
-               windowMenu.add(openPerspectiveDialogAction);
-               windowMenu.add(showViewMenuAction);
-
-               // Help
-               helpMenu.add(helpContentAction);
-               // helpMenu.add(aboutAction);
-       }
-
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
deleted file mode 100644 (file)
index 964de7c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/** Generic secure application for RAP. */
-public class SecureRap extends AbstractSecureApplication {
-
-       @Override
-       protected WorkbenchAdvisor createWorkbenchAdvisor() {
-               return new SecureWorkbenchAdvisor() {
-                       public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
-                                       IWorkbenchWindowConfigurer configurer) {
-                               return new RapSecureWorkbenchWindowAdvisor(configurer);
-                       }
-
-               };
-       }
-
-       public void stop() {
-               final IWorkbench workbench = PlatformUI.getWorkbench();
-               if (workbench == null)
-                       return;
-               final Display display = workbench.getDisplay();
-               display.syncExec(new Runnable() {
-
-                       public void run() {
-                               if (!display.isDisposed())
-                                       workbench.close();
-                       }
-               });
-       }
-
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRcp.java
deleted file mode 100644 (file)
index cd1d518..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-public class SecureRcp extends AbstractSecureApplication {
-
-       @Override
-       protected WorkbenchAdvisor createWorkbenchAdvisor() {
-               return new SecureWorkbenchAdvisor();
-       }
-
-       protected Integer processReturnCode(Integer returnCode) {
-               if (returnCode == PlatformUI.RETURN_RESTART)
-                       return IApplication.EXIT_RESTART;
-               else
-                       return IApplication.EXIT_OK;
-       }
-
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
deleted file mode 100644 (file)
index d39bf84..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
-
-       static final String PERSPECTIVE_ID = "org.argeo.security.ui.securityPerspective"; //$NON-NLS-1$
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new SecureWorkbenchWindowAdvisor(configurer);
-    }
-
-       public String getInitialWindowPerspectiveId() {
-               return PERSPECTIVE_ID;
-       }
-}
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.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
deleted file mode 100644 (file)
index a1022fe..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.argeo.security.ui.rcp;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class SecureWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-       public SecureWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-               super(configurer);
-       }
-
-       public ActionBarAdvisor createActionBarAdvisor(
-                       IActionBarConfigurer configurer) {
-               return new SecureActionBarAdvisor(configurer, true);
-       }
-
-       public void preWindowOpen() {
-               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-               configurer.setInitialSize(new Point(800, 600));
-               configurer.setShowCoolBar(false);
-               configurer.setShowMenuBar(true);
-               configurer.setShowStatusLine(false);
-               configurer.setShowPerspectiveBar(true);
-               configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
-       }
-
-}
index f8d71708e1803b98646161d1052652bf77b2874e..24a5a513cdfe6bd88663d6f8dfa325cdb2b324a8 100644 (file)
@@ -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>
index 86a460103a79a2614d254f9d060847613735fc40..9cc3b1f5e56008d08f82292dbd736a9ac6ea6fc5 100644 (file)
@@ -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>