r196 - in trunk/idm-connector-core/src/main: java/org/openiam/idm/srvc/recon/service java/org/openiam/idm/srvc/recon/ws java/org/openiam/idm/srvc/synch/ws resources
commitm...@hosted-projects.com
Date: Thu Jun 10 05:47:52 2010
New Revision: 196
Modified:
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/service/ReconciliationServiceImpl.java
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/ws/ReconciliationWebServiceImpl.java
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/IdentitySynchServiceImpl.java
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDAOImpl.java
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDataMappingDAOImpl.java
trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/ws/IdentitySynchWebServiceImpl.java
trunk/idm-connector-core/src/main/resources/connector-coreContext.xml
Log:
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/service/ReconciliationServiceImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/service/ReconciliationServiceImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/service/ReconciliationServiceImpl.java Thu Jun 10 05:47:52 2010
@@ -32,6 +32,12 @@
*/
public class ReconciliationServiceImpl implements ReconciliationService {
+ protected ReconciliationSituationDAO reconSituationDao;
+ protected ReconciliationResultDAO reconResultDao;
+ protected ReconciliationConfigDAO reconConfigDao;
+ protected ReconciliationResultDAO reconResultDetailDao;
+
+
/* (non-Javadoc)
* @see org.openiam.idm.srvc.recon.service.ReconciliationService#getAllConfig()
*/
@@ -41,5 +47,45 @@
}
+ public ReconciliationSituationDAO getReconSituationDao() {
+ return reconSituationDao;
+ }
+
+
+ public void setReconSituationDao(ReconciliationSituationDAO reconSituationDao) {
+ this.reconSituationDao = reconSituationDao;
+ }
+
+
+ public ReconciliationResultDAO getReconResultDao() {
+ return reconResultDao;
+ }
+
+
+ public void setReconResultDao(ReconciliationResultDAO reconResultDao) {
+ this.reconResultDao = reconResultDao;
+ }
+
+
+ public ReconciliationConfigDAO getReconConfigDao() {
+ return reconConfigDao;
+ }
+
+
+ public void setReconConfigDao(ReconciliationConfigDAO reconConfigDao) {
+ this.reconConfigDao = reconConfigDao;
+ }
+
+
+ public ReconciliationResultDAO getReconResultDetailDao() {
+ return reconResultDetailDao;
+ }
+
+
+ public void setReconResultDetailDao(ReconciliationResultDAO reconResultDetailDao) {
+ this.reconResultDetailDao = reconResultDetailDao;
+ }
+
+
}
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/ws/ReconciliationWebServiceImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/ws/ReconciliationWebServiceImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/recon/ws/ReconciliationWebServiceImpl.java Thu Jun 10 05:47:52 2010
@@ -23,6 +23,7 @@
import javax.jws.WebService;
+import org.openiam.idm.srvc.recon.service.ReconciliationService;
import org.openiam.idm.srvc.synch.ws.IdentitySynchWebService;
import org.openiam.idm.srvc.synch.ws.SynchConfigListResponse;
@@ -36,6 +37,9 @@
serviceName = "ReconciliationWebService")
public class ReconciliationWebServiceImpl implements ReconciliationWebService {
+ ReconciliationService reconService;
+
+
/* (non-Javadoc)
* @see org.openiam.idm.srvc.recon.ws.ReconciliationWebService#getAllConfig()
*/
@@ -44,4 +48,14 @@
return null;
}
+
+ public ReconciliationService getReconService() {
+ return reconService;
+ }
+
+
+ public void setReconService(ReconciliationService reconService) {
+ this.reconService = reconService;
+ }
+
}
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/IdentitySynchServiceImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/IdentitySynchServiceImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/IdentitySynchServiceImpl.java Thu Jun 10 05:47:52 2010
@@ -30,7 +30,10 @@
*
*/
public class IdentitySynchServiceImpl implements IdentitySynchService {
-
+ SynchConfigDAO synchConfigDao;
+ SynchConfigDataMappingDAO synchConfigMappingDao;
+
+
/* (non-Javadoc)
* @see org.openiam.idm.srvc.synch.service.IdentitySynchService#getAllConfig()
*/
@@ -39,4 +42,25 @@
return null;
}
+
+ public SynchConfigDAO getSynchConfigDao() {
+ return synchConfigDao;
+ }
+
+
+ public void setSynchConfigDao(SynchConfigDAO synchConfigDao) {
+ this.synchConfigDao = synchConfigDao;
+ }
+
+
+ public SynchConfigDataMappingDAO getSynchConfigMappingDao() {
+ return synchConfigMappingDao;
+ }
+
+
+ public void setSynchConfigMappingDao(
+ SynchConfigDataMappingDAO synchConfigMappingDao) {
+ this.synchConfigMappingDao = synchConfigMappingDao;
+ }
+
}
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDAOImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDAOImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDAOImpl.java Thu Jun 10 05:47:52 2010
@@ -17,11 +17,16 @@
* @see org.openiam.idm.srvc.pswd.service.SynchConfig
* @author Hibernate Tools
*/
-public class SynchConfigDAOImpl {
+public class SynchConfigDAOImpl implements SynchConfigDAO {
private static final Log log = LogFactory.getLog(SynchConfigDAOImpl.class);
- private final SessionFactory sessionFactory = getSessionFactory();
+ private SessionFactory sessionFactory;
+
+
+ public void setSessionFactory(SessionFactory session) {
+ this.sessionFactory = session;
+ }
protected SessionFactory getSessionFactory() {
try {
@@ -34,40 +39,21 @@
}
}
- public void persist(SynchConfig transientInstance) {
+ public SynchConfig add(SynchConfig transientInstance) {
log.debug("persisting SynchConfig instance");
try {
sessionFactory.getCurrentSession().persist(transientInstance);
log.debug("persist successful");
+ return transientInstance;
} catch (RuntimeException re) {
log.error("persist failed", re);
throw re;
}
}
- public void attachDirty(SynchConfig instance) {
- log.debug("attaching dirty SynchConfig instance");
- try {
- sessionFactory.getCurrentSession().saveOrUpdate(instance);
- log.debug("attach successful");
- } catch (RuntimeException re) {
- log.error("attach failed", re);
- throw re;
- }
- }
- public void attachClean(SynchConfig instance) {
- log.debug("attaching clean SynchConfig instance");
- try {
- sessionFactory.getCurrentSession().lock(instance, LockMode.NONE);
- log.debug("attach successful");
- } catch (RuntimeException re) {
- log.error("attach failed", re);
- throw re;
- }
- }
- public void delete(SynchConfig persistentInstance) {
+ public void remove(SynchConfig persistentInstance) {
log.debug("deleting SynchConfig instance");
try {
sessionFactory.getCurrentSession().delete(persistentInstance);
@@ -78,7 +64,7 @@
}
}
- public SynchConfig merge(SynchConfig detachedInstance) {
+ public SynchConfig update(SynchConfig detachedInstance) {
log.debug("merging SynchConfig instance");
try {
SynchConfig result = (SynchConfig) sessionFactory
@@ -109,19 +95,4 @@
}
}
- public List<SynchConfig> findByExample(SynchConfig instance) {
- log.debug("finding SynchConfig instance by example");
- try {
- List<SynchConfig> results = (List<SynchConfig>) sessionFactory
- .getCurrentSession().createCriteria(
- "org.openiam.idm.srvc.pswd.service.SynchConfig")
- .add(create(instance)).list();
- log.debug("find by example successful, result size: "
- + results.size());
- return results;
- } catch (RuntimeException re) {
- log.error("find by example failed", re);
- throw re;
- }
- }
}
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDataMappingDAOImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDataMappingDAOImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/service/SynchConfigDataMappingDAOImpl.java Thu Jun 10 05:47:52 2010
@@ -8,6 +8,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.LockMode;
import org.hibernate.SessionFactory;
+import org.openiam.idm.srvc.synch.dto.SynchConfig;
import org.openiam.idm.srvc.synch.dto.SynchConfigDataMapping;
import static org.hibernate.criterion.Example.create;
@@ -17,12 +18,17 @@
* @see org.openiam.idm.srvc.pswd.service.SynchConfigDataMapping
* @author Hibernate Tools
*/
-public class SynchConfigDataMappingDAOImpl {
+public class SynchConfigDataMappingDAOImpl implements SynchConfigDataMappingDAO {
private static final Log log = LogFactory
.getLog(SynchConfigDataMappingDAOImpl.class);
- private final SessionFactory sessionFactory = getSessionFactory();
+ private SessionFactory sessionFactory;
+
+
+ public void setSessionFactory(SessionFactory session) {
+ this.sessionFactory = session;
+ }
protected SessionFactory getSessionFactory() {
try {
@@ -35,40 +41,21 @@
}
}
- public void persist(SynchConfigDataMapping transientInstance) {
- log.debug("persisting SynchConfigDataMapping instance");
+ public SynchConfigDataMapping add(SynchConfigDataMapping transientInstance) {
+ log.debug("persisting SynchConfig instance");
try {
sessionFactory.getCurrentSession().persist(transientInstance);
log.debug("persist successful");
+ return transientInstance;
} catch (RuntimeException re) {
log.error("persist failed", re);
throw re;
}
}
+
- public void attachDirty(SynchConfigDataMapping instance) {
- log.debug("attaching dirty SynchConfigDataMapping instance");
- try {
- sessionFactory.getCurrentSession().saveOrUpdate(instance);
- log.debug("attach successful");
- } catch (RuntimeException re) {
- log.error("attach failed", re);
- throw re;
- }
- }
- public void attachClean(SynchConfigDataMapping instance) {
- log.debug("attaching clean SynchConfigDataMapping instance");
- try {
- sessionFactory.getCurrentSession().lock(instance, LockMode.NONE);
- log.debug("attach successful");
- } catch (RuntimeException re) {
- log.error("attach failed", re);
- throw re;
- }
- }
-
- public void delete(SynchConfigDataMapping persistentInstance) {
+ public void remove(SynchConfigDataMapping persistentInstance) {
log.debug("deleting SynchConfigDataMapping instance");
try {
sessionFactory.getCurrentSession().delete(persistentInstance);
@@ -79,7 +66,7 @@
}
}
- public SynchConfigDataMapping merge(SynchConfigDataMapping detachedInstance) {
+ public SynchConfigDataMapping update(SynchConfigDataMapping detachedInstance) {
log.debug("merging SynchConfigDataMapping instance");
try {
SynchConfigDataMapping result = (SynchConfigDataMapping) sessionFactory
@@ -112,21 +99,4 @@
}
}
- public List<SynchConfigDataMapping> findByExample(
- SynchConfigDataMapping instance) {
- log.debug("finding SynchConfigDataMapping instance by example");
- try {
- List<SynchConfigDataMapping> results = (List<SynchConfigDataMapping>) sessionFactory
- .getCurrentSession()
- .createCriteria(
- "org.openiam.idm.srvc.pswd.service.SynchConfigDataMapping")
- .add(create(instance)).list();
- log.debug("find by example successful, result size: "
- + results.size());
- return results;
- } catch (RuntimeException re) {
- log.error("find by example failed", re);
- throw re;
- }
- }
}
Modified: trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/ws/IdentitySynchWebServiceImpl.java
==============================================================================
--- trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/ws/IdentitySynchWebServiceImpl.java (original)
+++ trunk/idm-connector-core/src/main/java/org/openiam/idm/srvc/synch/ws/IdentitySynchWebServiceImpl.java Thu Jun 10 05:47:52 2010
@@ -23,6 +23,7 @@
import javax.jws.WebService;
+import org.openiam.idm.srvc.synch.service.IdentitySynchService;
import org.openiam.idm.srvc.synch.ws.IdentitySynchWebService;
import org.openiam.idm.srvc.synch.ws.SynchConfigListResponse;
@@ -36,6 +37,8 @@
serviceName = "IdentitySynchWebService")
public class IdentitySynchWebServiceImpl implements IdentitySynchWebService {
+ IdentitySynchService synchService;
+
/* (non-Javadoc)
* @see org.openiam.idm.srvc.sync.ws.IdentitySynchWebService#getAllConfig()
*/
@@ -44,4 +47,12 @@
return null;
}
+ public IdentitySynchService getSynchService() {
+ return synchService;
+ }
+
+ public void setSynchService(IdentitySynchService synchService) {
+ this.synchService = synchService;
+ }
+
}
Modified: trunk/idm-connector-core/src/main/resources/connector-coreContext.xml
==============================================================================
--- trunk/idm-connector-core/src/main/resources/connector-coreContext.xml (original)
+++ trunk/idm-connector-core/src/main/resources/connector-coreContext.xml Thu Jun 10 05:47:52 2010
@@ -106,17 +106,35 @@
<property name="scriptEngine" value="org.openiam.script.GroovyScriptEngineIntegration" />
</bean>
+<!-- ========================= Synchronization ========================= -->
+
<bean id="synchService" class="org.openiam.idm.srvc.synch.service.IdentitySynchServiceImpl">
+ <property name="synchConfigDao" ref="synchConfigDAO" />
+ <property name="synchConfigMappingDao" ref="synchConfigDataMappingDAO" />
</bean>
<bean id="synchServiceWS" class="org.openiam.idm.srvc.synch.ws.IdentitySynchWebServiceImpl">
+ <property name="synchService" ref="synchService" />
</bean>
-
+ <bean id="synchConfigDAO" class="org.openiam.idm.srvc.synch.service.SynchConfigDAOImpl" >
+ <property name="sessionFactory" ref="sesFactory" />
+ </bean>
+ <bean id="synchConfigDataMappingDAO" class="org.openiam.idm.srvc.synch.service.SynchConfigDataMappingDAOImpl" >
+ <property name="sessionFactory" ref="sesFactory" />
+ </bean>
+
+<!-- ========================= Reconciliation ========================= -->
<bean id="reconService" class="org.openiam.idm.srvc.recon.service.ReconciliationServiceImpl">
+ <property name="reconSituationDao" ref="reconSituationDAO" />
+ <property name="reconConfigDao" ref="reconConfigDAO" />
+ <property name="reconResultDao" ref="reconResultDAO" />
+ <property name="reconResultDetailDao" ref="reconResultDetailDAO" />
</bean>
<bean id="reconServiceWS" class="org.openiam.idm.srvc.recon.ws.ReconciliationWebServiceImpl">
+ <property name="reconService" ref="reconService" />
</bean>
+
<bean id="reconSituationDAO" class="org.openiam.idm.srvc.recon.service.ReconciliationSituationDAOImpl" >
<property name="sessionFactory" ref="sesFactory"></property>
</bean>