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 22:06:35 UTC
svn commit: r1407635 - in /cayenne/main/trunk/framework: cayenne-tools/src/main/java/org/apache/cayenne/dbimport/ cayenne-tools/src/main/java/org/apache/cayenne/tools/ cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/ cayenne-tools/src/tes...

Author: aadamchik
Date: Fri Nov  9 21:06:34 2012
New Revision: 1407635

URL: http://svn.apache.org/viewvc?rev=1407635&view=rev
Log:
CAY-1758 cdbimport improvements

moving packages around

Added:
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportAction.java
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegate.java
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportModule.java
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportParameters.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportParameters.java
    cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/
    cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/DbImportActionTest.java
    cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java
      - copied, changed from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegateTest.java
Removed:
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/
    cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/
Modified:
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
    cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.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=1407635&r1=1407634&r2=1407635&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 21:06:34 2012
@@ -21,12 +21,12 @@ package org.apache.cayenne.tools;
 
 import java.io.File;
 
-import org.apache.cayenne.dbimport.DbImportAction;
-import org.apache.cayenne.dbimport.DbImportModule;
-import org.apache.cayenne.dbimport.DbImportParameters;
 import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.tools.configuration.ToolsModule;
+import org.apache.cayenne.tools.dbimport.DbImportAction;
+import org.apache.cayenne.tools.dbimport.DbImportModule;
+import org.apache.cayenne.tools.dbimport.DbImportParameters;
 import org.apache.cayenne.util.Util;
 import org.apache.commons.logging.Log;
 import org.apache.tools.ant.BuildException;

Copied: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportAction.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportAction.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportAction.java Fri Nov  9 21:06:34 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import java.io.File;
 import java.io.IOException;
@@ -84,7 +84,7 @@ public class DbImportAction {
         DbAdapter adapter = getAdapter(parameters.getAdapter(), dataSource);
         DataMap dataMap = getDataMap(parameters);
 
-        ImportDbLoaderDelegate loaderDelegate = new ImportDbLoaderDelegate();
+        DbImportDbLoaderDelegate loaderDelegate = new DbImportDbLoaderDelegate();
         DbLoader loader = new DbLoader(dataSource.getConnection(), adapter, loaderDelegate);
         loader.setCreatingMeaningfulPK(parameters.isMeaningfulPk());
 

Copied: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegate.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegate.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegate.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegate.java Fri Nov  9 21:06:34 2012
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,14 +31,14 @@ import org.apache.cayenne.map.ObjEntity;
 /**
  * @since 3.2
  */
-class ImportDbLoaderDelegate implements DbLoaderDelegate {
+class DbImportDbLoaderDelegate implements DbLoaderDelegate {
 
     private List<DbEntity> addedDbEntities;
     private List<DbEntity> removedDbEntities;
     private List<ObjEntity> addedObjEntities;
     private List<ObjEntity> removedObjEntities;
 
-    ImportDbLoaderDelegate() {
+    DbImportDbLoaderDelegate() {
         addedDbEntities = new ArrayList<DbEntity>();
         removedDbEntities = new ArrayList<DbEntity>();
         addedObjEntities = new ArrayList<ObjEntity>();

Copied: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportModule.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportModule.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java Fri Nov  9 21:06:34 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import org.apache.cayenne.di.Binder;
 import org.apache.cayenne.di.Module;

Copied: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportParameters.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportParameters.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportParameters.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportParameters.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportParameters.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/dbimport/DbImportParameters.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportParameters.java Fri Nov  9 21:06:34 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import java.io.File;
 

Copied: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/DbImportActionTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/DbImportActionTest.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/DbImportActionTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportActionTest.java Fri Nov  9 21:06:34 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import static org.mockito.Mockito.mock;
 
@@ -31,6 +31,7 @@ import org.apache.cayenne.dba.mysql.MySQ
 import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.tools.configuration.ToolsModule;
+import org.apache.cayenne.tools.dbimport.DbImportAction;
 import org.apache.commons.logging.Log;
 
 public class DbImportActionTest extends TestCase {

Copied: cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java (from r1407633, cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegateTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java&p1=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegateTest.java&r1=1407633&r2=1407635&rev=1407635&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/dbimport/ImportDbLoaderDelegateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportDbLoaderDelegateTest.java Fri Nov  9 21:06:34 2012
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.dbimport;
+package org.apache.cayenne.tools.dbimport;
 
 import java.util.Arrays;
 import java.util.List;
@@ -28,17 +28,18 @@ import org.apache.cayenne.CayenneExcepti
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.tools.dbimport.DbImportDbLoaderDelegate;
 
-public class ImportDbLoaderDelegateTest extends TestCase {
+public class DbImportDbLoaderDelegateTest extends TestCase {
 
-    private ImportDbLoaderDelegate delegate;
+    private DbImportDbLoaderDelegate delegate;
     private DataMap dataMap;
     private DbEntity dbEntity;
     private ObjEntity objEntity;
 
     @Override
     public void setUp() {
-        delegate = new ImportDbLoaderDelegate();
+        delegate = new DbImportDbLoaderDelegate();
         dataMap = new DataMap();
 
         dbEntity = new DbEntity("TestDbEntity");

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=1407635&r1=1407634&r2=1407635&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 Nov  9 21:06:34 2012
@@ -21,12 +21,12 @@ package org.apache.cayenne.tools;
 
 import java.io.File;
 
-import org.apache.cayenne.dbimport.DbImportAction;
-import org.apache.cayenne.dbimport.DbImportModule;
-import org.apache.cayenne.dbimport.DbImportParameters;
 import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.tools.configuration.ToolsModule;
+import org.apache.cayenne.tools.dbimport.DbImportAction;
+import org.apache.cayenne.tools.dbimport.DbImportModule;
+import org.apache.cayenne.tools.dbimport.DbImportParameters;
 import org.apache.cayenne.util.Util;
 import org.apache.commons.logging.Log;
 import org.apache.maven.plugin.AbstractMojo;