X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench.rap%2Fplugin.xml;h=3dfbf2dc19c7fb00c598e8181ef90668e47bde49;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=243a433d0925f40f66d862ec78a3eeed8db6b64e;hpb=e66b9893b0e511f8ab295e3cee42b7dc966f1597;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 243a433d0..3dfbf2dc1 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -4,41 +4,47 @@
    <extension
          point="org.eclipse.rap.ui.entrypoint">
       <entrypoint
-            id="org.argeo.security.ui.rap.secureEntryPoint"
-            class="org.argeo.security.ui.rap.RapWorkbenchLogin"
+            id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
+            class="org.argeo.cms.ui.workbench.rap.RapWorkbenchLogin"
             path="/node"
-            brandingId="org.argeo.security.ui.rap.defaultBranding">
+            brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding">
       </entrypoint>
       <entrypoint
-            id="org.argeo.security.ui.rap.anonymousEntryPoint"
-            class="org.argeo.security.ui.rap.AnonymousEntryPoint"
+            id="org.argeo.cms.ui.workbench.rap.anonymousEntryPoint"
+            class="org.argeo.cms.ui.workbench.rap.AnonymousEntryPoint"
             path="/public"
-            brandingId="org.argeo.security.ui.rap.defaultBranding">
+            brandingId="org.argeo.cms.ui.workbench.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"
+            brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding"
+            class="org.argeo.cms.ui.workbench.rap.SpnegoWorkbenchLogin"
+            id="org.argeo.cms.ui.workbench.rap.loginEntryPoint"
             path="/login">
       </entrypoint>
+<!--      <entrypoint
+            id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
+            class="org.argeo.security.ui.rap.RapWorkbenchLogin"
+            path="/login"
+            brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding">
+      </entrypoint> -->
    </extension>
 
 	<!-- COMMANDS --> 
 	<extension point="org.eclipse.ui.commands">
 		<command
-			id="org.argeo.security.ui.rap.mainMenuCommand"
-			defaultHandler="org.argeo.security.ui.rap.commands.OpenHome"
+			id="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
+			defaultHandler="org.argeo.cms.ui.workbench.rap.commands.OpenHome"
 			name="Main"> 
 		</command>
 		<command
-			id="org.argeo.security.ui.rap.openChangePasswordDialog"
+			id="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
 			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
 			name="%changePassword">
 		</command>
 		<!-- Enable an "open file" action in a single sourced application  -->  
 		<command
+			id="org.argeo.cms.ui.workbench.openFile"
 			defaultHandler="org.argeo.eclipse.spring.SpringExtensionFactory"
-			id="org.argeo.eclipse.ui.workbench.openFile"
 			name="OpenFile">
 			<commandParameter
          		id="param.fileName"
@@ -48,61 +54,68 @@
          		id="param.fileURI"
          		name="The URI of this file on the server">
   	 		</commandParameter>
-  	 		<commandParameter
-         		id="param.filePath"
-         		name="The absolute path of this file on the server file system">
-  	 		</commandParameter>
 		</command>
  	</extension>
 
 	<!-- MENUS --> 
 	<extension point="org.eclipse.ui.menus">
     	<!-- Main tool bar menu -->
+    	<!--
     	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-        	<toolbar id="org.argeo.security.ui.rap.userToolbar">
+        	<toolbar id="org.argeo.cms.ui.workbench.rap.userToolbar">
 				<command
-					commandId="org.argeo.security.ui.rap.mainMenuCommand"
+					commandId="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
 					icon="icons/home.gif"
-					id="org.argeo.security.ui.rap.mainMenu"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
 					style="pulldown">
 				</command>
 				<command commandId="org.eclipse.ui.file.save"/>
 				<command commandId="org.eclipse.ui.file.saveAll"/>
 			</toolbar>
 		</menuContribution>
+		-->
+    	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+        	<toolbar id="org.argeo.cms.ui.workbench.userToolbar">
+				<command
+					commandId="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
+					icon="icons/home.png"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
+					style="pulldown">
+				</command>
+				<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+				<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
+			</toolbar>
+		</menuContribution>
 		
 		<!-- User drop down default menu -->
-		<menuContribution locationURI="menu:org.argeo.security.ui.rap.mainMenu">
+		<menuContribution locationURI="menu:org.argeo.cms.ui.workbench.rap.mainMenu">
 			<!-- Managed programmatically in the RapActionBarAdvisor to enable 
 			     the display of the current logged-in user id -->
 			<command
