Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-487 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191309 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-06-18 22:38:49 +00:00
parent 7299bd7058
commit 385b7c96ae
2 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
maven-settings/settings.mdo
View File

@ -264,6 +264,33 @@
return match;
}
private Map profileMap;
public void flushProfileMap()
{
this.profileMap = null;
}
public Map getProfilesAsMap()
{
if ( profileMap == null )
{
profileMap = new HashMap();
if ( getProfiles() != null )
{
for ( Iterator it = getProfiles().iterator(); it.hasNext(); )
{
Profile profile = (Profile) it.next();
profileMap.put( profile.getId(), profile );
}
}
}
return profileMap;
}
private RuntimeInfo runtimeInfo;
public void setRuntimeInfo( RuntimeInfo runtimeInfo )
@ -465,6 +492,13 @@
<type>Activation</type>
</association>
</field>
<field>
<name>localRepository</name>
<version>1.0.0</version>
<type>String</type>
<description>backwards-compatible location for specifying the local repository for use in builds</description>
<comment>THIS IS DEPRECATED: use localRepository under the root element instead.</comment>
</field>
<field>
<name>properties</name>
<description>Extended configuration specific to this profile goes

41
maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View File

@ -26,6 +26,8 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
/**
* @author jdcasey
@ -115,16 +117,47 @@ public class DefaultMavenSettingsBuilder
SettingsUtils.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL );
setLocalRepository( userSettings );
return userSettings;
}
private void setLocalRepository( Settings userSettings )
{
// try using the local repository specified on the command line...
String localRepository = System.getProperty( MavenSettingsBuilder.ALT_LOCAL_REPOSITORY_LOCATION );
// otherwise, use the one in settings.xml
if ( localRepository == null || localRepository.length() < 1 )
{
localRepository = userSettings.getLocalRepository();
}
// if both are missing, default to ~/.m2/repository.
// this is a backward compatibility feature...
if ( localRepository == null || localRepository.length() < 1 )
{
List profiles = userSettings.getProfiles();
for ( Iterator it = profiles.iterator(); it.hasNext(); )
{
Profile profile = (Profile) it.next();
localRepository = profile.getLocalRepository();
if ( localRepository != null && localRepository.length() > 0 )
{
getLogger().warn(
"DEPRECATED: Please specify the local repository as:\n\n<settings>"
+ "\n <localRepository>" + localRepository + "</localRepository>"
+ "\n ...\n</settings>\n" );
// we've found it! so stop looking through the profiles...
break;
}
}
}
// if all of the above are missing, default to ~/.m2/repository.
if ( localRepository == null || localRepository.length() < 1 )
{
File mavenUserConfigurationDirectory = new File( userHome, ".m2" );
@ -140,8 +173,6 @@ public class DefaultMavenSettingsBuilder
}
userSettings.setLocalRepository( localRepository );
return userSettings;
}
private File getFile( String pathPattern, String basedirSysProp, String altLocationSysProp )