From 3f90cceab34061eb0d002baa57fa23cb33b7ed10 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 30 Nov 2016 09:39:28 +0000
Subject: [PATCH] Rename RAP base package to be homogeneous

git-svn-id: https://svn.argeo.org/commons/trunk@9337 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.cms.ui.workbench.rap/bnd.bnd                        | 2 +-
 org.argeo.cms.ui.workbench.rap/plugin.xml                     | 4 ++--
 .../ui => cms/ui/workbench}/rap/AnonymousEntryPoint.java      | 2 +-
 .../ui => cms/ui/workbench}/rap/RapActionBarAdvisor.java      | 2 +-
 .../ui => cms/ui/workbench}/rap/RapWindowAdvisor.java         | 2 +-
 .../ui => cms/ui/workbench}/rap/RapWorkbenchAdvisor.java      | 2 +-
 .../ui => cms/ui/workbench}/rap/RapWorkbenchLogin.java        | 2 +-
 .../ui => cms/ui/workbench}/rap/SecureRapActivator.java       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/AnonymousEntryPoint.java (98%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/RapActionBarAdvisor.java (99%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/RapWindowAdvisor.java (98%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/RapWorkbenchAdvisor.java (98%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/RapWorkbenchLogin.java (98%)
 rename org.argeo.cms.ui.workbench.rap/src/org/argeo/{security/ui => cms/ui/workbench}/rap/SecureRapActivator.java (96%)

diff --git a/org.argeo.cms.ui.workbench.rap/bnd.bnd b/org.argeo.cms.ui.workbench.rap/bnd.bnd
index 96534754a..f9e7f66df 100644
--- a/org.argeo.cms.ui.workbench.rap/bnd.bnd
+++ b/org.argeo.cms.ui.workbench.rap/bnd.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: org.argeo.cms.ui.workbench.rap;singleton:=true
-Bundle-Activator: org.argeo.security.ui.rap.SecureRapActivator
+Bundle-Activator: org.argeo.cms.ui.workbench.rap.SecureRapActivator
 Bundle-ActivationPolicy: lazy
 
 Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 4d81d83cf..adb4a6ec5 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -5,13 +5,13 @@
          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>
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java
similarity index 98%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java
index 5ff9e4093..00399b915 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/AnonymousEntryPoint.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.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;
+package org.argeo.cms.ui.workbench.rap;
 
 import java.security.PrivilegedAction;
 
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/cms/ui/workbench/rap/RapActionBarAdvisor.java
similarity index 99%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java
index 6e33cdd4f..c18a9a78e 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/cms/ui/workbench/rap/RapActionBarAdvisor.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;
+package org.argeo.cms.ui.workbench.rap;
 
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.workbench.commands.OpenHomePerspective;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWindowAdvisor.java
similarity index 98%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWindowAdvisor.java
index 05f4787f0..60bad090c 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWindowAdvisor.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWindowAdvisor.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;
+package org.argeo.cms.ui.workbench.rap;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchAdvisor.java
similarity index 98%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchAdvisor.java
index edde41f14..b650dbbf5 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchAdvisor.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;
+package org.argeo.cms.ui.workbench.rap;
 
 import org.eclipse.ui.IPerspectiveDescriptor;
 import org.eclipse.ui.application.IWorkbenchConfigurer;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java
similarity index 98%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java
index 06fc62e2e..a023013a8 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.rap;
+package org.argeo.cms.ui.workbench.rap;
 
 import java.security.PrivilegedAction;
 import java.util.Locale;
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/cms/ui/workbench/rap/SecureRapActivator.java
similarity index 96%
rename from org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
rename to org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SecureRapActivator.java
index 045f88a45..74068c241 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/cms/ui/workbench/rap/SecureRapActivator.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;
+package org.argeo.cms.ui.workbench.rap;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
-- 
2.30.2