From 5f6e7abb8c7376948ccf5d33feaaff4f94facb9c Mon Sep 17 00:00:00 2001 From: Vassilis Bekiaris Date: Thu, 11 May 2017 18:05:59 +0300 Subject: [PATCH 1/3] Remove app-domain module --- app-domain/.gitignore | 4 - app-domain/checkstyle/ClassHeader.txt | 6 - app-domain/checkstyle/checkstyle.xml | 259 ------------------ app-domain/checkstyle/suppressions.xml | 16 -- app-domain/pom.xml | 32 --- cache-tests/pom.xml | 1 - .../src/main/java/domain/Zoo.java | 0 .../src/main/java/domain/package-info.java | 0 .../spi/CachingProviderClassLoaderTest.java | 65 ----- .../cdi-annotations-tester/pom.xml | 21 -- .../guice-annotations-tester/pom.xml | 21 -- .../specific-implementation-tester/pom.xml | 23 -- .../spring-annotations-tester/pom.xml | 21 -- pom.xml | 5 - 14 files changed, 474 deletions(-) delete mode 100644 app-domain/.gitignore delete mode 100644 app-domain/checkstyle/ClassHeader.txt delete mode 100644 app-domain/checkstyle/checkstyle.xml delete mode 100644 app-domain/checkstyle/suppressions.xml delete mode 100644 app-domain/pom.xml rename {app-domain => cache-tests}/src/main/java/domain/Zoo.java (100%) rename {app-domain => cache-tests}/src/main/java/domain/package-info.java (100%) diff --git a/app-domain/.gitignore b/app-domain/.gitignore deleted file mode 100644 index 724b03a..0000000 --- a/app-domain/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.checkstyle -/.classpath -/.project -/.settings/ \ No newline at end of file diff --git a/app-domain/checkstyle/ClassHeader.txt b/app-domain/checkstyle/ClassHeader.txt deleted file mode 100644 index 391a814..0000000 --- a/app-domain/checkstyle/ClassHeader.txt +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) 2011-2016 Terracotta, Inc. - * Copyright (c) 2011-2016 Oracle and/or its affiliates. - * - * All rights reserved. Use is subject to license terms. - */ diff --git a/app-domain/checkstyle/checkstyle.xml b/app-domain/checkstyle/checkstyle.xml deleted file mode 100644 index a0ab27b..0000000 --- a/app-domain/checkstyle/checkstyle.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-domain/checkstyle/suppressions.xml b/app-domain/checkstyle/suppressions.xml deleted file mode 100644 index e066a93..0000000 --- a/app-domain/checkstyle/suppressions.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app-domain/pom.xml b/app-domain/pom.xml deleted file mode 100644 index 83a7403..0000000 --- a/app-domain/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - - - javax.cache - tck-parent - 1.1.0-SNAPSHOT - - - javax.cache - app-domain - - jar - - App Domain - https://github.com/jsr107/jsr107tck - This is a simple domain used for testing javax.cache. It is in its - own module so that classloading - nuances can be tested. - - The app domain is not loaded by maven into the test system classpath. - - - - - UTF-8 - UTF-8 - - - diff --git a/cache-tests/pom.xml b/cache-tests/pom.xml index 3f089c0..bc9e4a3 100644 --- a/cache-tests/pom.xml +++ b/cache-tests/pom.xml @@ -161,7 +161,6 @@ ${java.net.preferIPv4Stack} - ${domain-lib-dir}/${domain-jar} ${CacheManagerImpl} ${CacheImpl} ${CacheEntryImpl} diff --git a/app-domain/src/main/java/domain/Zoo.java b/cache-tests/src/main/java/domain/Zoo.java similarity index 100% rename from app-domain/src/main/java/domain/Zoo.java rename to cache-tests/src/main/java/domain/Zoo.java diff --git a/app-domain/src/main/java/domain/package-info.java b/cache-tests/src/main/java/domain/package-info.java similarity index 100% rename from app-domain/src/main/java/domain/package-info.java rename to cache-tests/src/main/java/domain/package-info.java diff --git a/cache-tests/src/test/java/org/jsr107/tck/spi/CachingProviderClassLoaderTest.java b/cache-tests/src/test/java/org/jsr107/tck/spi/CachingProviderClassLoaderTest.java index 54ca59e..d15a26d 100644 --- a/cache-tests/src/test/java/org/jsr107/tck/spi/CachingProviderClassLoaderTest.java +++ b/cache-tests/src/test/java/org/jsr107/tck/spi/CachingProviderClassLoaderTest.java @@ -216,71 +216,6 @@ public void closeClassLoader() throws Exception { assertSame(manager3, provider.getCacheManager(uri, loader3)); } - /** - * Wrapper round domain program. - */ - private static class ApplicationDomain { - private static String TEST_CLASS_NAME = "domain.Zoo"; - /** - * this should be set by maven to point at the domain jar - */ - private static final String DOMAINJAR = "domainJar"; - private final ClassLoader classLoader; - private final Cache cache; - - public ApplicationDomain() throws MalformedURLException { - this.classLoader = createClassLoader(); - cache = createCache(); - } - - private ClassLoader createClassLoader() throws MalformedURLException { - - String domainJarFileName; - - if (System.getProperties().containsKey(DOMAINJAR)) { - domainJarFileName = System.getProperty(DOMAINJAR); - } else { - Class clazz = CachingProviderClassLoaderTest.class; - final String clazzURI = clazz.getName().replace('.', File.separatorChar) + ".class"; - final URL clazzURL = clazz.getClassLoader().getResource(clazzURI); - final String clazzPath = clazzURL.getPath(); - - final File root = new File(clazzPath.substring(0, clazzPath.length() - clazzURI.length())); - - domainJarFileName = new File(root.getParentFile().getParentFile().getParentFile(), - "implementation-tester" + File.separatorChar + - "specific-implementation-tester" + File.separatorChar + - "target" + File.separatorChar + - "domainlib" + File.separatorChar + - "domain.jar").toString(); - } - - File file = new File(domainJarFileName); - if (!file.exists()) { - throw new IllegalArgumentException("can't find domain jar: " + domainJarFileName); - } - - URL urls[] = new URL[]{file.toURI().toURL()}; - ClassLoader parent = Thread.currentThread().getContextClassLoader(); - return new URLClassLoader(urls, parent); - } - - private Cache createCache() { - CachingProvider provider = Caching.getCachingProvider(classLoader); - - provider.getCacheManager(provider.getDefaultURI(), classLoader).createCache("c1", new MutableConfiguration()); - return provider.getCacheManager(provider.getDefaultURI(), classLoader).getCache("c1"); - } - - public Class getClassForDomainClass() throws ClassNotFoundException { - return Class.forName(TEST_CLASS_NAME, false, classLoader); - } - - public Cache getCache() { - return cache; - } - } - private static class MyClassLoader extends ClassLoader { public MyClassLoader(ClassLoader parent) { super(parent); diff --git a/implementation-tester/cdi-annotations-tester/pom.xml b/implementation-tester/cdi-annotations-tester/pom.xml index 2e410f2..6452bb3 100644 --- a/implementation-tester/cdi-annotations-tester/pom.xml +++ b/implementation-tester/cdi-annotations-tester/pom.xml @@ -94,24 +94,6 @@ test - - copy-domain - - copy - - - - - javax.cache - app-domain - ${project.parent.version} - ${domain-lib-dir} - - ${domain-jar} - - - - @@ -126,9 +108,6 @@ maven-surefire-plugin 2.9 - - ${domain-lib-dir}/${domain-jar} - **/annotation//*Test.java diff --git a/implementation-tester/guice-annotations-tester/pom.xml b/implementation-tester/guice-annotations-tester/pom.xml index 242b411..2ca6eca 100644 --- a/implementation-tester/guice-annotations-tester/pom.xml +++ b/implementation-tester/guice-annotations-tester/pom.xml @@ -103,24 +103,6 @@ test - - copy-domain - - copy - - - - - javax.cache - app-domain - ${project.parent.version} - ${domain-lib-dir} - - ${domain-jar} - - - - @@ -135,9 +117,6 @@ maven-surefire-plugin 2.9 - - ${domain-lib-dir}/${domain-jar} - **/annotation//*Test.java diff --git a/implementation-tester/specific-implementation-tester/pom.xml b/implementation-tester/specific-implementation-tester/pom.xml index 38a52ee..29b5e67 100644 --- a/implementation-tester/specific-implementation-tester/pom.xml +++ b/implementation-tester/specific-implementation-tester/pom.xml @@ -84,24 +84,6 @@ test - - copy-domain - - copy - - - - - javax.cache - app-domain - ${project.parent.version} - ${domain-lib-dir} - - ${domain-jar} - - - - @@ -118,7 +100,6 @@ ${java.net.preferIPv4Stack} - ${domain-lib-dir}/${domain-jar} ${javax.management.builder.initial} ${org.jsr107.tck.management.agentId} ${CacheManagerImpl} @@ -152,10 +133,6 @@ **/interceptor/*Test.java - - ${domain-lib-dir}/${domain-jar} - - diff --git a/implementation-tester/spring-annotations-tester/pom.xml b/implementation-tester/spring-annotations-tester/pom.xml index fdcab7b..269e14a 100644 --- a/implementation-tester/spring-annotations-tester/pom.xml +++ b/implementation-tester/spring-annotations-tester/pom.xml @@ -94,24 +94,6 @@ test - - copy-domain - - copy - - - - - javax.cache - app-domain - ${project.parent.version} - ${domain-lib-dir} - - ${domain-jar} - - - - @@ -126,9 +108,6 @@ maven-surefire-plugin 2.9 - - ${domain-lib-dir}/${domain-jar} - **/annotation//*Test.java diff --git a/pom.xml b/pom.xml index a90cc79..5d49de7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ - app-domain test-domain cache-tests implementation-tester @@ -36,10 +35,6 @@ javax.cache.annotation.impl.cdi.CdiCacheKeyInvocationContextImpl - - ${project.build.directory}/domainlib - domain.jar - From e71765928b45ed3ad47bbd4f3ddf38cbfb19324f Mon Sep 17 00:00:00 2001 From: Vassilis Bekiaris Date: Fri, 12 May 2017 09:33:53 +0300 Subject: [PATCH 2/3] Removes test-domain module Moves beans from test-domain to cache-tests Test harnesses that depended on test-domain now depend on cache-tests --- cache-tests/pom.xml | 6 - .../src/main/java/domain/Beagle.java | 0 .../src/main/java/domain/Blog.java | 0 .../src/main/java/domain/BorderCollie.java | 0 .../src/main/java/domain/Chihuahua.java | 0 .../src/main/java/domain/Collie.java | 0 .../src/main/java/domain/Dachshund.java | 0 .../src/main/java/domain/Dog.java | 0 .../src/main/java/domain/Hound.java | 0 .../src/main/java/domain/Identifier.java | 0 .../src/main/java/domain/Identifier2.java | 0 .../src/main/java/domain/Papillon.java | 0 .../main/java/domain/RoughCoatedCollie.java | 0 .../src/main/java/domain/Sex.java | 0 .../src/main/java/domain/package-info.java | 5 +- .../javax/cache/annotation/BeanProvider.java | 0 .../javax/cache/annotation/package-info.java | 0 .../src/main/java/manager/BlogManager.java | 0 .../CacheNameOnEachMethodBlogManagerImpl.java | 0 .../ClassLevelCacheConfigBlogManagerImpl.java | 0 .../UsingDefaultCacheNameBlogManagerImpl.java | 0 .../src/main/java/manager/package-info.java | 0 .../src/main/resources/META-INF/beans.xml | 0 cdi-weld-annotations-test-harness/pom.xml | 2 +- guice-annotations-test-harness/pom.xml | 2 +- pom.xml | 1 - spring-annotations-test-harness/pom.xml | 2 +- test-domain/.gitignore | 4 - test-domain/checkstyle/ClassHeader.txt | 6 - test-domain/checkstyle/checkstyle.xml | 259 ------------------ test-domain/checkstyle/suppressions.xml | 16 -- test-domain/pom.xml | 37 --- .../src/main/java/domain/package-info.java | 16 -- 33 files changed, 7 insertions(+), 349 deletions(-) rename {test-domain => cache-tests}/src/main/java/domain/Beagle.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Blog.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/BorderCollie.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Chihuahua.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Collie.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Dachshund.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Dog.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Hound.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Identifier.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Identifier2.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Papillon.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/RoughCoatedCollie.java (100%) rename {test-domain => cache-tests}/src/main/java/domain/Sex.java (100%) rename {test-domain => cache-tests}/src/main/java/javax/cache/annotation/BeanProvider.java (100%) rename {test-domain => cache-tests}/src/main/java/javax/cache/annotation/package-info.java (100%) rename {test-domain => cache-tests}/src/main/java/manager/BlogManager.java (100%) rename {test-domain => cache-tests}/src/main/java/manager/CacheNameOnEachMethodBlogManagerImpl.java (100%) rename {test-domain => cache-tests}/src/main/java/manager/ClassLevelCacheConfigBlogManagerImpl.java (100%) rename {test-domain => cache-tests}/src/main/java/manager/UsingDefaultCacheNameBlogManagerImpl.java (100%) rename {test-domain => cache-tests}/src/main/java/manager/package-info.java (100%) rename {test-domain => cache-tests}/src/main/resources/META-INF/beans.xml (100%) delete mode 100644 test-domain/.gitignore delete mode 100644 test-domain/checkstyle/ClassHeader.txt delete mode 100644 test-domain/checkstyle/checkstyle.xml delete mode 100644 test-domain/checkstyle/suppressions.xml delete mode 100644 test-domain/pom.xml delete mode 100644 test-domain/src/main/java/domain/package-info.java diff --git a/cache-tests/pom.xml b/cache-tests/pom.xml index bc9e4a3..16d5b73 100644 --- a/cache-tests/pom.xml +++ b/cache-tests/pom.xml @@ -35,12 +35,6 @@ 4.11 - - javax.cache - test-domain - 1.1.0-SNAPSHOT - - javax.cache cache-api diff --git a/test-domain/src/main/java/domain/Beagle.java b/cache-tests/src/main/java/domain/Beagle.java similarity index 100% rename from test-domain/src/main/java/domain/Beagle.java rename to cache-tests/src/main/java/domain/Beagle.java diff --git a/test-domain/src/main/java/domain/Blog.java b/cache-tests/src/main/java/domain/Blog.java similarity index 100% rename from test-domain/src/main/java/domain/Blog.java rename to cache-tests/src/main/java/domain/Blog.java diff --git a/test-domain/src/main/java/domain/BorderCollie.java b/cache-tests/src/main/java/domain/BorderCollie.java similarity index 100% rename from test-domain/src/main/java/domain/BorderCollie.java rename to cache-tests/src/main/java/domain/BorderCollie.java diff --git a/test-domain/src/main/java/domain/Chihuahua.java b/cache-tests/src/main/java/domain/Chihuahua.java similarity index 100% rename from test-domain/src/main/java/domain/Chihuahua.java rename to cache-tests/src/main/java/domain/Chihuahua.java diff --git a/test-domain/src/main/java/domain/Collie.java b/cache-tests/src/main/java/domain/Collie.java similarity index 100% rename from test-domain/src/main/java/domain/Collie.java rename to cache-tests/src/main/java/domain/Collie.java diff --git a/test-domain/src/main/java/domain/Dachshund.java b/cache-tests/src/main/java/domain/Dachshund.java similarity index 100% rename from test-domain/src/main/java/domain/Dachshund.java rename to cache-tests/src/main/java/domain/Dachshund.java diff --git a/test-domain/src/main/java/domain/Dog.java b/cache-tests/src/main/java/domain/Dog.java similarity index 100% rename from test-domain/src/main/java/domain/Dog.java rename to cache-tests/src/main/java/domain/Dog.java diff --git a/test-domain/src/main/java/domain/Hound.java b/cache-tests/src/main/java/domain/Hound.java similarity index 100% rename from test-domain/src/main/java/domain/Hound.java rename to cache-tests/src/main/java/domain/Hound.java diff --git a/test-domain/src/main/java/domain/Identifier.java b/cache-tests/src/main/java/domain/Identifier.java similarity index 100% rename from test-domain/src/main/java/domain/Identifier.java rename to cache-tests/src/main/java/domain/Identifier.java diff --git a/test-domain/src/main/java/domain/Identifier2.java b/cache-tests/src/main/java/domain/Identifier2.java similarity index 100% rename from test-domain/src/main/java/domain/Identifier2.java rename to cache-tests/src/main/java/domain/Identifier2.java diff --git a/test-domain/src/main/java/domain/Papillon.java b/cache-tests/src/main/java/domain/Papillon.java similarity index 100% rename from test-domain/src/main/java/domain/Papillon.java rename to cache-tests/src/main/java/domain/Papillon.java diff --git a/test-domain/src/main/java/domain/RoughCoatedCollie.java b/cache-tests/src/main/java/domain/RoughCoatedCollie.java similarity index 100% rename from test-domain/src/main/java/domain/RoughCoatedCollie.java rename to cache-tests/src/main/java/domain/RoughCoatedCollie.java diff --git a/test-domain/src/main/java/domain/Sex.java b/cache-tests/src/main/java/domain/Sex.java similarity index 100% rename from test-domain/src/main/java/domain/Sex.java rename to cache-tests/src/main/java/domain/Sex.java diff --git a/cache-tests/src/main/java/domain/package-info.java b/cache-tests/src/main/java/domain/package-info.java index 9298a37..511ef91 100644 --- a/cache-tests/src/main/java/domain/package-info.java +++ b/cache-tests/src/main/java/domain/package-info.java @@ -6,8 +6,11 @@ */ /** - This package results in a jar used for testing class loader issues + This package contains a class hierarchy used for testing JSR107. + It is meant to exercise generic aspects. + + @author Greg Luck @author Yannis Cosmadopoulos */ package domain; diff --git a/test-domain/src/main/java/javax/cache/annotation/BeanProvider.java b/cache-tests/src/main/java/javax/cache/annotation/BeanProvider.java similarity index 100% rename from test-domain/src/main/java/javax/cache/annotation/BeanProvider.java rename to cache-tests/src/main/java/javax/cache/annotation/BeanProvider.java diff --git a/test-domain/src/main/java/javax/cache/annotation/package-info.java b/cache-tests/src/main/java/javax/cache/annotation/package-info.java similarity index 100% rename from test-domain/src/main/java/javax/cache/annotation/package-info.java rename to cache-tests/src/main/java/javax/cache/annotation/package-info.java diff --git a/test-domain/src/main/java/manager/BlogManager.java b/cache-tests/src/main/java/manager/BlogManager.java similarity index 100% rename from test-domain/src/main/java/manager/BlogManager.java rename to cache-tests/src/main/java/manager/BlogManager.java diff --git a/test-domain/src/main/java/manager/CacheNameOnEachMethodBlogManagerImpl.java b/cache-tests/src/main/java/manager/CacheNameOnEachMethodBlogManagerImpl.java similarity index 100% rename from test-domain/src/main/java/manager/CacheNameOnEachMethodBlogManagerImpl.java rename to cache-tests/src/main/java/manager/CacheNameOnEachMethodBlogManagerImpl.java diff --git a/test-domain/src/main/java/manager/ClassLevelCacheConfigBlogManagerImpl.java b/cache-tests/src/main/java/manager/ClassLevelCacheConfigBlogManagerImpl.java similarity index 100% rename from test-domain/src/main/java/manager/ClassLevelCacheConfigBlogManagerImpl.java rename to cache-tests/src/main/java/manager/ClassLevelCacheConfigBlogManagerImpl.java diff --git a/test-domain/src/main/java/manager/UsingDefaultCacheNameBlogManagerImpl.java b/cache-tests/src/main/java/manager/UsingDefaultCacheNameBlogManagerImpl.java similarity index 100% rename from test-domain/src/main/java/manager/UsingDefaultCacheNameBlogManagerImpl.java rename to cache-tests/src/main/java/manager/UsingDefaultCacheNameBlogManagerImpl.java diff --git a/test-domain/src/main/java/manager/package-info.java b/cache-tests/src/main/java/manager/package-info.java similarity index 100% rename from test-domain/src/main/java/manager/package-info.java rename to cache-tests/src/main/java/manager/package-info.java diff --git a/test-domain/src/main/resources/META-INF/beans.xml b/cache-tests/src/main/resources/META-INF/beans.xml similarity index 100% rename from test-domain/src/main/resources/META-INF/beans.xml rename to cache-tests/src/main/resources/META-INF/beans.xml diff --git a/cdi-weld-annotations-test-harness/pom.xml b/cdi-weld-annotations-test-harness/pom.xml index 0fd0cd9..ec5da3b 100644 --- a/cdi-weld-annotations-test-harness/pom.xml +++ b/cdi-weld-annotations-test-harness/pom.xml @@ -27,7 +27,7 @@ javax.cache - test-domain + cache-tests ${project.parent.version} diff --git a/guice-annotations-test-harness/pom.xml b/guice-annotations-test-harness/pom.xml index 3909e18..553ac74 100644 --- a/guice-annotations-test-harness/pom.xml +++ b/guice-annotations-test-harness/pom.xml @@ -26,7 +26,7 @@ javax.cache - test-domain + cache-tests ${project.parent.version} diff --git a/pom.xml b/pom.xml index 5d49de7..772309e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ - test-domain cache-tests implementation-tester spring-annotations-test-harness diff --git a/spring-annotations-test-harness/pom.xml b/spring-annotations-test-harness/pom.xml index e87fe5d..8d77d68 100644 --- a/spring-annotations-test-harness/pom.xml +++ b/spring-annotations-test-harness/pom.xml @@ -26,7 +26,7 @@ javax.cache - test-domain + cache-tests ${project.parent.version} diff --git a/test-domain/.gitignore b/test-domain/.gitignore deleted file mode 100644 index 5c0bb59..0000000 --- a/test-domain/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/.settings -/.project -/.classpath -/.checkstyle \ No newline at end of file diff --git a/test-domain/checkstyle/ClassHeader.txt b/test-domain/checkstyle/ClassHeader.txt deleted file mode 100644 index 391a814..0000000 --- a/test-domain/checkstyle/ClassHeader.txt +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) 2011-2016 Terracotta, Inc. - * Copyright (c) 2011-2016 Oracle and/or its affiliates. - * - * All rights reserved. Use is subject to license terms. - */ diff --git a/test-domain/checkstyle/checkstyle.xml b/test-domain/checkstyle/checkstyle.xml deleted file mode 100644 index a0ab27b..0000000 --- a/test-domain/checkstyle/checkstyle.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test-domain/checkstyle/suppressions.xml b/test-domain/checkstyle/suppressions.xml deleted file mode 100644 index e066a93..0000000 --- a/test-domain/checkstyle/suppressions.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/test-domain/pom.xml b/test-domain/pom.xml deleted file mode 100644 index 9d2ce63..0000000 --- a/test-domain/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - - javax.cache - tck-parent - 1.1.0-SNAPSHOT - - - javax.cache - test-domain - - jar - - Test Domain - https://github.com/jsr107/jsr107tck - This is a simple domain used for testing javax.cache. It is in its - own module so that classloading - nuances can be tested. - - - - UTF-8 - UTF-8 - - - - - javax.cache - cache-api - ${jcache.version} - - - - diff --git a/test-domain/src/main/java/domain/package-info.java b/test-domain/src/main/java/domain/package-info.java deleted file mode 100644 index 158f9be..0000000 --- a/test-domain/src/main/java/domain/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Copyright (c) 2011-2016 Terracotta, Inc. - * Copyright (c) 2011-2016 Oracle and/or its affiliates. - * - * All rights reserved. Use is subject to license terms. - */ - -/** - This package contains a class hierarchy used for testing JSR107. - - It is meant to exercise generic aspects. - - - @author Greg Luck - */ -package domain; From 3ea933c81bd9fc04413cf4e2387cd51e352d4c2e Mon Sep 17 00:00:00 2001 From: Vassilis Bekiaris Date: Fri, 12 May 2017 09:43:59 +0300 Subject: [PATCH 3/3] Removes unused class --- cache-tests/src/main/java/domain/Zoo.java | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 cache-tests/src/main/java/domain/Zoo.java diff --git a/cache-tests/src/main/java/domain/Zoo.java b/cache-tests/src/main/java/domain/Zoo.java deleted file mode 100644 index bd0cb61..0000000 --- a/cache-tests/src/main/java/domain/Zoo.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Copyright (c) 2011-2016 Terracotta, Inc. - * Copyright (c) 2011-2016 Oracle and/or its affiliates. - * - * All rights reserved. Use is subject to license terms. - */ - -package domain; - -import java.io.Serializable; - -/** - * A Zoo. - * - * @author Yannis Cosmadopoulos - */ -public class Zoo implements Serializable { -}