Separating out all hibernate and spring specific stuff

into the test project (to be removed later).

diff --git a/security/impl/pom.xml b/security/impl/pom.xml
index 89d75e9e5b8d568e6628617152702f9f0a8b79f6..c0c88b561ed295de7000f197ed75462de9314eb3 100644 (file)
--- 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 8d0e3d1d2f4108e4d4c55a87b41bea0131bec7c8..01b5e09d65157f2a0b325a15a578f01b9faa32bb 100644 (file)
--- 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