Refactor Default Project
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cfbfb688 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cfbfb688 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cfbfb688 Branch: refs/heads/CAY-1946 Commit: cfbfb688702187d0cad7ba3ad61fbb7582137db6 Parents: 486065a Author: Savva Kolbechev <s.kolbac...@gmail.com> Authored: Fri Nov 14 12:33:04 2014 +0300 Committer: Savva Kolbechev <s.kolbac...@gmail.com> Committed: Fri Nov 14 12:33:04 2014 +0300 ---------------------------------------------------------------------- .../test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java | 2 +- .../src/test/java/org/apache/cayenne/GenericMappingIT.java | 2 +- .../src/test/java/org/apache/cayenne/access/EmbeddingIT.java | 2 +- .../java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java | 2 +- .../org/apache/cayenne/map/EntityResolverGenericStackIT.java | 2 +- .../java/org/apache/cayenne/unit/di/server/ServerCase.java | 4 +++- cayenne-server/src/test/resources/cayenne-default.xml | 6 ------ cayenne-server/src/test/resources/cayenne-embeddable.xml | 4 ++++ cayenne-server/src/test/resources/cayenne-generic.xml | 4 ++++ cayenne-server/src/test/resources/cayenne-qualified.xml | 4 ++++ 10 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java index 45962d0..74c65df 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java @@ -35,7 +35,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@UseServerRuntime(ServerCase.DEFAULT_PROJECT) +@UseServerRuntime(ServerCase.QUALIFIED_PROJECT) public class CDOQualifiedEntitiesIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java index 95381ce..1b111bc 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.DEFAULT_PROJECT) +@UseServerRuntime(ServerCase.GENERIC_PROJECT) public class GenericMappingIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java index 4b9422d..1dfbf5d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java @@ -38,7 +38,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@UseServerRuntime(ServerCase.DEFAULT_PROJECT) +@UseServerRuntime(ServerCase.EMBEDDABLE_PROJECT) public class EmbeddingIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java index 8719e86..8b0de03 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@UseServerRuntime("cayenne-default.xml") +@UseServerRuntime("cayenne-qualified.xml") public class ConcurrentPkGeneratorIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java index 155b9fe..6764c1d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverGenericStackIT.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -@UseServerRuntime(ServerCase.DEFAULT_PROJECT) +@UseServerRuntime(ServerCase.GENERIC_PROJECT) public class EntityResolverGenericStackIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java index 463c006..7ca8a79 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCase.java @@ -64,7 +64,9 @@ public class ServerCase extends DICase { public static final String UUID_PROJECT = "cayenne-uuid.xml"; public static final String COMPOUND_PROJECT = "cayenne-compound.xml"; public static final String TESTMAP_PROJECT = "cayenne-testmap.xml"; - public static final String DEFAULT_PROJECT = "cayenne-default.xml"; + public static final String EMBEDDABLE_PROJECT = "cayenne-embeddable.xml"; + public static final String GENERIC_PROJECT = "cayenne-generic.xml"; + public static final String QUALIFIED_PROJECT = "cayenne-qualified.xml"; public static final String MULTINODE_PROJECT = "cayenne-multinode.xml"; public static final String ONEWAY_PROJECT = "cayenne-oneway-rels.xml"; public static final String MULTI_TIER_PROJECT = "cayenne-multi-tier.xml"; http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/resources/cayenne-default.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-default.xml b/cayenne-server/src/test/resources/cayenne-default.xml deleted file mode 100644 index a248a10..0000000 --- a/cayenne-server/src/test/resources/cayenne-default.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> - <map name="embeddable"/> - <map name="generic"/> - <map name="qualified"/> -</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/resources/cayenne-embeddable.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-embeddable.xml b/cayenne-server/src/test/resources/cayenne-embeddable.xml new file mode 100644 index 0000000..9ffb2e3 --- /dev/null +++ b/cayenne-server/src/test/resources/cayenne-embeddable.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<domain project-version="7"> + <map name="embeddable"/> +</domain> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/resources/cayenne-generic.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-generic.xml b/cayenne-server/src/test/resources/cayenne-generic.xml new file mode 100644 index 0000000..0cacadc --- /dev/null +++ b/cayenne-server/src/test/resources/cayenne-generic.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<domain project-version="7"> + <map name="generic"/> +</domain> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/cfbfb688/cayenne-server/src/test/resources/cayenne-qualified.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-qualified.xml b/cayenne-server/src/test/resources/cayenne-qualified.xml new file mode 100644 index 0000000..812b244 --- /dev/null +++ b/cayenne-server/src/test/resources/cayenne-qualified.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<domain project-version="7"> + <map name="qualified"/> +</domain>
