Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.security.ui.rap / plugin.xml

diff --git a/org.argeo.security.ui.rap/plugin.xml b/org.argeo.security.ui.rap/plugin.xml
index 68d88f2406b2acd3fcdc865fd1a95e0e315a7dc5..243a433d0925f40f66d862ec78a3eeed8db6b64e 100644 (file)
--- a/org.argeo.security.ui.rap/plugin.xml
+++ b/org.argeo.security.ui.rap/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.rap.ui.entrypoint">
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
-            class="org.argeo.security.ui.rap.SecureEntryPoint"
+            class="org.argeo.security.ui.rap.RapWorkbenchLogin"
             path="/node"
             brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
@@ -15,6 +15,12 @@
             path="/public"
             brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
+      <entrypoint
+            brandingId="org.argeo.security.ui.rap.defaultBranding"
+            class="org.argeo.security.ui.rap.RapWorkbenchLogin"
+            id="org.argeo.security.ui.rap.secureEntryPoint"
+            path="/login">
+      </entrypoint>
    </extension>
 
        <!-- COMMANDS --> 
@@ -27,12 +33,12 @@
                <command
                        id="org.argeo.security.ui.rap.openChangePasswordDialog"
                        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-                       name="Change Password">
+                       name="%changePassword">
                </command>
                <!-- Enable an "open file" action in a single sourced application  -->  
                <command
                        defaultHandler="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       id="org.argeo.security.ui.specific.openFile"
+                       id="org.argeo.eclipse.ui.workbench.openFile"
                        name="OpenFile">
                        <commandParameter
                        id="param.fileName"
@@ -81,7 +87,7 @@
                <command
                                commandId="org.argeo.security.ui.rap.openChangePasswordDialog"
                                icon="icons/password.gif"
-                               label="Change password"/>
+                               label="%changePassword"/>
                        <separator
                                name="org.argeo.security.ui.rap.beforeFile"
                                visible="true">
@@ -122,7 +128,7 @@
                  <enabledWhen>
                    <with variable="roles">
                      <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=anonymous,ou=system,ou=node" />
+                       <equals value="cn=anonymous,ou=roles,ou=node" />
                      </iterate>
                    </with>
                  </enabledWhen>
@@ -135,7 +141,7 @@
                        <not>
                    <with variable="roles">
                      <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=anonymous,ou=system,ou=node" />
+                       <equals value="cn=anonymous,ou=roles,ou=node" />
                      </iterate>
                    </with>
                    </not>
@@ -143,7 +149,8 @@
         </activity>
                <activityPatternBinding
               activityId="org.argeo.security.ui.rap.notAnonymousActivity"
-              pattern="org.argeo.security.ui.rap/org.argeo.security.ui.rap.userMenuCommand"/>         <activityPatternBinding
+              pattern="org.argeo.security.ui.rap/org.argeo.security.ui.rap.userMenuCommand"/>         
+        <activityPatternBinding
               activityId="org.argeo.security.ui.rap.notAnonymousActivity"
               pattern="org.argeo.security.ui.rap/org.eclipse.ui.window.preferences"/>
         <activityPatternBinding
@@ -169,4 +176,4 @@
             body="branding/empty.html">
        </branding>
        </extension>
-</plugin>
\ No newline at end of file
+</plugin>