-				commandId="org.argeo.security.ui.rap.userMenuCommand"
-				icon="icons/main.gif"
-				id="org.argeo.security.ui.rap.userMenu">
+				commandId="org.argeo.cms.ui.workbench.rap.userMenuCommand"
+				icon="icons/person-logged-in.png"
+				id="org.argeo.cms.ui.workbench.rap.userMenu">
 			</command>
 			<!-- Still unused
 			<command
 				commandId="org.eclipse.ui.window.preferences"
 				icon="icons/preferences.png"/> -->
         	<command
-				commandId="org.argeo.security.ui.rap.openChangePasswordDialog"
-				icon="icons/password.gif"
+				commandId="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
+				icon="icons/security.gif"
 				label="%changePassword"/>
 			<separator
-				name="org.argeo.security.ui.rap.beforeFile"
+				name="org.argeo.cms.ui.workbench.rap.beforeFile"
 				visible="true">
 			</separator>
-			<command
-				commandId="org.eclipse.ui.file.closeAll"
-				icon="icons/closeAll.gif"/>
-			<command commandId="org.eclipse.ui.file.save"/>
-			<command commandId="org.eclipse.ui.file.saveAll"/>
+			<command commandId="org.eclipse.ui.file.closeAll" icon="icons/close-all.png"/>
+			<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+			<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
 	
 			<!--<command commandId="org.eclipse.ui.views.showView"/>-->
-    		<!--<command commandId="org.eclipse.ui.perspectives.showPerspective"/>-->
-	
+    		<command commandId="org.eclipse.ui.perspectives.showPerspective"/>
 			<separator
-				name="org.argeo.security.ui.rap.beforeExit"
+				name="org.argeo.cms.ui.workbench.rap.beforeExit"
 				visible="true">
 			</separator>
 			<command commandId="org.eclipse.ui.file.exit" icon="icons/exit.png"/>
@@ -123,7 +136,7 @@
            point="org.eclipse.ui.activities">
         <activity
               description="Anonymous"
-              id="org.argeo.security.ui.rap.anonymousActivity"
+              id="org.argeo.cms.ui.workbench.rap.anonymousActivity"
               name="Anonymous">
 		  <enabledWhen>
 		    <with variable="roles">
@@ -135,7 +148,7 @@
         </activity>
         <activity
               description="Not anonymous"
-              id="org.argeo.security.ui.rap.notAnonymousActivity"
+              id="org.argeo.cms.ui.workbench.rap.notAnonymousActivity"
               name="NotAnonymous">
 		  <enabledWhen>
 		  	<not>
@@ -148,21 +161,21 @@
 		  </enabledWhen>
         </activity>
 		<activityPatternBinding
-              activityId="org.argeo.security.ui.rap.notAnonymousActivity"
-              pattern="org.argeo.security.ui.rap/org.argeo.security.ui.rap.userMenuCommand"/>         
+              activityId="org.argeo.cms.ui.workbench.rap.notAnonymousActivity"
+              pattern="org.argeo.cms.ui.workbench.rap/org.argeo.cms.ui.workbench.rap.userMenuCommand"/>         
         <activityPatternBinding
-              activityId="org.argeo.security.ui.rap.notAnonymousActivity"
-              pattern="org.argeo.security.ui.rap/org.eclipse.ui.window.preferences"/>
+              activityId="org.argeo.cms.ui.workbench.rap.notAnonymousActivity"
+              pattern="org.argeo.cms.ui.workbench.rap/org.eclipse.ui.window.preferences"/>
         <activityPatternBinding
-              activityId="org.argeo.security.ui.rap.notAnonymousActivity"
-              pattern="org.argeo.security.ui.rap/org.argeo.security.ui.rap.openChangePasswordDialog"/>
+              activityId="org.argeo.cms.ui.workbench.rap.notAnonymousActivity"
+              pattern="org.argeo.cms.ui.workbench.rap/org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"/>
      </extension>
     
     <!-- BRANDINGS --> 
      <extension
          point="org.eclipse.rap.ui.branding">
     	<branding
-			id="org.argeo.security.ui.rap.defaultBranding"
+			id="org.argeo.cms.ui.workbench.rap.defaultBranding"
             themeId="org.eclipse.rap.rwt.theme.Default"
             title="Argeo Web UI"
             favicon="branding/favicon.ico">
@@ -170,7 +183,7 @@
       	<!-- we need a servlet with this name j_spring_security_logout
       		 for the logout filter -->
     	<branding
-			id="org.argeo.security.ui.rap.logoutBranding"
+			id="org.argeo.cms.ui.workbench.rap.logoutBranding"
             title="Argeo Logout"
             favicon="branding/favicon.ico"
             body="branding/empty.html">