X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench.rap%2Fplugin.xml;h=3dfbf2dc19c7fb00c598e8181ef90668e47bde49;hb=5b444174cd13680f99944026877f6cac2e1faba1;hp=4d81d83cfe7fca84d822e9842613876f13b0fbde;hpb=507e7522957c1ef9a0f36639b10ad468997dd4e7;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 4d81d83cf..3dfbf2dc1 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -5,16 +5,22 @@
          point="org.eclipse.rap.ui.entrypoint">
       <entrypoint
             id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
-            class="org.argeo.security.ui.rap.RapWorkbenchLogin"
+            class="org.argeo.cms.ui.workbench.rap.RapWorkbenchLogin"
             path="/node"
             brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding">
       </entrypoint>
       <entrypoint
             id="org.argeo.cms.ui.workbench.rap.anonymousEntryPoint"
-            class="org.argeo.security.ui.rap.AnonymousEntryPoint"
+            class="org.argeo.cms.ui.workbench.rap.AnonymousEntryPoint"
             path="/public"
             brandingId="org.argeo.cms.ui.workbench.rap.defaultBranding">
       </entrypoint>
+      <entrypoint
+            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"
@@ -48,16 +54,13 @@
          		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.cms.ui.workbench.rap.userToolbar">
 				<command
@@ -70,6 +73,19 @@
 				<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.cms.ui.workbench.rap.mainMenu">
@@ -77,7 +93,7 @@
 			     the display of the current logged-in user id -->
 			<command
 				commandId="org.argeo.cms.ui.workbench.rap.userMenuCommand"
-				icon="icons/main.gif"
+				icon="icons/person-logged-in.png"
 				id="org.argeo.cms.ui.workbench.rap.userMenu">
 			</command>
 			<!-- Still unused
@@ -86,20 +102,18 @@
 				icon="icons/preferences.png"/> -->
         	<command
 				commandId="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
-				icon="icons/password.gif"
+				icon="icons/security.gif"
 				label="%changePassword"/>
 			<separator
 				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.cms.ui.workbench.rap.beforeExit"
 				visible="true">