X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fplugin.xml;h=a5008a88117084561e9258d34e16ade501cf90e5;hb=20c8fafc7b68d2d669cba6e7235cb17a3284cf64;hp=461cb59487b230603c00cbf6e43270d1fbd1905d;hpb=2cfccc5b921ec8f53c0b28e8b54d2db205b7f95e;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rap/plugin.xml b/security/plugins/org.argeo.security.ui.rap/plugin.xml
index 461cb5948..a5008a881 100644
--- a/security/plugins/org.argeo.security.ui.rap/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rap/plugin.xml
@@ -6,85 +6,65 @@
       <entrypoint
             id="org.argeo.security.ui.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.SecureEntryPoint"
-            parameter="secureWebUi">
+            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"
-            parameter="publicWebUi">
+            path="/publicWebUi"
+            brandingId="org.argeo.security.ui.rap.defaultBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.security.ui.rap.logoutEntryPoint"
             class="org.argeo.security.ui.rap.LogoutEntryPoint"
-            parameter="logout">
+            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"
-            parameter="null">
+            path="/nullEP">
       </entrypoint>
    </extension>
 
 	<extension
          point="org.eclipse.rap.ui.branding">
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="node"
-            defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="ui"
-            defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="basicauth"
-            defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
-            title="Argeo Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/login.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="clientauth"
-            defaultEntrypointId="org.argeo.security.ui.rap.secureEntryPoint"
+    	<!-- themeId attribute is by default set to this value.
+    			Left anyway to provide the pattern when defining a later 
+    			own default theme for Argeo Rap UIs. 
+    			corresponding theme is found in spite of the warning -->  
+		<branding
+			id="org.argeo.security.ui.rap.defaultBranding"
+            themeId="org.eclipse.rap.rwt.theme.Default"
             title="Argeo Web UI"
             favicon="branding/favicon.ico"
             body="branding/login.html">
       	</branding>
+      	<!-- we need a servlet with this name j_spring_security_logout
+      		 for the logout filter -->
     	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="public"
-            defaultEntrypointId="org.argeo.security.ui.rap.anonymousEntryPoint"
-            title="Argeo Public Web UI"
-            favicon="branding/favicon.ico"
-            body="branding/public.html">
-      	</branding>
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="logout"
-            defaultEntrypointId="org.argeo.security.ui.rap.logoutEntryPoint"
-            title="Argeo Logout"
-            favicon="branding/favicon.ico"
-            body="branding/afterLogout.html">
-      	</branding>
-      	<!-- we need a servlet with thios name j_spring_security_logout for the logout filter -->
-    	<branding
-			id="org.argeo.security.ui.rap.branding"
-            servletName="j_spring_security_logout"
-            defaultEntrypointId="org.argeo.security.ui.rap.nullEntryPoint"
+			id="org.argeo.security.ui.rap.logoutBranding"
             title="Argeo Logout"
             favicon="branding/favicon.ico"
             body="branding/empty.html">
       	</branding>
    	</extension>
+   	
+   	<!-- LOCAL THEMES - Use the following to extend or overwrite default theme --> 
+<!--	<extension
+		point="org.eclipse.rap.ui.themes">
+		<themeContribution
+			themeId="org.eclipse.rap.rwt.theme.Default"
+			file="theme/defaultExt.css" /> 
+	</extension> -->
+   	
 
    <extension
          point="org.eclipse.equinox.security.callbackHandlerMapping">
@@ -109,7 +89,7 @@
    </extension>
 
   <extension point="org.eclipse.ui.menus">
-     <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+    <!--       <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
         <toolbar id="org.argeo.security.ui.rap.userToolbar">
            <command
                  commandId="org.argeo.security.ui.rap.mainMenuCommand"
@@ -121,8 +101,8 @@
            <command commandId="org.eclipse.ui.file.saveAll"/>
         </toolbar>
      </menuContribution>
-     <menuContribution locationURI="menu:org.argeo.security.ui.rap.mainMenu">
-        <command
+		<menuContribution locationURI="menu:org.argeo.security.ui.rap.mainMenu">
+	 <command
               commandId="org.argeo.security.ui.rap.userMenuCommand"
               icon="icons/home.gif"
               id="org.argeo.security.ui.rap.userMenu">
@@ -146,13 +126,13 @@
         <separator
               name="org.argeo.security.ui.rap.beforeExit"
               visible="true">
-        </separator>
+        </separator>-->
         <!--<command commandId="org.eclipse.ui.views.showView"/>-->
         <!--<command commandId="org.eclipse.ui.perspectives.showPerspective"/>-->
-        <command
+        <!-- <command
               commandId="org.eclipse.ui.file.exit"
               icon="icons/exit.png"/>
-     </menuContribution>
+     </menuContribution> -->
   </extension>
 
    <extension point="org.eclipse.ui.commands">
@@ -170,6 +150,18 @@
     
   <extension
            point="org.eclipse.ui.activities">
+        <activity
+              description="Anonymous"
+              id="org.argeo.security.ui.rap.anonymousActivity"
+              name="Anonymous">
+		  <enabledWhen>
+		    <with variable="roles">
+		      <iterate ifEmpty="false" operator="or">
+		        <equals value="ROLE_ANONYMOUS" />
+		      </iterate>
+		    </with>
+		  </enabledWhen>
+        </activity>
         <activity
               description="Not anonymous"
               id="org.argeo.security.ui.rap.notAnonymousActivity"