You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/15 09:48:41 UTC
svn commit: r422171 -
/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
Author: jdillon
Date: Sat Jul 15 00:48:40 2006
New Revision: 422171
URL: http://svn.apache.org/viewvc?rev=422171&view=rev
Log:
Rename mojo's for clarity (to match goal names better)
Added:
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java (contents, props changed)
- copied, changed from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java (contents, props changed)
- copied, changed from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java (contents, props changed)
- copied, changed from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java (contents, props changed)
- copied, changed from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
Removed:
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java
Modified:
geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java (from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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/AbstractCarMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java&r1=422168&r2=422171&rev=422171&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractPackagingMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java Sat Jul 15 00:48:40 2006
@@ -40,7 +40,7 @@
*
* @version $Id$
*/
-public abstract class AbstractPackagingMojo
+public abstract class AbstractCarMojo
extends MojoSupport
{
/**
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.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/AbstractCarMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java (from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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/InstallConfigMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java&r1=422168&r2=422171&rev=422171&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigInstallerMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java Sat Jul 15 00:48:40 2006
@@ -48,10 +48,6 @@
import java.util.Set;
import java.util.Collections;
-//
-// TODO: Rename to InstallConfigMojo
-//
-
/**
* ???
*
@@ -59,8 +55,8 @@
*
* @version $Rev$ $Date$
*/
-public class ConfigInstallerMojo
- extends MojoSupport
+public class InstallConfigMojo
+ extends AbstractCarMojo
{
public static final FileWriteMonitor LOG_COPY_START = new StartFileWriteMonitor();
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallConfigMojo.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/InstallConfigMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java (from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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/InstallMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java&r1=422168&r2=422171&rev=422171&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ConfigCopierMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java Sat Jul 15 00:48:40 2006
@@ -25,11 +25,6 @@
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
-//
/**
* Copies all the configurations out of source config store into target config store.
@@ -38,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class ConfigCopierMojo extends AbstractPackagingMojo {
+public class InstallMojo extends AbstractCarMojo {
private static final Class[] REPO_ARGS = { File.class };
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallMojo.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/InstallMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java (from r422168, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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/PackageMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java&r1=422168&r2=422171&rev=422171&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageBuilderShellMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java Sat Jul 15 00:48:40 2006
@@ -29,17 +29,10 @@
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;
-//
-// TODO: Rename to PackageMojo
-//
-
/**
* Build a Geronimo Configuration using the local Maven infrastructure.
*
@@ -51,8 +44,8 @@
*
* @version $Rev$ $Date$
*/
-public class PackageBuilderShellMojo
- extends AbstractPackagingMojo
+public class PackageMojo
+ extends AbstractCarMojo
{
private List artifacts;
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.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/PackageMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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?rev=422171&r1=422170&r2=422171&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/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:48:40 2006
@@ -34,7 +34,6 @@
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;
@@ -58,7 +57,7 @@
* @version $Rev$ $Date$
*/
public class PlanProcessorMojo
- extends AbstractPackagingMojo
+ extends AbstractCarMojo
{
private static final String ENVIRONMENT_LOCAL_NAME = "environment";