You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2009/04/10 21:48:46 UTC
svn commit: r764016 -
/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
Author: kmenard
Date: Fri Apr 10 19:48:45 2009
New Revision: 764016
URL: http://svn.apache.org/viewvc?rev=764016&view=rev
Log:
Actually write out the datamap.
Modified:
cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java?rev=764016&r1=764015&r2=764016&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java Fri Apr 10 19:48:45 2009
@@ -18,6 +18,7 @@
import org.xml.sax.InputSource;
import java.io.File;
+import java.io.PrintWriter;
import java.sql.Driver;
/**
@@ -86,11 +87,13 @@
* @parameter expression="${cdbimport.password}"
*/
private String password;
-
+
+
+ private Log logger;
public void execute() throws MojoExecutionException, MojoFailureException {
- Log logger = new MavenLogger(this);
+ logger = new MavenLogger(this);
logger.info(String.format("connection settings - [driver: %s, url: %s, username: %s]", driver, url, username));
@@ -109,7 +112,12 @@
final DbLoader loader = new DbLoader(dataSource.getConnection(), adapterInst, new LoaderDelegate());
loader.loadDataMapFromDB(schemaName, tablePattern, dataMap);
- logger.info(String.format("New datamap:\n%s", dataMap.toString()));
+ File f = new File(map.getAbsolutePath());
+ f.delete();
+ PrintWriter pw = new PrintWriter(f);
+ dataMap.encodeAsXML(pw);
+ pw.flush();
+ pw.close();
} catch (Exception ex) {
Throwable th = Util.unwindException(ex);
@@ -127,23 +135,27 @@
final class LoaderDelegate implements DbLoaderDelegate {
public boolean overwriteDbEntity(DbEntity ent) throws CayenneException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return true;
}
public void dbEntityAdded(DbEntity ent) {
- //To change body of implemented methods use File | Settings | File Templates.
+ logger.info("Added DB entity: " + ent.getName());
+ ent.getDataMap().addDbEntity(ent);
}
public void dbEntityRemoved(DbEntity ent) {
- //To change body of implemented methods use File | Settings | File Templates.
+ logger.info("Removed DB entity: " + ent.getName());
+ ent.getDataMap().removeDbEntity(ent.getName());
}
public void objEntityAdded(ObjEntity ent) {
- //To change body of implemented methods use File | Settings | File Templates.
+ logger.info("Added obj entity: " + ent.getName());
+ ent.getDataMap().addObjEntity(ent);
}
public void objEntityRemoved(ObjEntity ent) {
- //To change body of implemented methods use File | Settings | File Templates.
+ logger.info("Removed obj entity: " + ent.getName());
+ ent.getDataMap().removeObjEntity(ent.getName());
}
}