X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FUserAdministrationComponent.java;h=65ee1e3db7fd516bf046fab86da7a1932447dc65;hb=ea47b648b77ecdb3bb2232a61c460c91f0a65b4e;hp=57301e73377d547a0ad1ab927ca46ee3f2ad3bf4;hpb=c9dfc7dda9c77776bbe0aa02edfebe2372f8834f;p=utils

diff --git a/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
index 57301e73..65ee1e3d 100644
--- a/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
+++ b/security/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * Copyright 2005-2010 the original author or authors.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,59 +12,87 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 package org.wamblee.usermgt.hibernate;
 
-import java.io.IOException;
-
-import javax.sql.DataSource;
-
 import org.springframework.orm.hibernate3.HibernateTemplate;
+
 import org.springframework.transaction.PlatformTransactionManager;
+
 import org.wamblee.cache.EhCache;
+
 import org.wamblee.system.adapters.DefaultContainer;
+import org.wamblee.system.adapters.ObjectConfiguration;
+import org.wamblee.system.components.ORMappingConfig;
 import org.wamblee.system.core.Component;
 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.spring.component.HibernateComponent;
+
 import org.wamblee.usermgt.UserAdministration;
 import org.wamblee.usermgt.UserGroupRepositoryComponent;
 
+import java.io.IOException;
+
+import javax.sql.DataSource;
+
+/**
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
 public class UserAdministrationComponent extends DefaultContainer {
+    private ProvidedInterface transactionMgr = new DefaultProvidedInterface(
+        "transactionManager", PlatformTransactionManager.class);
 
-    private ProvidedInterface TRANSACTION_MGR = new DefaultProvidedInterface(
-            "transactionManager", PlatformTransactionManager.class);
-    private ProvidedInterface USER_CACHE = new DefaultProvidedInterface(
-            "userCache", EhCache.class);
-    private ProvidedInterface HIBERNATE_TEMPLATE = new DefaultProvidedInterface(
-            "hibernateTemplate", HibernateTemplate.class);
-    private ProvidedInterface USER_MGT = new DefaultProvidedInterface(
-            "usermgt", UserAdministration.class);
+    private ProvidedInterface userCache = new DefaultProvidedInterface(
+        "userCache", EhCache.class);
 
+    private ProvidedInterface hibernateTemplate = new DefaultProvidedInterface(
+        "hibernateTemplate", HibernateTemplate.class);
+
+    private ProvidedInterface userMgt = new DefaultProvidedInterface(
+        "usermgt", UserAdministration.class);
+
+    /**
+     * Creates a new UserAdministrationComponent object.
+     * 
+     * 
+     */
     public UserAdministrationComponent(String aName, boolean aExposeInternals)
-            throws IOException {
+        throws IOException {
         super(aName);
-        
-        addComponent("mappingFiles", new UsermgtHibernateMappingFiles());
 
-        Component<?> _hibernate = new HibernateComponent("hibernate");
-        addComponent(_hibernate);
+        ObjectConfiguration mappingFilesConfig = new ObjectConfiguration(
+            UsermgtHibernateMappingFiles.class);
+        mappingFilesConfig.getSetterConfig().initAllSetters();
+        addComponent("mappingFiles", new UsermgtHibernateMappingFiles(),
+            mappingFilesConfig);
 
-        Component<?> _repository = new UserGroupRepositoryComponent("usersgroups");
-        addComponent(_repository);
+        Component<?> hibernate = new HibernateComponent("hibernate");
+        addComponent(hibernate);
 
-        Component<?> _usermgt = new UserAdministrationLightComponent("usermgtlight");
-        addComponent(_usermgt);
+        Component<?> repository = new UserGroupRepositoryComponent(
+            "usersgroups");
+        addComponent(repository);
+
+        Component<?> usermgt = new UserAdministrationLightComponent(
+            "usermgtlight");
+        addComponent(usermgt);
 
         addRequiredInterface(new DefaultRequiredInterface("datasource",
-                DataSource.class));
+            DataSource.class));
+        addRequiredInterface(new DefaultRequiredInterface("ormconfig",
+            ORMappingConfig.class));
 
         if (aExposeInternals) {
-            addProvidedInterface(TRANSACTION_MGR);
-            addProvidedInterface(USER_CACHE);
-            addProvidedInterface(HIBERNATE_TEMPLATE);
+            addProvidedInterface(transactionMgr);
+            addProvidedInterface(userCache);
+            addProvidedInterface(hibernateTemplate);
         }
-        addProvidedInterface(USER_MGT);
+
+        addProvidedInterface(userMgt);
     }
 }