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 2014/12/28 10:17:40 UTC

[1/2] cayenne git commit: add tests derby managment

Repository: cayenne
Updated Branches:
  refs/heads/master ab23e9cee -> 44642ea58


add tests derby managment


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/84dd1c98
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/84dd1c98
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/84dd1c98

Branch: refs/heads/master
Commit: 84dd1c98215601343fc28929a0b72e5157f2fea1
Parents: ab23e9c
Author: alexkolonitsky <Al...@gmail.com>
Authored: Fri Dec 26 18:03:50 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Fri Dec 26 18:03:50 2014 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/tools/DerbyManager.java  | 63 ++++++++++++++++++++
 1 file changed, 63 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/84dd1c98/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
new file mode 100644
index 0000000..82faace
--- /dev/null
+++ b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DerbyManager.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.tools;
+
+/**
+ * @since 4.0
+ */
+
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+public class DerbyManager {
+
+    public static final OutputStream DEV_NULL = new OutputStream() {
+
+        @Override
+        public void write(int b) {
+        }
+    };
+
+    DerbyManager(String location) {
+
+        System.setProperty("derby.stream.error.field", DerbyManager.class.getName() + ".DEV_NULL");
+
+        File derbyDir = new File(location);
+        if (derbyDir.isDirectory()) {
+            try {
+                FileUtils.deleteDirectory(derbyDir);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    void shutdown() {
+        try {
+            DriverManager.getConnection("jdbc:derby:;shutdown=true");
+        } catch (SQLException e) {
+            // the exception is actually expected on shutdown... go figure...
+        }
+    }
+}


[2/2] cayenne git commit: add tests derby managment

Posted by aa...@apache.org.
add tests derby managment


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/44642ea5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/44642ea5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/44642ea5

Branch: refs/heads/master
Commit: 44642ea5840e0fd4d46da63d9106ece3acda3261
Parents: 84dd1c9
Author: alexkolonitsky <Al...@gmail.com>
Authored: Fri Dec 26 18:04:44 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Fri Dec 26 18:04:44 2014 +0300

----------------------------------------------------------------------
 .../cayenne/tools/CayenneGeneratorMojo.java     | 51 +++++++++-----------
 .../apache/cayenne/tools/DbGeneratorMojo.java   | 22 ++++-----
 .../apache/cayenne/tools/DbImporterMojo.java    | 42 ++++++++--------
 .../cayenne/tools/DbImporterMojoTest.java       | 19 ++++++--
 4 files changed, 71 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/44642ea5/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 90b9b1c..658762e 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -19,8 +19,6 @@
 
 package org.apache.cayenne.tools;
 
-import java.io.File;
-
 import org.apache.cayenne.access.loader.NamePatternMatcher;
 import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.ClientClassGenerationAction;
@@ -44,10 +42,11 @@ import java.io.FilenameFilter;
  */
 public class CayenneGeneratorMojo extends AbstractMojo {
 
-	/**
+    public static final File[] NO_FILES = new File[0];
+    /**
 	 * Path to additional DataMap XML files to use for class generation.
 	 * 
-	 * @parameter expression="${cgen.additionalMaps}"
+	 * @parameter additionalMaps="additionalMaps"
 	 */
 	private File additionalMaps;
 
@@ -55,14 +54,14 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Whether we are generating classes for the client tier in a Remote Object
 	 * Persistence application. Default is <code>false</code>.
 	 * 
-	 * @parameter expression="${cgen.client}" default-value="false"
+	 * @parameter client="client" default-value="false"
 	 */
 	private boolean client;
 
 	/**
 	 * Destination directory for Java classes (ignoring their package names).
 	 * 
-	 * @parameter expression="${cgen.destDir}" default-value="${project.build.sourceDirectory}"
+	 * @parameter destDir="destDir" default-value="${project.build.sourceDirectory}"
 	 */
 	private File destDir;
 
@@ -73,7 +72,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * US-ASCII, ISO-8859-1, UTF-8, UTF-16BE, UTF-16LE, UTF-16. See Sun Java
 	 * Docs for java.nio.charset.Charset for more information.
 	 * 
-	 * @parameter expression="${cgen.encoding}"
+	 * @parameter encoding="encoding"
 	 */
 	private String encoding;
 
@@ -81,7 +80,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Entities (expressed as a perl5 regex) to exclude from template
 	 * generation. (Default is to include all entities in the DataMap).
 	 * 
-	 * @parameter expression="${cgen.excludeEntities}"
+	 * @parameter excludeEntities="excludeEntities"
 	 */
 	private String excludeEntities;
 
@@ -89,7 +88,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Entities (expressed as a perl5 regex) to include in template generation.
 	 * (Default is to include all entities in the DataMap).
 	 * 
-	 * @parameter expression="${cgen.includeEntities}"
+	 * @parameter includeEntities="includeEntities"
 	 */
 	private String includeEntities;
 
@@ -98,14 +97,14 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * with all generated code included in superclass (default is
 	 * <code>true</code>).
 	 * 
-	 * @parameter expression="${cgen.makePairs}" default-value="true"
+	 * @parameter makePairs="makePairs" default-value="true"
 	 */
 	private boolean makePairs;
 
 	/**
 	 * DataMap XML file to use as a base for class generation.
 	 * 
-	 * @parameter expression="${cgen.map}"
+	 * @parameter map="map"
 	 * @required
 	 */
 	private File map;
@@ -117,14 +116,14 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * supports specifying one-and-only-one datamap). (Default is
 	 * &quot;entity&quot;)
 	 * 
-	 * @parameter expression="${cgen.mode}" default-value="entity"
+	 * @parameter mode="mode" default-value="entity"
 	 */
 	private String mode;
 
 	/**
 	 * Name of file for generated output. (Default is &quot;*.java&quot;)
 	 * 
-	 * @parameter expression="${cgen.outputPattern}" default-value="*.java"
+	 * @parameter outputPattern="outputPattern" default-value="*.java"
 	 */
 	private String outputPattern;
 
@@ -132,7 +131,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * 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"
+	 * @parameter overwrite="overwrite" default-value="false"
 	 */
 	private boolean overwrite;
 
@@ -144,7 +143,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * <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 superPkg="superPkg" 
 	 */
 	private String superPkg;
 
@@ -153,7 +152,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Ignored unless <code>makepairs</code> set to <code>true</code>. If
 	 * omitted, default template is used.
 	 * 
-	 * @parameter expression="${cgen.superTemplate}"
+	 * @parameter superTemplate="superTemplate"
 	 */
 	private String superTemplate;
 
@@ -161,7 +160,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Location of Velocity template file for Entity class generation. If
 	 * omitted, default template is used.
 	 * 
-	 * @parameter expression="${cgen.template}"
+	 * @parameter template="template"
 	 */
 	private String template;
 
@@ -170,7 +169,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Ignored unless <code>makepairs</code> set to <code>true</code>. If
 	 * omitted, default template is used.
 	 * 
-	 * @parameter expression="${cgen.embeddableSuperTemplate}"
+	 * @parameter embeddableSuperTemplate="embeddableSuperTemplate"
 	 */
 	private String embeddableSuperTemplate;
 
@@ -178,7 +177,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * Location of Velocity template file for Embeddable class generation. If
 	 * omitted, default template is used.
 	 * 
-	 * @parameter expression="${cgen.embeddableTemplate}"
+	 * @parameter embeddableTemplate="embeddableTemplate"
 	 */
 	private String embeddableTemplate;
 
@@ -188,7 +187,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 * <code>false</code>, classes will be generated in &quot;destDir&quot;
 	 * ignoring their package.
 	 * 
-	 * @parameter expression="${cgen.usePkgPath}" default-value="true"
+	 * @parameter usePkgPath="usePkgPath" default-value="true"
 	 */
 	private boolean usePkgPath;
 
@@ -235,8 +234,8 @@ public class CayenneGeneratorMojo extends AbstractMojo {
 	 */
 	protected File[] convertAdditionalDataMaps() throws Exception {
 
-		if (null == additionalMaps) {
-			return new File[0];
+		if (additionalMaps == null) {
+			return NO_FILES;
 		}
 
 		if (!additionalMaps.isDirectory()) {
@@ -247,12 +246,8 @@ public class CayenneGeneratorMojo extends AbstractMojo {
         FilenameFilter mapFilter = new FilenameFilter() {
             @Override
             public boolean accept(File dir, String name) {
-                if (name != null &&
-                        name.toLowerCase().endsWith(".map.xml")) {
-                    return true;
-                } else {
-                    return false;
-                }
+                return name != null &&
+                       name.toLowerCase().endsWith(".map.xml");
             }
         };
         return additionalMaps.listFiles(mapFilter);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/44642ea5/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index 532298a..ad4c6e9 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -54,7 +54,7 @@ public class DbGeneratorMojo extends AbstractMojo {
     /**
      * DataMap XML file to use as a schema descriptor.
      * 
-     * @parameter expression="${cdbgen.map}"
+     * @parameter map="map"
      * @required
      */
     private File map;
@@ -64,14 +64,14 @@ public class DbGeneratorMojo extends AbstractMojo {
      * attribute is optional (a generic JdbcAdapter is used if not set), it is
      * highly recommended to specify correct target adapter.
      * 
-     * @parameter expression="${cdbgen.adapter}"
+     * @parameter adapter="adapter"
      */
     private String adapter;
 
     /**
      * A class of JDBC driver to use for the target database.
      * 
-     * @parameter expression="${cdbgen.driver}"
+     * @parameter driver="driver"
      * @required
      */
     private String driver;
@@ -79,7 +79,7 @@ public class DbGeneratorMojo extends AbstractMojo {
     /**
      * JDBC connection URL of a target database.
      * 
-     * @parameter expression="${cdbgen.url}"
+     * @parameter url="url"
      * @required
      */
     private String url;
@@ -87,14 +87,14 @@ public class DbGeneratorMojo extends AbstractMojo {
     /**
      * Database user name.
      * 
-     * @parameter expression="${cdbgen.username}"
+     * @parameter username="username"
      */
     private String username;
 
     /**
      * Database user password.
      * 
-     * @parameter expression="${cdbgen.password}"
+     * @parameter password="password"
      */
     private String password;
 
@@ -102,7 +102,7 @@ public class DbGeneratorMojo extends AbstractMojo {
      * Defines whether cdbgen should drop the tables before attempting to create
      * new ones. Default is <code>false</code>.
      * 
-     * @parameter expression="${cdbgen.dropTables}" default-value="false"
+     * @parameter dropTables="dropTables" default-value="false"
      */
     private boolean dropTables;
 
@@ -110,7 +110,7 @@ public class DbGeneratorMojo extends AbstractMojo {
      * Defines whether cdbgen should drop Cayenne primary key support objects.
      * Default is <code>false</code>.
      * 
-     * @parameter expression="${cdbgen.dropPK}" default-value="false"
+     * @parameter dropPK="dropPK" default-value="false"
      */
     private boolean dropPK;
 
@@ -118,7 +118,7 @@ public class DbGeneratorMojo extends AbstractMojo {
      * Defines whether cdbgen should create new tables. Default is
      * <code>true</code>.
      * 
-     * @parameter expression="${cdbgen.createTables}" default-value="true"
+     * @parameter createTables="createTables" default-value="true"
      */
     private boolean createTables;
 
@@ -126,7 +126,7 @@ public class DbGeneratorMojo extends AbstractMojo {
      * Defines whether cdbgen should create Cayenne-specific auto PK objects.
      * Default is <code>true</code>.
      * 
-     * @parameter expression="${cdbgen.createPK}" default-value="true"
+     * @parameter createPK="createPK" default-value="true"
      */
     private boolean createPK;
 
@@ -134,7 +134,7 @@ public class DbGeneratorMojo extends AbstractMojo {
      * Defines whether cdbgen should create foreign key copnstraints. Default is
      * <code>true</code>.
      * 
-     * @parameter expression="${cdbgen.createFK}' default-value="true"
+     * @parameter createFK="createFK" default-value="true"
      */
     private boolean createFK;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/44642ea5/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index c8e0798..dacb398 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -51,7 +51,7 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * DataMap XML file to use as a base for DB importing.
      * 
-     * @parameter expression="${cdbimport.map}"
+     * @parameter map="map"
      * @required
      */
     private File map;
@@ -61,7 +61,7 @@ public class DbImporterMojo extends AbstractMojo {
      * existing DataMap already has the default package, the existing package
      * will be used.
      * 
-     * @parameter expression="${cdbimport.defaultPackage}"
+     * @parameter defaultPackage="defaultPackage"
      * @since 4.0
      */
     private String defaultPackage;
@@ -71,12 +71,12 @@ public class DbImporterMojo extends AbstractMojo {
      * with the new data based on reverse engineering. Default is
      * <code>true</code>.
      * 
-     * @parameter expression="${cdbimport.overwrite}" default-value="true"
+     * @parameter overwrite="overwrite" default-value="true"
      */
     private boolean overwrite;
 
     /**
-     * @parameter expression="${cdbimport.meaningfulPkTables}"
+     * @parameter meaningfulPkTables="meaningfulPkTables"
      * @since 4.0
      */
     private String meaningfulPkTables;
@@ -88,7 +88,7 @@ public class DbImporterMojo extends AbstractMojo {
      * 
      * The default is a basic naming strategy.
      * 
-     * @parameter expression="${cdbimport.namingStrategy}"
+     * @parameter namingStrategy="namingStrategy"
      *            default-value="org.apache.cayenne.map.naming.DefaultNameGenerator"
      */
     private String namingStrategy;
@@ -98,7 +98,7 @@ public class DbImporterMojo extends AbstractMojo {
      * is optional, the default is AutoAdapter, i.e. Cayenne would try to guess
      * the DB type.
      * 
-     * @parameter expression="${cdbimport.adapter}"
+     * @parameter adapter="adapter"
      *            default-value="org.apache.cayenne.dba.AutoAdapter"
      */
     private String adapter;
@@ -106,7 +106,7 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * A class of JDBC driver to use for the target database.
      * 
-     * @parameter expression="${cdbimport.driver}"
+     * @parameter driver="driver"
      * @required
      */
     private String driver;
@@ -114,7 +114,7 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * JDBC connection URL of a target database.
      * 
-     * @parameter expression="${cdbimport.url}"
+     * @parameter url="url"
      * @required
      */
     private String url;
@@ -122,21 +122,21 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * Database user name.
      * 
-     * @parameter expression="${cdbimport.username}"
+     * @parameter username="username"
      */
     private String username;
 
     /**
      * Database user password.
      * 
-     * @parameter expression="${cdbimport.password}"
+     * @parameter password="password"
      */
     private String password;
 
     /**
      * If true, would use primitives instead of numeric and boolean classes.
      * 
-     * @parameter expression="${cdbimport.usePrimitives}" default-value="true"
+     * @parameter usePrimitives="usePrimitives" default-value="true"
      */
     private boolean usePrimitives;
 
@@ -145,14 +145,14 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * If true, would use primitives instead of numeric and boolean classes.
      *
-     * @parameter expression="${cdbimport.reverseEngineering}"
+     * @parameter reverseEngineering="reverseEngineering"
      */
     private ReverseEngineering reverseEngineering = new ReverseEngineering();
 
     /**
      * DB schema to use for DB importing.
      *
-     * @parameter expression="${cdbimport.schemaName}"
+     * @parameter schemaName="schemaName"
      * @deprecated since 4.0 renamed to "schema"
      */
     private String schemaName;
@@ -166,7 +166,7 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * DB schema to use for DB importing.
      *
-     * @parameter expression="${cdbimport.schema}"
+     * @parameter schema="schema"
      * @since 4.0
      */
     private Schema schema;
@@ -184,7 +184,7 @@ public class DbImporterMojo extends AbstractMojo {
      *
      * The default is to match against all tables.
      *
-     * @parameter expression="${cdbimport.tablePattern}"
+     * @parameter tablePattern="tablePattern"
      */
     private String tablePattern;
 
@@ -197,7 +197,7 @@ public class DbImporterMojo extends AbstractMojo {
      *
      * Default is <code>false</code>.
      *
-     * @parameter expression="${cdbimport.importProcedures}"
+     * @parameter importProcedures="importProcedures"
      *            default-value="false"
      */
     private String importProcedures;
@@ -212,7 +212,7 @@ public class DbImporterMojo extends AbstractMojo {
      *
      * The default is to match against all stored procedures.
      *
-     * @parameter expression="${cdbimport.procedurePattern}"
+     * @parameter procedurePattern="procedurePattern"
      */
     private String procedurePattern;
 
@@ -226,7 +226,7 @@ public class DbImporterMojo extends AbstractMojo {
      *
      * Default is <code>false</code>.
      *
-     * @parameter expression="${cdbimport.meaningfulPk}"
+     * @parameter meaningfulPk="meaningfulPk"
      * @deprecated since 4.0 use meaningfulPkTables
      */
     private boolean meaningfulPk;
@@ -311,7 +311,7 @@ public class DbImporterMojo extends AbstractMojo {
      * A comma-separated list of Perl5 regex that defines tables that should be
      * included in import.
      *
-     * @parameter expression="${cdbimport.includeTables}"
+     * @parameter includeTables="includeTables"
      */
     private String includeTables;
 
@@ -323,7 +323,7 @@ public class DbImporterMojo extends AbstractMojo {
      * A comma-separated list of Perl5 regex that defines tables that should be
      * skipped from import.
      *
-     * @parameter expression="${cdbimport.excludeTables}"
+     * @parameter excludeTables="excludeTables"
      */
     private String excludeTables;
 
@@ -338,7 +338,7 @@ public class DbImporterMojo extends AbstractMojo {
     /**
      * DB schema to use for DB importing.
      *
-     * @parameter expression="${cdbimport.catalog}"
+     * @parameter catalog="catalog"
      * @since 4.0
      */
     private Catalog catalog[];

http://git-wip-us.apache.org/repos/asf/cayenne/blob/44642ea5/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index bf39b01..cf17a84 100644
--- a/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -43,15 +43,31 @@ import org.custommonkey.xmlunit.DetailedDiff;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
 import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+
 public class DbImporterMojoTest extends AbstractMojoTestCase {
 
 	static {
 		XMLUnit.setIgnoreWhitespace(true);
 	}
 
+    private static DerbyManager derbyAssembly;
+
+    @BeforeClass
+    public static void setUpClass() throws IOException, SQLException {
+        derbyAssembly = new DerbyManager("target/derby");
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws IOException, SQLException {
+        derbyAssembly.shutdown();
+        derbyAssembly = null;
+    }
+
 	public void testToParameters_MeaningfulPk() throws Exception {
 
 		DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").toParameters();
@@ -272,7 +288,6 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
 	}
 
     private void execute(Statement stmt, String sql) throws SQLException {
-        System.out.println(sql);
         stmt.execute(sql);
     }
 
@@ -286,8 +301,6 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
             DetailedDiff diff = new DetailedDiff(prototype);
 
 			if (!diff.similar()) {
-				System.out.println(" >>>> " + map.getAbsolutePath() + "-result");
-				System.out.println(" >>>> " + mapFileCopy);
 				fail(diff.toString());
 			}