diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java index 16287627..be07e62c 100644 --- a/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/CacheNamespaceTest.java @@ -59,7 +59,7 @@ public class CacheNamespaceTest extends RecreatingContextTest { assertTrue(ctx.containsBean("cache-with-xml")); CacheFactoryBean cfb = (CacheFactoryBean) ctx.getBean("&cache-with-xml"); Resource res = TestUtils.readField("cacheXml", cfb); - assertEquals("cache.xml", res.getFilename()); + assertEquals("gemfire-cache.xml", res.getFilename()); assertEquals(ctx.getBean("props"), TestUtils.readField("properties", cfb)); } diff --git a/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java index 015b67bd..245ff53d 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java @@ -48,7 +48,7 @@ public class CacheServerProcess { AttributesFactory factory = new AttributesFactory(); factory.setDataPolicy(DataPolicy.REPLICATE); factory.setScope(Scope.DISTRIBUTED_ACK); - Region testRegion = cache.createRegion("test", factory.create()); + Region testRegion = cache.createRegion("test-cq", factory.create()); System.out.println("Test region, " + testRegion.getFullPath() + ", created in cache."); // Start Cache Server. diff --git a/src/test/resources/gemfire-cache.xml b/src/test/resources/gemfire-cache.xml new file mode 100644 index 00000000..5c221040 --- /dev/null +++ b/src/test/resources/gemfire-cache.xml @@ -0,0 +1,39 @@ + + + + + java.lang.String + + + + + + + + + + + + + + + + + + Application Version + 1.0 + + + + + + + + + + + + + + + diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties new file mode 100644 index 00000000..1f7cee2f --- /dev/null +++ b/src/test/resources/log4j.properties @@ -0,0 +1,10 @@ +log4j.rootCategory=INFO, stdout + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n + +log4j.category.org.springframework.data.gemfire.listener=TRACE + +# for debugging datasource initialization +# log4j.category.test.jdbc=DEBUG diff --git a/src/test/resources/org/springframework/data/gemfire/basic-cache.xml b/src/test/resources/org/springframework/data/gemfire/basic-cache.xml index b25bd4f5..54ab4d52 100644 --- a/src/test/resources/org/springframework/data/gemfire/basic-cache.xml +++ b/src/test/resources/org/springframework/data/gemfire/basic-cache.xml @@ -33,7 +33,7 @@ - + diff --git a/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml index e80adb57..263d6e9f 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/cache-ns.xml @@ -16,7 +16,7 @@ - + false