You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/11/16 21:06:14 UTC
svn commit: r880939 [2/2] - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/a...
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java?rev=880939&r1=880938&r2=880939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java Mon Nov 16 20:06:12 2009
@@ -112,8 +112,6 @@
throw new CayenneRuntimeException("Error connecting to preference DB.", ex);
}
- configuration.didInitialize();
-
this.configuration = configuration;
this.dataContext = configuration.getDomain().createDataContext();
@@ -236,7 +234,8 @@
File target = new File(dbDirectory, targetBaseName + "." + ext);
if (fileToMove.exists()) {
fileToMove.renameTo(target);
- } else {
+ }
+ else {
target.delete();
}
}
@@ -262,7 +261,8 @@
File target = new File(dbDirectory, targetBaseName + "." + ext);
if (fileToCopy.exists()) {
Util.copy(fileToCopy, target);
- } else {
+ }
+ else {
target.delete();
}
}
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java?rev=880939&r1=880938&r2=880939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java Mon Nov 16 20:06:12 2009
@@ -22,10 +22,7 @@
import org.apache.cayenne.gen.ArtifactsGenerationMode;
import org.apache.cayenne.gen.ClassGenerationAction;
-import org.apache.cayenne.gen.ClassGenerationAction1_1;
-import org.apache.cayenne.gen.ClassGenerator;
import org.apache.cayenne.gen.ClientClassGenerationAction;
-import org.apache.cayenne.gen.DefaultClassGenerator;
import org.apache.cayenne.map.DataMap;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
@@ -60,11 +57,6 @@
protected String embeddablesupertemplate;
protected boolean usepkgpath;
- /**
- * @deprecated since 3.0
- */
- protected String version;
-
public CayenneGeneratorTask() {
this.makepairs = true;
this.mode = ArtifactsGenerationMode.ENTITY.getLabel();
@@ -83,9 +75,6 @@
action = new ClientClassGenerationAction();
action.setContext(getVppContext());
}
- else if (ClassGenerator.VERSION_1_1.equals(version)) {
- action = new ClassGenerationAction1_1();
- }
else {
action = new ClassGenerationAction();
action.setContext(getVppContext());
@@ -108,28 +97,6 @@
}
/**
- * @deprecated since 3.0. Use {@link #createGeneratorAction()}.
- */
- protected DefaultClassGenerator createGenerator() {
- DefaultClassGenerator gen = new DefaultClassGenerator();
-
- gen.setClient(client);
- gen.setDestDir(destDir);
- gen.setEncoding(encoding);
- gen.setMakePairs(makepairs);
- gen.setMode(mode);
- gen.setOutputPattern(outputPattern);
- gen.setOverwrite(overwrite);
- gen.setSuperPkg(superpkg);
- gen.setSuperTemplate(supertemplate);
- gen.setTemplate(template);
- gen.setUsePkgPath(usepkgpath);
- gen.setVersionString(version);
-
- return gen;
- }
-
- /**
* Executes the task. It will be called by ant framework.
*/
@Override
@@ -257,17 +224,8 @@
}
/**
- * Sets <code>version</code> property.
- *
- * @deprecated since 3.0
- */
- public void setVersion(String version) {
- this.version = version;
- }
-
- /**
- * Sets <code>encoding</code> property that allows to generate files using
- * non-default encoding.
+ * Sets <code>encoding</code> property that allows to generate files using non-default
+ * encoding.
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
@@ -310,8 +268,8 @@
}
/**
- * Provides a <code>VPPConfig</code> object to configure. (Written with
- * createConfig() instead of addConfig() to avoid run-time dependency on VPP).
+ * Provides a <code>VPPConfig</code> object to configure. (Written with createConfig()
+ * instead of addConfig() to avoid run-time dependency on VPP).
*/
public Object createConfig() {
this.vppConfig = new VPPConfig();
Modified: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java?rev=880939&r1=880938&r2=880939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/CayenneGeneratorTaskCrossMapRelationshipsTest.java Mon Nov 16 20:06:12 2009
@@ -47,69 +47,13 @@
task.setTaskName("Test");
task.setLocation(Location.UNKNOWN_LOCATION);
}
-
+
@Override
protected void tearDown() throws Exception {
super.tearDown();
task = null;
}
- /**
- * Test pairs generation with a cross-DataMap relationship (v1.1).
- *
- * @deprecated since 3.0 1.1 version is deprecated.
- */
- public void testCrossDataMapRelationships_v1_1() throws Exception {
-
- // prepare destination directory
-
- File destDir = new File(CayenneResources.getResources().getTestDir(), "cgen11");
- // prepare destination directory
- if (!destDir.exists()) {
- assertTrue(destDir.mkdirs());
- }
-
- File map = new File(destDir, "testmap-dependent.map.xml");
- CayenneResources.copyResourceToFile("testmap-dependent.map.xml", map);
-
- File additionalMaps[] = new File[1];
- additionalMaps[0] = new File(destDir, "testmap.map.xml");
- CayenneResources.copyResourceToFile("testmap.map.xml", additionalMaps[0]);
-
- FileList additionalMapsFilelist = new FileList();
- additionalMapsFilelist.setDir(additionalMaps[0].getParentFile());
- additionalMapsFilelist.setFiles(additionalMaps[0].getName());
-
- Path additionalMapsPath = new Path(task.getProject());
- additionalMapsPath.addFilelist(additionalMapsFilelist);
-
- // setup task
- task.setMap(map);
- task.setAdditionalMaps(additionalMapsPath);
- task.setVersion("1.1");
- task.setMakepairs(true);
- task.setOverwrite(false);
- task.setMode("entity");
- task.setIncludeEntities("MyArtGroup");
- task.setDestDir(destDir);
- task.setSuperpkg("org.apache.art2.auto");
- task.setUsepkgpath(true);
-
- // run task
- task.execute();
-
- // check results
- File a = new File(destDir, convertPath("org/apache/art2/MyArtGroup.java"));
- assertTrue(a.isFile());
- assertContents(a, "MyArtGroup", "org.apache.art2", "_MyArtGroup");
-
- File _a = new File(destDir, convertPath("org/apache/art2/auto/_MyArtGroup.java"));
- assertTrue(_a.exists());
- assertContents(_a, "_MyArtGroup", "org.apache.art2.auto", "CayenneDataObject");
- assertContents(_a, "org.apache.art.ArtGroup getToParentGroup()");
- assertContents(_a, "setToParentGroup(org.apache.art.ArtGroup toParentGroup)");
- }
-
/** Test pairs generation with a cross-DataMap relationship. */
public void testCrossDataMapRelationships() throws Exception {
// prepare destination directory
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java?rev=880939&r1=880938&r2=880939&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java Mon Nov 16 20:06:12 2009
@@ -22,8 +22,6 @@
import java.io.File;
import org.apache.cayenne.gen.ClassGenerationAction;
-import org.apache.cayenne.gen.ClassGenerationAction1_1;
-import org.apache.cayenne.gen.ClassGenerator;
import org.apache.cayenne.gen.ClientClassGenerationAction;
import org.apache.cayenne.map.DataMap;
import org.apache.commons.logging.Log;
@@ -70,8 +68,8 @@
/**
* 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}/java/generated-sources/cayenne"
*/
private File destDir;
@@ -138,8 +136,8 @@
private String outputPattern;
/**
- * If set to <code>true</code>, will overwrite older versions of
- * generated classes. Ignored unless makepairs is set to <code>false</code>.
+ * If set to <code>true</code>, will overwrite older versions of generated
+ * classes. Ignored unless makepairs is set to <code>false</code>.
*
* @parameter expression="${cgen.overwrite}" default-value="false"
*/
@@ -150,8 +148,8 @@
* <code>makepairs</code> set to <code>true</code>. If omitted, each
* superclass will be assigned the same package as subclass. Note that
* having superclass in a different package would only make sense when
- * <code>usepkgpath</code> is set to <code>true</code>. Otherwise
- * classes from different packages will end up in the same directory.
+ * <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}"
*/
@@ -192,33 +190,19 @@
private String embeddableTemplate;
/**
- * If set to <code>true</code> (default), a directory tree will be
- * generated in "destDir" corresponding to the class package structure, if
- * set to <code>false</code>, classes will be generated in
- * "destDir" ignoring their package.
+ * If set to <code>true</code> (default), a directory tree will be generated
+ * in "destDir" corresponding to the class package structure, if set to
+ * <code>false</code>, classes will be generated in "destDir"
+ * ignoring their package.
*
* @parameter expression="${cgen.usePkgPath}" default-value="true"
*/
private boolean usePkgPath;
- /**
- * Specifies template location and generator behavior. "1.1" is
- * the old behavior, with templates located in "dotemplates" and
- * "classgen" as the only velocity context attribute.
- * "1.2" is the new behavior, with templates located in
- * "dotemplates/v1.2" and "objEntity",
- * "entityUtils", "stringUtils", and
- * "importUtils" in the velocity context. (Default is
- * "1.2".)
- *
- * @parameter expression="${cgen.version}"
- * @deprecated since 3.0 as 1.1 mode is deprecated.
- */
- private String version;
-
public void execute() throws MojoExecutionException, MojoFailureException {
// Create the destination directory if necessary.
- // TODO: (KJM 11/2/06) The destDir really should be added as a compilation resource for maven.
+ // TODO: (KJM 11/2/06) The destDir really should be added as a
+ // compilation resource for maven.
if (!destDir.exists()) {
destDir.mkdirs();
}
@@ -281,8 +265,6 @@
ClassGenerationAction action;
if (client) {
action = new ClientClassGenerationAction();
- } else if (ClassGenerator.VERSION_1_1.equals(version)) {
- action = new ClassGenerationAction1_1();
} else {
action = new ClassGenerationAction();
}