svn commit: r1578257 - in /cayenne/main/trunk: cayenne-tools/src/main/java/org/apache/cayenne/gen/ cayenne-tools/src/test/java/org/apache/cayenne/tools/ plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/

[aa...@apache.org]

Author: aadamchik
Date: Mon Mar 17 07:35:27 2014
New Revision: 1578257

URL: http://svn.apache.org/r1578257
Log:
CAY-1870 cgen - smarter default for 'superPkg' and 'destDir',

patch by Oleg Artyukevich

Modified:
    cayenne/main/trunk/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
    cayenne/main/trunk/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java

Modified: cayenne/main/trunk/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java?rev=1578257&r1=1578256&r2=1578257&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java (original)
+++ cayenne/main/trunk/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java Mon Mar 17 07:35:27 2014
@@ -172,7 +172,7 @@ public class ClassGenerationAction {
 
         String superPackageName = this.superPkg;
         if (superPackageName == null) {
-            superPackageName = packageName;
+            superPackageName = packageName + ".auto";
         }
 
         context.put(Artifact.BASE_CLASS_KEY, baseClassName);

Modified: cayenne/main/trunk/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java?rev=1578257&r1=1578256&r2=1578257&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java (original)
+++ cayenne/main/trunk/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskTest.java Mon Mar 17 07:35:27 2014
@@ -167,7 +167,7 @@ public class CayenneGeneratorTaskTest ex
         assertFalse(pkga.exists());
     }
 
-    /** Test pairs generation including full package path. */
+    /** Test pairs generation including full package path, default superclass package. */
     public void testPairs1() throws Exception {
         // prepare destination directory
         File mapDir = new File(baseDir, "pairs-tree");
@@ -191,7 +191,7 @@ public class CayenneGeneratorTaskTest ex
 
         File _a = new File(
                 mapDir,
-                convertPath("org/apache/cayenne/testdo/testmap/_Artist.java"));
+                convertPath("org/apache/cayenne/testdo/testmap/auto/_Artist.java"));
         assertTrue(_a.exists());
         assertContents(
                 _a,

Modified: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java?rev=1578257&r1=1578256&r2=1578257&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java (original)
+++ cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Mon Mar 17 07:35:27 2014
@@ -58,8 +58,7 @@ public class CayenneGeneratorMojo extend
 	/**
 	 * Destination directory for Java classes (ignoring their package names).
 	 * 
-	 * @parameter expression="${cgen.destDir}" default-value=
-	 *            "${project.build.sourceDirectory}/java/generated-sources/cayenne"
+	 * @parameter expression="${cgen.destDir}" default-value="${project.build.sourceDirectory}"
 	 */
 	private File destDir;
 
@@ -141,7 +140,7 @@ public class CayenneGeneratorMojo extend
 	 * <code>usepkgpath</code> is set to <code>true</code>. Otherwise classes
 	 * from different packages will end up in the same directory.
 	 * 
-	 * @parameter expression="${cgen.superPkg}"
+	 * @parameter expression="${cgen.superPkg}" 
 	 */
 	private String superPkg;