(no commit message)

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 3ba1f785f20bc21e391a1e1c6838deb7a93cc8d3..bbe1aefd5e8eecf9d7ffccbcd6f3d3ca0bdc4c23 100644 (file)
--- 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.
  */ 
  * 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;
 
 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 e073442a7c2626d3800d54fccd4d8cbd43ba7416..57301e73377d547a0ad1ab927ca46ee3f2ad3bf4 100644 (file)
--- 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.
  */
  * 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.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.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 {
 
 
 public class UserAdministrationComponent extends DefaultContainer {
 


@@ -41,26 +42,19 @@ public class UserAdministrationComponent extends DefaultContainer {
     private ProvidedInterface USER_MGT = new DefaultProvidedInterface(
             "usermgt", UserAdministration.class);
 
     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);
     public UserAdministrationComponent(String aName, boolean aExposeInternals)
             throws IOException {
         super(aName);

-        _exposeInternals = aExposeInternals;
-
+        

         addComponent("mappingFiles", new UsermgtHibernateMappingFiles());
 
         addComponent("mappingFiles", new UsermgtHibernateMappingFiles());
 

-        _hibernate = new HibernateComponent("hibernate");
+        Component<?> _hibernate = new HibernateComponent("hibernate");

         addComponent(_hibernate);
 
         addComponent(_hibernate);
 

-        _repository = new UserGroupRepositoryComponent("usersgroups");
+        Component<?> _repository = new UserGroupRepositoryComponent("usersgroups");

         addComponent(_repository);
 
         addComponent(_repository);
 

-        _usermgt = new UserAdministrationLightComponent("usermgtlight");
+        Component<?> _usermgt = new UserAdministrationLightComponent("usermgtlight");

         addComponent(_usermgt);
 
         addRequiredInterface(new DefaultRequiredInterface("datasource",
         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 efd42286e13b5c88a3af59637e33e0eb9cf08e6f..46426cfc136d2ab6f15bdc2544950d217d2a5d09 100644 (file)
--- 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.
  */ 
  * 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;
 
 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.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
 
 /**
  * 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 d0fc434ab11f4f06196d496dbd19e6a3e29f2c59..6480e77fe2d8506774f249a3a4a5d19cc97ec36b 100644 (file)
--- 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.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;
 
 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 d5031f4e9f41f6f70ff7a44668f6263923cba555..77783a46eaf7922f1b808e616245439902d54b3c 100644 (file)
--- 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.system.adapters.DefaultContainer;
 import org.wamblee.system.spring.DatabaseTesterComponent;

-import org.wamblee.usermgt.HibernateComponent;

 import org.wamblee.usermgt.UserGroupRepositoryComponent;
 
 /**
 import org.wamblee.usermgt.UserGroupRepositoryComponent;
 
 /**