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 2007/05/26 18:34:18 UTC
svn commit: r541916 -
/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: jvanzyl
Date: Sat May 26 09:34:16 2007
New Revision: 541916
URL: http://svn.apache.org/viewvc?view=rev&rev=541916
Log:
MANTTASKS-6 Obey settings.xml
Submitted by: Herve Boutemy
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=541916&r1=541915&r2=541916
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sat May 26 09:34:16 2007
@@ -39,6 +39,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.classworlds.DuplicateRealmException;
import org.codehaus.plexus.PlexusContainer;
@@ -182,6 +183,24 @@
if ( !settingsFile.exists() )
{
settingsFile = new File( System.getProperty( "user.home" ), ".m2/settings.xml" );
+ }
+ if ( !settingsFile.exists() )
+ {
+ settingsFile = new File( System.getProperty( "ant.home" ), "etc/settings.xml" );
+ }
+ if ( !settingsFile.exists() )
+ { // look in ${M2_HOME}/conf
+ List env = Execute.getProcEnvironment();
+ for ( Iterator iter = env.iterator(); iter.hasNext(); )
+ {
+ String var = (String) iter.next();
+ if ( var.startsWith( "M2_HOME=" ) )
+ {
+ String m2_home = var.substring( "M2_HOME=".length() );
+ settingsFile = new File( m2_home, "conf/settings.xml" );
+ break;
+ }
+ }
}
if ( settingsFile.exists() )