Author: jdcasey
Date: Wed Sep 10 10:45:23 2008
New Revision: 693909
URL: http://svn.apache.org/viewvc?rev=693909&view=rev
Log:
merging bootstrap-specific main method back into MavenCli.
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=693909&r1=693908&r2=693909&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Wed Sep 10 10:45:23 2008
@@ -474,21 +474,6 @@
downloaded = true;
}
}
- catch ( NoSuchAlgorithmException e )
- {
- throw new TransferFailedException( "Unable to add checksum
methods: " + e.getMessage(), e );
- }
- finally
- {
- if ( md5ChecksumObserver != null )
- {
- wagon.removeTransferListener( md5ChecksumObserver );
- }
- if ( sha1ChecksumObserver != null )
- {
- wagon.removeTransferListener( sha1ChecksumObserver );
- }
- }
if ( downloaded )
{
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=693909&r1=693908&r2=693909&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Wed Sep 10 10:45:23 2008
@@ -291,7 +291,9 @@
// We leave in optional ones, but don't pick up its
dependencies
if ( !child.isResolved() && (
!child.getArtifact().isOptional() || child.isChildOfRootNode() ) )
{
+ List childRemoteRepositories =
child.getRemoteRepositories();
Artifact artifact = child.getArtifact();
+
try
{
Object childKey;
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=693909&r1=693908&r2=693909&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Wed Sep 10 10:45:23 2008
@@ -86,6 +86,15 @@
private static Embedder embedder;
+ public static void main( String[] args )
+ {
+ ClassWorld classWorld = new ClassWorld( "plexus.core",
Thread.currentThread().getContextClassLoader() );
+
+ int result = main( args, classWorld );
+
+ System.exit( result );
+ }
+
/**
* @noinspection ConfusingMainMethod
*/
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java?rev=693909&r1=693908&r2=693909&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java
Wed Sep 10 10:45:23 2008
@@ -20,14 +20,34 @@
*/
import org.apache.maven.model.Profile;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
public abstract class DetectedProfileActivator
- implements ProfileActivator
+ implements ProfileActivator, LogEnabled
{
+ private Logger logger;
+
public boolean canDetermineActivation( Profile profile )
{
return canDetectActivation( profile );
}
+
+ public void enableLogging( Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ protected final Logger getLogger()
+ {
+ if ( logger == null )
+ {
+ return new ConsoleLogger( Logger.LEVEL_INFO, getClass().getName()
);
+ }
+
+ return logger;
+ }
protected abstract boolean canDetectActivation( Profile profile );
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java?rev=693909&r1=693908&r2=693909&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
Wed Sep 10 10:45:23 2008
@@ -24,11 +24,12 @@
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Profile;
+import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
-import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
public class FileProfileActivator
extends DetectedProfileActivator
@@ -62,7 +63,16 @@
if ( StringUtils.isNotEmpty( fileString ) )
{
- fileString = StringUtils.replace( interpolator.interpolate(
fileString, "" ), "\\", "/" );
+ try
+ {
+ fileString = interpolator.interpolate( fileString, "" );
+ }
+ catch ( InterpolationException e )
+ {
+ getLogger().debug( "Failed to interpolate path in file
profile activator: " + fileString, e );
+ }
+
+ fileString = StringUtils.replace( fileString, "\\", "/" );
return FileUtils.fileExists( fileString );
}
@@ -71,7 +81,16 @@
if ( StringUtils.isNotEmpty( fileString ) )
{
- fileString = StringUtils.replace( interpolator.interpolate(
fileString, "" ), "\\", "/" );
+ try
+ {
+ fileString = interpolator.interpolate( fileString, "" );
+ }
+ catch ( InterpolationException e )
+ {
+ getLogger().debug( "Failed to interpolate path in file
profile activator: " + fileString, e );
+ }
+
+ fileString = StringUtils.replace( fileString, "\\", "/" );
return !FileUtils.fileExists( fileString );
}
}
