From 732542c8de267ed7d6cbb8c66b84cc90c8ad22d7 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 16 Sep 2015 23:16:40 +0000
Subject: [PATCH] Move most of the code to the internal packages

git-svn-id: https://svn.argeo.org/commons/trunk@8414 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/commands.xml                     | 12 ++++++------
 .../META-INF/spring/common.xml                       |  2 +-
 .../META-INF/spring/parts.xml                        |  2 +-
 org.argeo.security.ui.admin/plugin.xml               |  4 ++--
 .../security/ui/admin/internal/UiAdminUtils.java     |  1 +
 .../security/ui/admin/internal/UserTableViewer.java  |  1 +
 .../admin/{ => internal}/commands/DeleteGroups.java  |  2 +-
 .../admin/{ => internal}/commands/DeleteUsers.java   |  2 +-
 .../admin/{ => internal}/commands/ForceRefresh.java  |  2 +-
 .../ui/admin/{ => internal}/commands/NewGroup.java   |  2 +-
 .../ui/admin/{ => internal}/commands/NewUser.java    |  2 +-
 .../admin/{ => internal}/commands/SaveArgeoUser.java |  2 +-
 .../{ => internal}/commands/UserBatchUpdate.java     |  2 +-
 .../commands/UserTransactionHandler.java             |  2 +-
 .../parts}/ArgeoUserEditorInput.java                 |  2 +-
 .../parts}/DefaultUserMainPage.java                  |  2 +-
 .../{editors => internal/parts}/GroupMainPage.java   | 12 ++++++------
 .../security/ui/admin/internal/parts/GroupsView.java |  8 ++++----
 .../parts}/UserBatchUpdateWizard.java                |  2 +-
 .../{editors => internal/parts}/UserEditor.java      |  2 +-
 .../{editors => internal/parts}/UserEditorInput.java |  2 +-
 .../{editors => internal/parts}/UserMainPage.java    | 10 +++++-----
 .../{editors => internal/parts}/UserRolesPage.java   |  2 +-
 .../security/ui/admin/internal/parts/UsersView.java  | 10 +++++-----
 .../admin/internal/{ => providers}/CommonNameLP.java |  2 +-
 .../ui/admin/internal/{ => providers}/MailLP.java    |  2 +-
 .../admin/internal/{ => providers}/RoleIconLP.java   |  2 +-
 .../{ => providers}/UserAdminAbstractLP.java         |  4 +++-
 .../internal/{ => providers}/UserDragListener.java   |  2 +-
 .../admin/internal/{ => providers}/UserNameLP.java   |  2 +-
 .../UserTableDefaultDClickListener.java              |  6 +++---
 .../{ => providers}/UserTransactionProvider.java     |  2 +-
 32 files changed, 58 insertions(+), 54 deletions(-)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/DeleteGroups.java (98%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/DeleteUsers.java (98%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/ForceRefresh.java (96%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/NewGroup.java (99%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/NewUser.java (99%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/SaveArgeoUser.java (96%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/UserBatchUpdate.java (97%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{ => internal}/commands/UserTransactionHandler.java (98%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/ArgeoUserEditorInput.java (97%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/DefaultUserMainPage.java (99%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/GroupMainPage.java (96%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{wizards => internal/parts}/UserBatchUpdateWizard.java (99%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/UserEditor.java (98%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/UserEditorInput.java (97%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/UserMainPage.java (97%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/{editors => internal/parts}/UserRolesPage.java (99%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/CommonNameLP.java (87%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/MailLP.java (87%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/RoleIconLP.java (90%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/UserAdminAbstractLP.java (90%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/UserDragListener.java (94%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/UserNameLP.java (84%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/UserTableDefaultDClickListener.java (86%)
 rename org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/{ => providers}/UserTransactionProvider.java (97%)

diff --git a/org.argeo.security.ui.admin/META-INF/spring/commands.xml b/org.argeo.security.ui.admin/META-INF/spring/commands.xml
index 412355054..0015d3fb5 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/commands.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/commands.xml
@@ -5,31 +5,31 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- USERS & GROUPS CRUDS -->
-	<bean id="newUser" class="org.argeo.security.ui.admin.commands.NewUser"
+	<bean id="newUser" class="org.argeo.security.ui.admin.internal.commands.NewUser"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 
-	<bean id="newGroup" class="org.argeo.security.ui.admin.commands.NewGroup"
+	<bean id="newGroup" class="org.argeo.security.ui.admin.internal.commands.NewGroup"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
-	<bean id="deleteUsers" class="org.argeo.security.ui.admin.commands.DeleteUsers"
+	<bean id="deleteUsers" class="org.argeo.security.ui.admin.internal.commands.DeleteUsers"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
-	<bean id="deleteGroups" class="org.argeo.security.ui.admin.commands.DeleteGroups"
+	<bean id="deleteGroups" class="org.argeo.security.ui.admin.internal.commands.DeleteGroups"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 
-	<!-- <bean id="userBatchUpdate" class="org.argeo.security.ui.admin.commands.UserBatchUpdate" 
+	<!-- <bean id="userBatchUpdate" class="org.argeo.security.ui.admin.internal.commands.UserBatchUpdate" 
 		scope="prototype"> <property name="repository" ref="nodeRepository" /> <property 
 		name="userAdminService" ref="userAdminService" /> </bean> -->
 
 	<!-- TRANSACTIONS -->
 	<bean id="userTransactionHandler"
-		class="org.argeo.security.ui.admin.commands.UserTransactionHandler"
+		class="org.argeo.security.ui.admin.internal.commands.UserTransactionHandler"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
diff --git a/org.argeo.security.ui.admin/META-INF/spring/common.xml b/org.argeo.security.ui.admin/META-INF/spring/common.xml
index bcb039da6..7f55a858c 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/common.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/common.xml
@@ -5,7 +5,7 @@
 
 
 	<bean id="userTransactionProvider"
-		class="org.argeo.security.ui.admin.internal.UserTransactionProvider"
+		class="org.argeo.security.ui.admin.internal.providers.UserTransactionProvider"
 		scope="singleton" lazy-init="false">
 		<property name="userTransaction" ref="userTransaction" />
 	</bean>
diff --git a/org.argeo.security.ui.admin/META-INF/spring/parts.xml b/org.argeo.security.ui.admin/META-INF/spring/parts.xml
index d680910fd..1c65b66f8 100644
--- a/org.argeo.security.ui.admin/META-INF/spring/parts.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/parts.xml
@@ -6,7 +6,7 @@
 
 
 	<!-- Editors -->
-	<bean id="userEditor" class="org.argeo.security.ui.admin.editors.UserEditor"
+	<bean id="userEditor" class="org.argeo.security.ui.admin.internal.parts.UserEditor"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
diff --git a/org.argeo.security.ui.admin/plugin.xml b/org.argeo.security.ui.admin/plugin.xml
index eae744960..a339d54dc 100644
--- a/org.argeo.security.ui.admin/plugin.xml
+++ b/org.argeo.security.ui.admin/plugin.xml
@@ -79,7 +79,7 @@
 
  	  <!-- Force the refresh when the various listener are not enough -->
       <command
-            defaultHandler="org.argeo.security.ui.admin.commands.ForceRefresh"
+            defaultHandler="org.argeo.security.ui.admin.internal.commands.ForceRefresh"
             id="org.argeo.security.ui.admin.forceRefresh"
             name="Force Refresh">
       </command>
@@ -205,7 +205,7 @@
             provider="org.argeo.eclipse.spring.SpringExtensionFactory" >
 	   	
 <!--	   	<sourceProvider
-	        provider="org.argeo.security.ui.admin.internal.UserTransactionProvider">
+	        provider="org.argeo.security.ui.admin.internal.providers.UserTransactionProvider">
 -->	     	<variable
 	            name="org.argeo.security.ui.admin.userTransactionState"
 	            priorityLevel="workbench">
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index 136c41540..062be2dfc 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -10,6 +10,7 @@ import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.argeo.ArgeoException;
+import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableViewer.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableViewer.java
index adaf81df8..637b8e6e4 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableViewer.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableViewer.java
@@ -6,6 +6,7 @@ import java.util.List;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.utils.ViewerUtils;
+import org.argeo.security.ui.admin.internal.providers.UserAdminAbstractLP;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
similarity index 98%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
index 2add11bc4..59dca2bad 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteGroups.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
similarity index 98%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
index 6a9da4b8d..56cd59f36 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/DeleteUsers.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/ForceRefresh.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java
similarity index 96%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/ForceRefresh.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java
index 7d0f8266f..231c8718a 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/ForceRefresh.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import org.argeo.security.ui.admin.internal.parts.GroupsView;
 import org.argeo.security.ui.admin.internal.parts.UsersView;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewGroup.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
similarity index 99%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewGroup.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
index d752bd1b2..b50f67f1e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewGroup.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import java.util.Dictionary;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
similarity index 99%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewUser.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index 443fe079c..a0b8da2fa 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/NewUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import java.util.Dictionary;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/SaveArgeoUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
similarity index 96%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/SaveArgeoUser.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
index a2047bf6a..131a7c4e3 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/SaveArgeoUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.eclipse.core.commands.AbstractHandler;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserBatchUpdate.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java
similarity index 97%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserBatchUpdate.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java
index d38a565f5..fb1a491d9 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserBatchUpdate.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserTransactionHandler.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
similarity index 98%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserTransactionHandler.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
index aa07040f5..6c9d1f995 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/commands/UserTransactionHandler.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.commands;
+package org.argeo.security.ui.admin.internal.commands;
 
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java
similarity index 97%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java
index 9d1d99573..cca2a1215 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/ArgeoUserEditorInput.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java
similarity index 99%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java
index 811860aba..bb770e68e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.Arrays;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/GroupMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
similarity index 96%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/GroupMainPage.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
index 1f71c6360..c7cecf210 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/GroupMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,14 +24,14 @@ import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.CommonNameLP;
-import org.argeo.security.ui.admin.internal.MailLP;
-import org.argeo.security.ui.admin.internal.RoleIconLP;
 import org.argeo.security.ui.admin.internal.UserAdminConstants;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserNameLP;
-import org.argeo.security.ui.admin.internal.UserTableDefaultDClickListener;
 import org.argeo.security.ui.admin.internal.UserTableViewer;
+import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
+import org.argeo.security.ui.admin.internal.providers.MailLP;
+import org.argeo.security.ui.admin.internal.providers.RoleIconLP;
+import org.argeo.security.ui.admin.internal.providers.UserNameLP;
+import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
index 62990baae..e6472c67b 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
@@ -23,14 +23,14 @@ import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.argeo.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.CommonNameLP;
 import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminConstants;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserDragListener;
-import org.argeo.security.ui.admin.internal.UserNameLP;
-import org.argeo.security.ui.admin.internal.UserTableDefaultDClickListener;
 import org.argeo.security.ui.admin.internal.UserTableViewer;
+import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
+import org.argeo.security.ui.admin.internal.providers.UserDragListener;
+import org.argeo.security.ui.admin.internal.providers.UserNameLP;
+import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
similarity index 99%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
index bfa65a7b8..aa6e2c6be 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/wizards/UserBatchUpdateWizard.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.wizards;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
similarity index 98%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
index ed39f30f2..90ea372bd 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditor.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditorInput.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java
similarity index 97%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditorInput.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java
index 7f078276e..fe129f815 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserEditorInput.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
similarity index 97%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserMainPage.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
index dbaba9c1a..9f1868111 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,13 +23,13 @@ import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.CommonNameLP;
-import org.argeo.security.ui.admin.internal.RoleIconLP;
 import org.argeo.security.ui.admin.internal.UserAdminConstants;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserNameLP;
-import org.argeo.security.ui.admin.internal.UserTableDefaultDClickListener;
 import org.argeo.security.ui.admin.internal.UserTableViewer;
+import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
+import org.argeo.security.ui.admin.internal.providers.RoleIconLP;
+import org.argeo.security.ui.admin.internal.providers.UserNameLP;
+import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserRolesPage.java
similarity index 99%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserRolesPage.java
index a81a869a7..2b6ba6968 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/editors/UserRolesPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserRolesPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.editors;
+package org.argeo.security.ui.admin.internal.parts;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
index 15bdf4a60..b7682394a 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
@@ -23,15 +23,15 @@ import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.argeo.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.CommonNameLP;
-import org.argeo.security.ui.admin.internal.MailLP;
 import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminConstants;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserDragListener;
-import org.argeo.security.ui.admin.internal.UserNameLP;
-import org.argeo.security.ui.admin.internal.UserTableDefaultDClickListener;
 import org.argeo.security.ui.admin.internal.UserTableViewer;
+import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
+import org.argeo.security.ui.admin.internal.providers.MailLP;
+import org.argeo.security.ui.admin.internal.providers.UserDragListener;
+import org.argeo.security.ui.admin.internal.providers.UserNameLP;
+import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/CommonNameLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java
similarity index 87%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/CommonNameLP.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java
index 7f999588b..cc6c3d90c 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/CommonNameLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.osgi.service.useradmin.User;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/MailLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/MailLP.java
similarity index 87%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/MailLP.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/MailLP.java
index bf01c660b..7b8d96ce0 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/MailLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/MailLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.osgi.service.useradmin.User;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/RoleIconLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java
similarity index 90%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/RoleIconLP.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java
index cce1916ed..8b7414d94 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/RoleIconLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.argeo.security.ui.admin.SecurityAdminImages;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminAbstractLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
similarity index 90%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminAbstractLP.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
index f584afe67..68138ca26 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminAbstractLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
@@ -1,8 +1,10 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
+import org.argeo.security.ui.admin.internal.UiAdminUtils;
+import org.argeo.security.ui.admin.internal.UserAdminConstants;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserDragListener.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java
similarity index 94%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserDragListener.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java
index abaab3301..74b837a73 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserDragListener.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserNameLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java
similarity index 84%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserNameLP.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java
index 083cc6a09..a2a15c112 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserNameLP.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.osgi.service.useradmin.User;
 
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableDefaultDClickListener.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
similarity index 86%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableDefaultDClickListener.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
index fc4ebd85d..94434bd8a 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTableDefaultDClickListener.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
@@ -1,9 +1,9 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
-import org.argeo.security.ui.admin.editors.UserEditor;
-import org.argeo.security.ui.admin.editors.UserEditorInput;
+import org.argeo.security.ui.admin.internal.parts.UserEditor;
+import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTransactionProvider.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
similarity index 97%
rename from org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTransactionProvider.java
rename to org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
index a3af53e63..877e5641f 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserTransactionProvider.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.security.ui.admin.internal.providers;
 
 import java.util.HashMap;
 import java.util.Map;
-- 
2.30.2