X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.rap%2Fplugin.xml;h=243a433d0925f40f66d862ec78a3eeed8db6b64e;hb=a58434286ec0667cf245e4ea8289e7fbd0109b65;hp=75547a5199ab318b8bf779928d187954b5874c5b;hpb=04d717a79d5547a8b426942b91ed4d3ba2f12353;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.rap/plugin.xml b/org.argeo.security.ui.rap/plugin.xml
index 75547a519..243a433d0 100644
--- a/org.argeo.security.ui.rap/plugin.xml
+++ b/org.argeo.security.ui.rap/plugin.xml
@@ -5,32 +5,21 @@
          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>
-      <entrypoint
-            id="org.argeo.security.ui.rap.secureEntryPoint"
-            class="org.argeo.security.ui.rap.SecureEntryPoint"
-            path="/secureWebUi"
-            brandingId="org.argeo.security.ui.rap.defaultBranding">
-      </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.anonymousEntryPoint"
             class="org.argeo.security.ui.rap.AnonymousEntryPoint"
-            path="/publicWebUi"
+            path="/public"
             brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
-    <!--   <entrypoint
-            id="org.argeo.security.ui.rap.logoutEntryPoint"
-            class="org.argeo.security.ui.rap.LogoutEntryPoint"
-            path="/logout"
-            brandingId="org.argeo.security.ui.rap.logoutBranding">
-      </entrypoint> -->
       <entrypoint
-            id="org.argeo.security.ui.rap.nullEntryPoint"
-            class="org.argeo.security.ui.rap.NullEntryPoint"
-            path="/nullEP">
+            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>
 
@@ -44,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"
@@ -76,10 +65,10 @@
 					icon="icons/home.gif"
 					id="org.argeo.security.ui.rap.mainMenu"
 					style="pulldown">
-			</command>
-			<command commandId="org.eclipse.ui.file.save"/>
-			<command commandId="org.eclipse.ui.file.saveAll"/>
-		</toolbar>
+				</command>
+				<command commandId="org.eclipse.ui.file.save"/>
+				<command commandId="org.eclipse.ui.file.saveAll"/>
+			</toolbar>
 		</menuContribution>
 		
 		<!-- User drop down default menu -->
@@ -98,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">
@@ -139,7 +128,7 @@
 		  <enabledWhen>
 		    <with variable="roles">
 		      <iterate ifEmpty="false" operator="or">
-		        <equals value="ROLE_ANONYMOUS" />
+		        <equals value="cn=anonymous,ou=roles,ou=node" />
 		      </iterate>
 		    </with>
 		  </enabledWhen>
@@ -152,7 +141,7 @@
 		  	<not>
 		    <with variable="roles">
 		      <iterate ifEmpty="false" operator="or">
-		        <equals value="ROLE_ANONYMOUS" />
+		        <equals value="cn=anonymous,ou=roles,ou=node" />
 		      </iterate>
 		    </with>
 		    </not>
@@ -160,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
@@ -186,4 +176,4 @@
             body="branding/empty.html">
       	</branding>
    	</extension>
-</plugin>
\ No newline at end of file
+</plugin>