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 2012/11/09 16:33:52 UTC
svn commit: r1407495 -
/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
Author: aadamchik
Date: Fri Nov 9 15:33:51 2012
New Revision: 1407495
URL: http://svn.apache.org/viewvc?rev=1407495&view=rev
Log:
CAY-1762 cdbimport improvements: Support for "defaultPackage" parameter, as the new DataMaps ends up placing entities in the root package
also for Ant task
Modified:
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java?rev=1407495&r1=1407494&r2=1407495&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java Fri Nov 9 15:33:51 2012
@@ -50,6 +50,15 @@ public class DbImporterTask extends Caye
private String schema;
+ /**
+ * A default package for ObjEntity Java classes. If not specified, and the
+ * existing DataMap already has the default package, the existing package
+ * will be used.
+ *
+ * @since 3.2
+ */
+ private String defaultPackage;
+
private String catalog;
private String tablePattern;
private boolean importProcedures = false;
@@ -97,6 +106,12 @@ public class DbImporterTask extends Caye
DataMap dataMap = map.exists() ? loadDataMap() : new DataMap();
+ // do not override default package of existsing DataMap unless it is
+ // explicitly requested by the plugin caller
+ if (defaultPackage != null && defaultPackage.length() > 0) {
+ dataMap.setDefaultPackage(defaultPackage);
+ }
+
String[] types = loader.getDefaultTableTypes();
loader.load(dataMap, catalog, schema, tablePattern, types);
@@ -175,6 +190,10 @@ public class DbImporterTask extends Caye
this.schema = schema;
}
+ public void setDefaultPackage(String defaultPackage) {
+ this.defaultPackage = defaultPackage;
+ }
+
public void setTablePattern(String tablePattern) {
this.tablePattern = tablePattern;
}