geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422167 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin: assembly/ car/ packaging/
Date Sat, 15 Jul 2006 07:40:29 GMT
Author: jdillon
Date: Sat Jul 15 00:40:26 2006
New Revision: 422167

URL: http://svn.apache.org/viewvc?rev=422167&view=rev
Log:
Put all classes into one package

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
  (contents, props changed)
      - copied, changed from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
Sat Jul 15 00:40:26 2006
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import org.apache.geronimo.plugin.MojoSupport;
 

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import java.io.File;
 import java.util.Iterator;
@@ -25,6 +25,7 @@
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
+import org.apache.geronimo.plugin.car.AbstractPackagingMojo;
 
 //
 // TODO: Rename to InstallMojo
@@ -59,7 +60,7 @@
     private String sourceConfigurationStoreClass;
 
     /**
-     * @parameter expression="org.apache.geronimo.plugin.packaging.MavenConfigStore"
+     * @parameter expression="org.apache.geronimo.plugin.car.MavenConfigStore"
      */
     private String targetConfigurationStoreClass;
 

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
Sat Jul 15 00:40:26 2006
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.assembly;
+package org.apache.geronimo.plugin.car;
 
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
@@ -27,10 +27,8 @@
 import org.apache.geronimo.kernel.config.ManageableAttributeStore;
 import org.apache.geronimo.kernel.repository.Artifact;
 
-import javax.management.ObjectName;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Set;
 
 /**
  * @version $Rev$ $Date$

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenAttributeStore.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import java.io.File;
 import java.io.IOException;

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/MavenConfigStore.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import java.io.File;
 import java.net.URI;
@@ -45,6 +45,7 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
+import org.apache.geronimo.plugin.car.MavenAttributeStore;
 
 /**
  * Builds a Geronimo Configuration using the local Maven infrastructure.

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import java.io.File;
 import java.io.BufferedOutputStream;
@@ -29,6 +29,9 @@
 import org.apache.geronimo.deployment.PluginBootstrap2;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.repository.Maven2Repository;
+import org.apache.geronimo.plugin.car.AbstractPackagingMojo;
+import org.apache.geronimo.plugin.car.MavenConfigStore;
+import org.apache.geronimo.plugin.car.PackageBuilder;
 import org.apache.maven.artifact.Artifact;
 
 import org.codehaus.plexus.util.FileUtils;

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
Sat Jul 15 00:40:26 2006
@@ -15,13 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
+
+import org.apache.geronimo.plugin.car.PackageBuilder;
 
 import java.io.File;
 import java.io.InputStream;
 import java.io.FileInputStream;
 import java.util.Properties;
-import java.util.Collection;
 import java.util.Arrays;
 
 /**

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackagingCommandLine.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
(from r421793, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java&r1=421793&r2=422167&rev=422167&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
Sat Jul 15 00:40:26 2006
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.plugin.packaging;
+package org.apache.geronimo.plugin.car;
 
 import java.io.File;
 import java.io.StringWriter;
@@ -34,6 +34,7 @@
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ImportType;
+import org.apache.geronimo.plugin.car.AbstractPackagingMojo;
 
 import org.apache.maven.model.Dependency;
 

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message