Refactor auditing

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/AuditDetailDao.java → bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/audit/AuditDetailDao.java

@@ -8,11 +8,12 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.dao;
+package edu.kit.scc.webreg.dao.audit;
 
 
 import java.util.List;
 
+import edu.kit.scc.webreg.dao.BaseDao;
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/AuditEntryDao.java → bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/audit/AuditEntryDao.java

@@ -8,11 +8,12 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.dao;
+package edu.kit.scc.webreg.dao.audit;
 
 import java.util.Date;
 import java.util.List;
 
+import edu.kit.scc.webreg.dao.BaseDao;
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditServiceRegisterEntity;

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/audit/AuditUserEntryDao.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.dao.audit;
+
+import edu.kit.scc.webreg.dao.BaseDao;
+import edu.kit.scc.webreg.entity.audit.AuditUserEntity;
+
+public interface AuditUserEntryDao extends BaseDao<AuditUserEntity, Long> {
+
+}

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/JpaAuditDetailDao.java → bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/audit/JpaAuditDetailDao.java

@@ -8,14 +8,15 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.dao.jpa;
+package edu.kit.scc.webreg.dao.jpa.audit;
 
 import java.util.List;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 
-import edu.kit.scc.webreg.dao.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.jpa.JpaBaseDao;
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditStatus;

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/JpaAuditEntryDao.java → bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/audit/JpaAuditEntryDao.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.dao.jpa;
+package edu.kit.scc.webreg.dao.jpa.audit;
 
 import java.util.Date;
 import java.util.List;
@@ -16,7 +16,8 @@ import java.util.List;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
+import edu.kit.scc.webreg.dao.jpa.JpaBaseDao;
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditServiceRegisterEntity;

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/audit/JpaAuditUserEntryDao.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.dao.jpa.audit;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Named;
+
+import edu.kit.scc.webreg.dao.audit.AuditUserEntryDao;
+import edu.kit.scc.webreg.dao.jpa.JpaBaseDao;
+import edu.kit.scc.webreg.entity.audit.AuditUserEntity;
+
+@Named
+@ApplicationScoped
+public class JpaAuditUserEntryDao extends JpaBaseDao<AuditUserEntity, Long> implements AuditUserEntryDao {
+
+	@Override
+	public Class<AuditUserEntity> getEntityClass() {
+		return AuditUserEntity.class;
+	}
+}

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AbstractAuditor.java

@@ -14,8 +14,8 @@ import java.util.Date;
 import java.util.HashSet;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditStatus;

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AttributeSourceAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.as.ASUserAttrEntity;
 import edu.kit.scc.webreg.entity.audit.AuditAttributeSourceEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;

bwreg-service/src/main/java/edu/kit/scc/webreg/service/AuditDetailService.java → bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditDetailService.java

@@ -8,12 +8,13 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.service;
+package edu.kit.scc.webreg.audit;
 
 import java.util.List;
 
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
+import edu.kit.scc.webreg.service.BaseService;
 
 public interface AuditDetailService extends BaseService<AuditDetailEntity, Long> {
 

bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/AuditDetailServiceImpl.java → bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditDetailServiceImpl.java

@@ -8,18 +8,18 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.service.impl;
+package edu.kit.scc.webreg.audit;
 
 import java.util.List;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
-import edu.kit.scc.webreg.dao.AuditDetailDao;
 import edu.kit.scc.webreg.dao.BaseDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
-import edu.kit.scc.webreg.service.AuditDetailService;
+import edu.kit.scc.webreg.service.impl.BaseServiceImpl;
 
 @Stateless
 public class AuditDetailServiceImpl extends BaseServiceImpl<AuditDetailEntity, Long> implements AuditDetailService {

bwreg-service/src/main/java/edu/kit/scc/webreg/service/AuditEntryService.java → bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditEntryService.java

@@ -8,13 +8,14 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.service;
+package edu.kit.scc.webreg.audit;
 
 import java.util.Date;
 import java.util.List;
 
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
+import edu.kit.scc.webreg.service.BaseService;
 
 public interface AuditEntryService extends BaseService<AuditEntryEntity, Long> {
 

bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/AuditEntryServiceImpl.java → bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditEntryServiceImpl.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Simon - initial
  ******************************************************************************/
-package edu.kit.scc.webreg.service.impl;
+package edu.kit.scc.webreg.audit;
 
 import java.util.Date;
 import java.util.List;
@@ -18,12 +18,12 @@ import javax.inject.Inject;
 
 import org.slf4j.Logger;
 
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
 import edu.kit.scc.webreg.dao.BaseDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.audit.AuditDetailEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
-import edu.kit.scc.webreg.service.AuditEntryService;
+import edu.kit.scc.webreg.service.impl.BaseServiceImpl;
 
 @Stateless
 public class AuditEntryServiceImpl extends BaseServiceImpl<AuditEntryEntity, Long> implements AuditEntryService {

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditUserEntryService.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.audit;
+
+import edu.kit.scc.webreg.entity.audit.AuditUserEntity;
+import edu.kit.scc.webreg.service.BaseService;
+
+public interface AuditUserEntryService extends BaseService<AuditUserEntity, Long> {
+
+}

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/AuditUserEntryServiceImpl.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.audit;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+import edu.kit.scc.webreg.dao.BaseDao;
+import edu.kit.scc.webreg.dao.audit.AuditUserEntryDao;
+import edu.kit.scc.webreg.entity.audit.AuditUserEntity;
+import edu.kit.scc.webreg.service.impl.BaseServiceImpl;
+
+@Stateless
+public class AuditUserEntryServiceImpl extends BaseServiceImpl<AuditUserEntity, Long> implements AuditUserEntryService {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private AuditUserEntryDao dao;
+	
+	@Override
+	protected BaseDao<AuditUserEntity, Long> getDao() {
+		return dao;
+	}
+}

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/GroupAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.GroupEntity;
 import edu.kit.scc.webreg.entity.audit.AuditGroupEntity;
 

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/IdpCommunicationAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.SamlIdpMetadataEntity;
 import edu.kit.scc.webreg.entity.SamlSpConfigurationEntity;
 import edu.kit.scc.webreg.entity.audit.AuditIdpCommunicationEntity;

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/ServiceAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.ServiceEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditServiceEntity;

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/ServiceRegisterAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditServiceRegisterEntity;

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/UserCreateAuditor.java

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.audit;
 import java.util.Map.Entry;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.entity.audit.AuditStatus;

bwreg-service/src/main/java/edu/kit/scc/webreg/audit/UserUpdateAuditor.java

@@ -11,8 +11,8 @@
 package edu.kit.scc.webreg.audit;
 
 import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
-import edu.kit.scc.webreg.dao.AuditDetailDao;
-import edu.kit.scc.webreg.dao.AuditEntryDao;
+import edu.kit.scc.webreg.dao.audit.AuditDetailDao;
+import edu.kit.scc.webreg.dao.audit.AuditEntryDao;
 import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.entity.audit.AuditUserUpdateEntity;