From 2213b7fa034ea09f69e489284bf218a34b4281b8 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sat, 24 Apr 2010 19:34:51 +0000
Subject: [PATCH] Separating out all hibernate and spring specific stuff into
the test project (to be removed later).
---
security/impl/pom.xml | 46 +------------------
security/jpatest/pom.xml | 13 +++++-
.../hibernate/AuthorizationMappingFiles.java | 0
.../usermgt/UserGroupRepositoryComponent.java | 0
.../hibernate/AuthorizationComponent.java | 0
.../AuthorizationLightComponent.java | 0
.../usermgt/hibernate/HibernateGroupSet.java | 0
.../usermgt/hibernate/HibernateUserSet.java | 0
.../UserAdministrationComponent.java | 0
.../UserAdministrationLightComponent.java | 0
.../UsermgtHibernateMappingFiles.java | 0
.../PersistentAuthorizationServiceTest.java | 0
.../hibernate/HibernateGroupSetTest.java | 0
.../HibernateUserAdministrationTest.java | 0
.../hibernate/HibernateUserSetTest.java | 0
.../UserMgtRepositoryTestContainer.java | 0
16 files changed, 14 insertions(+), 45 deletions(-)
rename security/{impl => jpatest}/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java (100%)
rename security/{impl => jpatest}/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java (100%)
rename security/{impl => jpatest}/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java (100%)
rename security/{impl => jpatest}/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java (100%)
rename security/{impl => jpatest}/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java (100%)
rename security/{impl => jpatest}/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java (100%)
rename security/{impl => jpatest}/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java (100%)
diff --git a/security/impl/pom.xml b/security/impl/pom.xml
index 89d75e9e..c0c88b56 100644
--- a/security/impl/pom.xml
+++ b/security/impl/pom.xml
@@ -31,11 +31,6 @@
<version>0.2.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.wamblee</groupId>
- <artifactId>wamblee-system-spring</artifactId>
- <version>0.2.2-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-system-spring</artifactId>
@@ -48,22 +43,10 @@
<type>test-jar</type>
<version>0.2.2-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.wamblee</groupId>
- <artifactId>wamblee-support-spring</artifactId>
- <version>0.2.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.wamblee</groupId>
- <artifactId>wamblee-support-spring</artifactId>
- <type>test-jar</type>
- <version>0.2.2-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.wamblee</groupId>
- <artifactId>wamblee-hibernate-jpa</artifactId>
- <version>0.2.2-SNAPSHOT</version>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
</dependency>
<dependency>
@@ -71,31 +54,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>transaction-api</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/security/jpatest/pom.xml b/security/jpatest/pom.xml
index 8d0e3d1d..01b5e09d 100644
--- a/security/jpatest/pom.xml
+++ b/security/jpatest/pom.xml
@@ -13,7 +13,18 @@
<name>/security/jpatest</name>
<url>http://wamblee.org</url>
<dependencies>
-
+
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-security-impl</artifactId>
+ <version>0.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wamblee</groupId>
+ <artifactId>wamblee-security-impl</artifactId>
+ <version>0.2.2-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.wamblee</groupId>
<artifactId>wamblee-support-general</artifactId>
diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java b/security/jpatest/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java
rename to security/jpatest/src/main/java/org/wamblee/security/authorization/hibernate/AuthorizationMappingFiles.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java b/security/jpatest/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/UserGroupRepositoryComponent.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationComponent.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/AuthorizationLightComponent.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationComponent.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UserAdministrationLightComponent.java
diff --git a/security/impl/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java
similarity index 100%
rename from security/impl/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java
rename to security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/UsermgtHibernateMappingFiles.java
diff --git a/security/impl/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java b/security/jpatest/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
similarity index 100%
rename from security/impl/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
rename to security/jpatest/src/test/java/org/wamblee/security/authorization/hibernate/PersistentAuthorizationServiceTest.java
diff --git a/security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java b/security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
similarity index 100%
rename from security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
rename to security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateGroupSetTest.java
diff --git a/security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
similarity index 100%
rename from security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
rename to security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java
diff --git a/security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
similarity index 100%
rename from security/impl/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
rename to security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
diff --git a/security/impl/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java b/security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
similarity index 100%
rename from security/impl/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
rename to security/jpatest/src/test/java/org/wamblee/usermgt/hibernate/UserMgtRepositoryTestContainer.java
--
2.31.1