Merge pull request #128 from vbekiaris/fixes/1.1/remove-redundant-mod…

…ules Removes redundant modules app-domain and test-domain
jsr107 · Oct 7, 2017 · 666b1e5 · 666b1e5
2 parents 5d8d2de + 3ea933c
commit 666b1e5
Show file tree

Hide file tree

Showing 44 changed files with 4 additions and 838 deletions.
diff --git a/app-domain/.gitignore b/app-domain/.gitignore
diff --git a/app-domain/checkstyle/ClassHeader.txt b/app-domain/checkstyle/ClassHeader.txt
diff --git a/app-domain/checkstyle/checkstyle.xml b/app-domain/checkstyle/checkstyle.xml
diff --git a/app-domain/checkstyle/suppressions.xml b/app-domain/checkstyle/suppressions.xml
diff --git a/app-domain/pom.xml b/app-domain/pom.xml
diff --git a/app-domain/src/main/java/domain/Zoo.java b/app-domain/src/main/java/domain/Zoo.java
diff --git a/app-domain/src/main/java/domain/package-info.java b/app-domain/src/main/java/domain/package-info.java
diff --git a/cache-tests/pom.xml b/cache-tests/pom.xml
@@ -35,12 +35,6 @@
             <version>4.11</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>test-domain</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>javax.cache</groupId>
             <artifactId>cache-api</artifactId>
@@ -161,7 +155,6 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <java.net.preferIPv4Stack>${java.net.preferIPv4Stack}</java.net.preferIPv4Stack>
-                                <domainJar>${domain-lib-dir}/${domain-jar}</domainJar>
                                 <javax.cache.CacheManager>${CacheManagerImpl}</javax.cache.CacheManager>
                                 <javax.cache.Cache>${CacheImpl}</javax.cache.Cache>
                                 <javax.cache.Cache.Entry>${CacheEntryImpl}</javax.cache.Cache.Entry>

diff --git a/test-domain/src/main/java/domain/Beagle.java → cache-tests/src/main/java/domain/Beagle.java b/test-domain/src/main/java/domain/Beagle.java → cache-tests/src/main/java/domain/Beagle.java
diff --git a/test-domain/src/main/java/domain/Blog.java → cache-tests/src/main/java/domain/Blog.java b/test-domain/src/main/java/domain/Blog.java → cache-tests/src/main/java/domain/Blog.java
diff --git a/...in/src/main/java/domain/BorderCollie.java → ...ts/src/main/java/domain/BorderCollie.java b/...in/src/main/java/domain/BorderCollie.java → ...ts/src/main/java/domain/BorderCollie.java
diff --git a/...omain/src/main/java/domain/Chihuahua.java → ...tests/src/main/java/domain/Chihuahua.java b/...omain/src/main/java/domain/Chihuahua.java → ...tests/src/main/java/domain/Chihuahua.java
diff --git a/test-domain/src/main/java/domain/Collie.java → cache-tests/src/main/java/domain/Collie.java b/test-domain/src/main/java/domain/Collie.java → cache-tests/src/main/java/domain/Collie.java
diff --git a/...omain/src/main/java/domain/Dachshund.java → ...tests/src/main/java/domain/Dachshund.java b/...omain/src/main/java/domain/Dachshund.java → ...tests/src/main/java/domain/Dachshund.java
diff --git a/test-domain/src/main/java/domain/Dog.java → cache-tests/src/main/java/domain/Dog.java b/test-domain/src/main/java/domain/Dog.java → cache-tests/src/main/java/domain/Dog.java
diff --git a/test-domain/src/main/java/domain/Hound.java → cache-tests/src/main/java/domain/Hound.java b/test-domain/src/main/java/domain/Hound.java → cache-tests/src/main/java/domain/Hound.java
diff --git a/...main/src/main/java/domain/Identifier.java → ...ests/src/main/java/domain/Identifier.java b/...main/src/main/java/domain/Identifier.java → ...ests/src/main/java/domain/Identifier.java
diff --git a/...ain/src/main/java/domain/Identifier2.java → ...sts/src/main/java/domain/Identifier2.java b/...ain/src/main/java/domain/Identifier2.java → ...sts/src/main/java/domain/Identifier2.java
diff --git a/...domain/src/main/java/domain/Papillon.java → ...-tests/src/main/java/domain/Papillon.java b/...domain/src/main/java/domain/Papillon.java → ...-tests/src/main/java/domain/Papillon.java
diff --git a/...c/main/java/domain/RoughCoatedCollie.java → ...c/main/java/domain/RoughCoatedCollie.java b/...c/main/java/domain/RoughCoatedCollie.java → ...c/main/java/domain/RoughCoatedCollie.java
diff --git a/test-domain/src/main/java/domain/Sex.java → cache-tests/src/main/java/domain/Sex.java b/test-domain/src/main/java/domain/Sex.java → cache-tests/src/main/java/domain/Sex.java
diff --git a/...in/src/main/java/domain/package-info.java → ...ts/src/main/java/domain/package-info.java b/...in/src/main/java/domain/package-info.java → ...ts/src/main/java/domain/package-info.java
@@ -10,7 +10,7 @@
 
  It is meant to exercise generic aspects.
 
-
  @author Greg Luck
+ @author Yannis Cosmadopoulos
  */
 package domain;
diff --git a/.../javax/cache/annotation/BeanProvider.java → .../javax/cache/annotation/BeanProvider.java b/.../javax/cache/annotation/BeanProvider.java → .../javax/cache/annotation/BeanProvider.java
diff --git a/.../javax/cache/annotation/package-info.java → .../javax/cache/annotation/package-info.java b/.../javax/cache/annotation/package-info.java → .../javax/cache/annotation/package-info.java
diff --git a/...in/src/main/java/manager/BlogManager.java → ...ts/src/main/java/manager/BlogManager.java b/...in/src/main/java/manager/BlogManager.java → ...ts/src/main/java/manager/BlogManager.java
diff --git a/...CacheNameOnEachMethodBlogManagerImpl.java → ...CacheNameOnEachMethodBlogManagerImpl.java b/...CacheNameOnEachMethodBlogManagerImpl.java → ...CacheNameOnEachMethodBlogManagerImpl.java
diff --git a/...ClassLevelCacheConfigBlogManagerImpl.java → ...ClassLevelCacheConfigBlogManagerImpl.java b/...ClassLevelCacheConfigBlogManagerImpl.java → ...ClassLevelCacheConfigBlogManagerImpl.java
diff --git a/...UsingDefaultCacheNameBlogManagerImpl.java → ...UsingDefaultCacheNameBlogManagerImpl.java b/...UsingDefaultCacheNameBlogManagerImpl.java → ...UsingDefaultCacheNameBlogManagerImpl.java
diff --git a/...n/src/main/java/manager/package-info.java → ...s/src/main/java/manager/package-info.java b/...n/src/main/java/manager/package-info.java → ...s/src/main/java/manager/package-info.java
diff --git a/...ain/src/main/resources/META-INF/beans.xml → ...sts/src/main/resources/META-INF/beans.xml b/...ain/src/main/resources/META-INF/beans.xml → ...sts/src/main/resources/META-INF/beans.xml