From e50c2fd455b4296d5feb7b31c02aac5eb42e731a Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 22 Nov 2016 11:26:33 +0000
Subject: [PATCH] Code cleaning, use homogeneous name packages

git-svn-id: https://svn.argeo.org/commons/trunk@9319 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/commands.xml              |  6 +-
 .../META-INF/spring/osgi.xml                  |  2 +-
 org.argeo.cms.ui.workbench.rap/plugin.xml     | 69 +++++++++----------
 .../ui/workbench}/rap/commands/OpenHome.java  |  2 +-
 .../ui/workbench}/rap/commands/UserMenu.java  |  2 +-
 .../security/ui/rap/RapActionBarAdvisor.java  |  4 +-
 .../security/ui/rap/SecureRapActivator.java   |  2 +-
 .../ui/specific/UploadFileWizardPage.java     |  2 +-
 8 files changed, 44 insertions(+), 45 deletions(-)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/commands/OpenHome.java (97%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/commands/UserMenu.java (95%)

diff --git a/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
index 3fdfbe3d6..d7048db9a 100644
--- a/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
+++ b/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
@@ -4,16 +4,16 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="openChangePasswordDialog" class="org.argeo.cms.ui.workbench.commands.OpenChangePasswordDialog"
+	<bean id="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
+		class="org.argeo.cms.ui.workbench.commands.OpenChangePasswordDialog"
 		scope="prototype">
 		<property name="userAdmin" ref="userAdmin" />
 		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
-
 	<!-- RAP Specific command and corresponding service to enable open file -->
 	<bean id="org.argeo.eclipse.ui.workbench.openFile" class="org.argeo.cms.ui.workbench.commands.OpenFile"
-	scope="prototype">
+		scope="prototype">
 		<property name="openFileServiceId"
 			value="org.argeo.security.ui.specific.openFileService" />
 	</bean>
diff --git a/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml
index 84e5d7b8b..6e0f3b332 100644
--- a/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml
+++ b/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml
@@ -10,4 +10,4 @@
 
 	<reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />
 	<reference id="userTransaction" interface="javax.transaction.UserTransaction" />
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 243a433d0..e5b083ded 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -4,41 +4,41 @@
    <extension
          point="org.eclipse.rap.ui.entrypoint">
       <entrypoint
-            id="org.argeo.security.ui.rap.secureEntryPoint"
+            id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
             class="org.argeo.security.ui.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"
+            id="org.argeo.cms.ui.workbench.rap.anonymousEntryPoint"
             class="org.argeo.security.ui.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"
+<!--      <entrypoint
+            id="org.argeo.cms.ui.workbench.rap.secureEntryPoint"
             class="org.argeo.security.ui.rap.RapWorkbenchLogin"
-            id="org.argeo.security.ui.rap.secureEntryPoint"
-            path="/login">
-      </entrypoint>
+            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
-			defaultHandler="org.argeo.eclipse.spring.SpringExtensionFactory"
 			id="org.argeo.eclipse.ui.workbench.openFile"
+			defaultHandler="org.argeo.eclipse.spring.SpringExtensionFactory"
 			name="OpenFile">
 			<commandParameter
          		id="param.fileName"
@@ -59,11 +59,11 @@
 	<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"/>
@@ -72,24 +72,24 @@
 		</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"
+		<!--	<command
+				commandId="org.argeo.cms.ui.workbench.rap.userMenuCommand"
 				icon="icons/main.gif"
-				id="org.argeo.security.ui.rap.userMenu">
-			</command>
+				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"
+				commandId="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
 				icon="icons/password.gif"
 				label="%changePassword"/>
 			<separator
-				name="org.argeo.security.ui.rap.beforeFile"
+				name="org.argeo.cms.ui.workbench.rap.beforeFile"
 				visible="true">
 			</separator>
 			<command
@@ -100,9 +100,8 @@
 	
 			<!--<command commandId="org.eclipse.ui.views.showView"/>-->
     		<!--<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 +122,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 +134,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 +147,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 +169,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">
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
similarity index 97%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
index cc1bca86d..a6744d213 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.rap.commands;
+package org.argeo.cms.ui.workbench.rap.commands;
 
 import org.argeo.cms.ui.workbench.UserHomePerspective;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/UserMenu.java
similarity index 95%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/UserMenu.java
index 98674303b..4934e5620 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/UserMenu.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/UserMenu.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.rap.commands;
+package org.argeo.cms.ui.workbench.rap.commands;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
index 0ca598dce..6e33cdd4f 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.commands.ICommandService;
 
 /** Eclipse rap specific action bar advisor */
 public class RapActionBarAdvisor extends ActionBarAdvisor {
-	private final static String ID_BASE = "org.argeo.security.ui.rap";
+	private final static String ID_BASE = SecureRapActivator.ID;
 	// private final static Log log = LogFactory
 	// .getLog(SecureActionBarAdvisor.class);
 
@@ -154,7 +154,7 @@ public class RapActionBarAdvisor extends ActionBarAdvisor {
 	//
 	// @Override
 	// public String getId() {
-	// return "org.argeo.security.ui.rap.userMenu";
+	// return "org.argeo.cms.ui.workbench.rap.userMenu";
 	// }
 	//
 	// @Override
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
index b3d7c2337..045f88a45 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
 
 /** Configure Equinox login context from the bundle context. */
 public class SecureRapActivator implements BundleActivator {
-	public final static String ID = "org.argeo.security.ui.rap";
+	public final static String ID = "org.argeo.cms.ui.workbench.rap";
 
 	private static BundleContext bundleContext;
 
diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
index d68f84290..b166e7f84 100644
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UploadFileWizardPage.java
@@ -209,4 +209,4 @@ public class UploadFileWizardPage extends WizardPage {
 	public boolean getNeedsProgressMonitor() {
 		return false;
 	}
-}
\ No newline at end of file
+}
-- 
2.30.2