From: Erik Brakkee <erik@brakkee.org>
Date: Wed, 14 May 2008 16:14:00 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.7~733
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=3501efff7efe22305e1f0c3811847dd4950ee18c;p=utils

---

diff --git a/security/src/main/java/org/wamblee/usermgt/HibernateComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java
similarity index 98%
rename from security/src/main/java/org/wamblee/usermgt/HibernateComponent.java
rename to security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java
index 3ba1f785..bbe1aefd 100644
--- a/security/src/main/java/org/wamblee/usermgt/HibernateComponent.java
+++ b/security/src/main/java/org/wamblee/usermgt/hibernate/HibernateComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.usermgt;
+package org.wamblee.usermgt.hibernate;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/security/src/main/java/org/wamblee/usermgt/UserAdministrationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
similarity index 82%
rename from security/src/main/java/org/wamblee/usermgt/UserAdministrationComponent.java
rename to security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
index e073442a..57301e73 100644
--- a/security/src/main/java/org/wamblee/usermgt/UserAdministrationComponent.java
+++ b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.wamblee.usermgt;
+package org.wamblee.usermgt.hibernate;
 
 import java.io.IOException;
 
@@ -28,7 +28,8 @@ import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.Scope;
-import org.wamblee.usermgt.hibernate.UsermgtHibernateMappingFiles;
+import org.wamblee.usermgt.UserAdministration;
+import org.wamblee.usermgt.UserGroupRepositoryComponent;
 
 public class UserAdministrationComponent extends DefaultContainer {
 
@@ -41,26 +42,19 @@ public class UserAdministrationComponent extends DefaultContainer {
     private ProvidedInterface USER_MGT = new DefaultProvidedInterface(
             "usermgt", UserAdministration.class);
 
-    private Component<?> _hibernate;
-    private Component<?> _repository;
-    private Component<?> _usermgt;
-
-    private boolean _exposeInternals;
-
     public UserAdministrationComponent(String aName, boolean aExposeInternals)
             throws IOException {
         super(aName);
-        _exposeInternals = aExposeInternals;
-
+        
         addComponent("mappingFiles", new UsermgtHibernateMappingFiles());
 
-        _hibernate = new HibernateComponent("hibernate");
+        Component<?> _hibernate = new HibernateComponent("hibernate");
         addComponent(_hibernate);
 
-        _repository = new UserGroupRepositoryComponent("usersgroups");
+        Component<?> _repository = new UserGroupRepositoryComponent("usersgroups");
         addComponent(_repository);
 
-        _usermgt = new UserAdministrationLightComponent("usermgtlight");
+        Component<?> _usermgt = new UserAdministrationLightComponent("usermgtlight");
         addComponent(_usermgt);
 
         addRequiredInterface(new DefaultRequiredInterface("datasource",
diff --git a/security/src/main/java/org/wamblee/usermgt/UserAdministrationLightComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
similarity index 93%
rename from security/src/main/java/org/wamblee/usermgt/UserAdministrationLightComponent.java
rename to security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
index efd42286..46426cfc 100644
--- a/security/src/main/java/org/wamblee/usermgt/UserAdministrationLightComponent.java
+++ b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package org.wamblee.usermgt;
+package org.wamblee.usermgt.hibernate;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,6 +23,9 @@ import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.system.spring.SpringComponent;
+import org.wamblee.usermgt.GroupSet;
+import org.wamblee.usermgt.UserAdministration;
+import org.wamblee.usermgt.UserSet;
 
 /**
  * Light version of the user administration component that requires external
diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
index d0fc434a..6480e77f 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
@@ -31,7 +31,6 @@ import org.wamblee.system.core.Scope;
 import org.wamblee.system.spring.DatabaseTesterComponent;
 import org.wamblee.test.spring.TestTransactionCallbackWithoutResult;
 import org.wamblee.usermgt.UserAdministration;
-import org.wamblee.usermgt.UserAdministrationComponent;
 import org.wamblee.usermgt.UserAdministrationImplTest;
 import org.wamblee.usermgt.UsermgtSpringConfigFiles;
 
diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
index d5031f4e..77783a46 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 
 import org.wamblee.system.adapters.DefaultContainer;
 import org.wamblee.system.spring.DatabaseTesterComponent;
-import org.wamblee.usermgt.HibernateComponent;
 import org.wamblee.usermgt.UserGroupRepositoryComponent;
 
 /**