You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/02/26 21:20:30 UTC
svn commit: r381160 - in /maven/components/branches/maven-embedder-refactor:
maven-cli/maven-cli.iml
maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Author: jvanzyl
Date: Sun Feb 26 12:20:26 2006
New Revision: 381160
URL: http://svn.apache.org/viewcvs?rev=381160&view=rev
Log:
o get rid of ReactorManager reference in the CLI and couch it in terms of the MavenExecutionRequest
o change references in MavenExecutionRequests for constants to their source so that we know where they come from
Added:
maven/components/branches/maven-embedder-refactor/maven-cli/maven-cli.iml
Modified:
maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Added: maven/components/branches/maven-embedder-refactor/maven-cli/maven-cli.iml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/maven-cli.iml?rev=381160&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/maven-cli.iml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/maven-cli.iml Sun Feb 26 12:20:26 2006
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="false" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="junit">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="jsch">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/com/jcraft/jsch/0.1.24/jsch-0.1.24.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="plexus-interactivity-api">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="classworlds">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/classworlds/classworlds/1.1/classworlds-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-cli">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="wagon-file">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/wagon/wagon-file/1.0-alpha-6/wagon-file-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="plexus-container-default">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="wagon-provider-api">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="plexus-utils">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="wagon-ssh">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/wagon/wagon-ssh/1.0-alpha-6/wagon-ssh-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="wagon-ssh-external">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/wagon/wagon-ssh-external/1.0-alpha-6/wagon-ssh-external-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="doxia-sink-api">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="wagon-http-lightweight">
+ <CLASSES>
+ <root url="jar:///home/jvanzyl/maven-repo-local/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-6/wagon-http-lightweight-1.0-alpha-6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="maven-archiver" />
+ <orderEntry type="module" module-name="maven-artifact" />
+ <orderEntry type="module" module-name="maven-artifact-manager" />
+ <orderEntry type="module" module-name="maven-artifact-test" />
+ <orderEntry type="module" module-name="maven-embedder" />
+ <orderEntry type="module" module-name="maven-core" />
+ <orderEntry type="module" module-name="maven-error-diagnostics" />
+ <orderEntry type="module" module-name="maven-model" />
+ <orderEntry type="module" module-name="maven-model-converter" />
+ <orderEntry type="module" module-name="maven-monitor" />
+ <orderEntry type="module" module-name="maven-plugin-api" />
+ <orderEntry type="module" module-name="maven-plugin-descriptor" />
+ <orderEntry type="module" module-name="maven-plugin-parameter-documenter" />
+ <orderEntry type="module" module-name="maven-plugin-registry" />
+ <orderEntry type="module" module-name="maven-plugin-tools" />
+ <orderEntry type="module" module-name="maven-plugin-tools-ant" />
+ <orderEntry type="module" module-name="maven-plugin-tools-api" />
+ <orderEntry type="module" module-name="maven-plugin-tools-beanshell" />
+ <orderEntry type="module" module-name="maven-plugin-tools-java" />
+ <orderEntry type="module" module-name="maven-plugin-tools-pluggy" />
+ <orderEntry type="module" module-name="maven-plugin-tools-model" />
+ <orderEntry type="module" module-name="maven-profile" />
+ <orderEntry type="module" module-name="maven-project" />
+ <orderEntry type="module" module-name="maven-reporting" />
+ <orderEntry type="module" module-name="maven-reporting-api" />
+ <orderEntry type="module" module-name="maven-reporting-impl" />
+ <orderEntry type="module" module-name="maven-repository-metadata" />
+ <orderEntry type="module" module-name="maven-script" />
+ <orderEntry type="module" module-name="maven-script-ant" />
+ <orderEntry type="module" module-name="maven-script-beanshell" />
+ <orderEntry type="module" module-name="maven-settings" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?rev=381160&r1=381159&r2=381160&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java Sun Feb 26 12:20:26 2006
@@ -24,7 +24,6 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.ReactorManager;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
@@ -181,15 +180,15 @@
if ( commandLine.hasOption( CLIManager.FAIL_FAST ) )
{
- reactorFailureBehaviour = ReactorManager.FAIL_FAST;
+ reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_FAST;
}
else if ( commandLine.hasOption( CLIManager.FAIL_AT_END ) )
{
- reactorFailureBehaviour = ReactorManager.FAIL_AT_END;
+ reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_AT_END;
}
else if ( commandLine.hasOption( CLIManager.FAIL_NEVER ) )
{
- reactorFailureBehaviour = ReactorManager.FAIL_NEVER;
+ reactorFailureBehaviour = MavenExecutionRequest.REACTOR_FAIL_NEVER;
}
boolean offline = false;
Modified: maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=381160&r1=381159&r2=381160&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Sun Feb 26 12:20:26 2006
@@ -20,6 +20,7 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.codehaus.plexus.logging.Logger;
import java.io.File;
import java.util.Date;
@@ -80,27 +81,27 @@
// Logging
// ----------------------------------------------------------------------
- static final int LOGGING_LEVEL_DEBUG = 0;
+ static final int LOGGING_LEVEL_DEBUG = Logger.LEVEL_DEBUG;
- static final int LOGGING_LEVEL_INFO = 1;
+ static final int LOGGING_LEVEL_INFO = Logger.LEVEL_INFO;
- static final int LOGGING_LEVEL_WARN = 2;
+ static final int LOGGING_LEVEL_WARN = Logger.LEVEL_WARN;
- static final int LOGGING_LEVEL_ERROR = 3;
+ static final int LOGGING_LEVEL_ERROR = Logger.LEVEL_ERROR;
- static final int LOGGING_LEVEL_FATAL = 4;
+ static final int LOGGING_LEVEL_FATAL = Logger.LEVEL_FATAL;
- static final int LOGGING_LEVEL_DISABLE = 5;
+ static final int LOGGING_LEVEL_DISABLED = Logger.LEVEL_DISABLED;
// ----------------------------------------------------------------------
// Reactor Failure Mode
// ----------------------------------------------------------------------
- static final int REACTOR_FAIL_FAST = 0;
+ static final String REACTOR_FAIL_FAST = ReactorManager.FAIL_FAST;
- static final int REACTOR_FAIL_END = 1;
+ static final String REACTOR_FAIL_AT_END = ReactorManager.FAIL_AT_END;
- static final int REACTOR_FAIL_NEVER = 2;
+ static final String REACTOR_FAIL_NEVER = ReactorManager.FAIL_NEVER;
// ----------------------------------------------------------------------
//