You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 14:49:54 UTC
svn commit: r293326 - in /maven/components/trunk:
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-profile/ maven-profile/src/main/java/org/apache/maven/...
Author: brett
Date: Mon Oct 3 05:49:40 2005
New Revision: 293326
URL: http://svn.apache.org/viewcvs?rev=293326&view=rev
Log:
PR: MNG-644
remove deprecated settings and profile settings
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
maven/components/trunk/maven-profile/profiles.mdo
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
maven/components/trunk/maven-settings/settings.mdo
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java Mon Oct 3 05:49:40 2005
@@ -76,7 +76,7 @@
}
/**
- * @deprecated. Not needed, use WagonManager.set/isOnline() instead.
+ * @deprecated Not needed, use WagonManager.set/isOnline() instead.
*/
public void setGlobalEnable( boolean enable )
{
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java Mon Oct 3 05:49:40 2005
@@ -36,7 +36,7 @@
void setGlobalChecksumPolicy( String checksumPolicy );
/**
- * @deprecated. Not needed, use WagonManager.set/isOnline() instead.
+ * @deprecated Not needed, use WagonManager.set/isOnline() instead.
*/
void setGlobalEnable( boolean enable );
}
Modified: maven/components/trunk/maven-profile/profiles.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-profile/profiles.mdo?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/profiles.mdo (original)
+++ maven/components/trunk/maven-profile/profiles.mdo Mon Oct 3 05:49:40 2005
@@ -143,7 +143,7 @@
Specifies that this profile will be activated based on existence of a file.
]]></description>
<association>
- <type>ActivationFile</type>
+ <type>ActivationFile</type>
</association>
</field>
</fields>
@@ -185,7 +185,8 @@
<field>
<name>layout</name>
<version>1.0.0</version>
- <description>The type of layout this repository uses for locating and storing artifacts - can be "legacy" or "default".</description>
+ <description>The type of layout this repository uses for locating and storing artifacts - can be "legacy" or
+ "default".</description>
<type>String</type>
<defaultValue>default</defaultValue>
</field>
@@ -219,24 +220,6 @@
Repository contains the information needed for establishing connections with remote repoistory
</description>
<fields>
- <!-- TODO: deprecated -->
- <field>
- <name>snapshotPolicy</name>
- <version>1.0.0</version>
- <description>
- The policy for downloading snapshots - can be "always", "daily" (default), "interval:XXX" (in minutes) or
- "never" (repository is not checked, even if the snapshot is not present locally).
- </description>
- <type>String</type>
- </field>
- <!-- TODO: deprecated -->
- <field>
- <name>checksumPolicy</name>
- <version>1.0.0</version>
- <description>What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are
- "fail" or "warn"</description>
- <type>String</type>
- </field>
<field>
<name>releases</name>
<version>1.0.0</version>
Modified: maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java (original)
+++ maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java Mon Oct 3 05:49:40 2005
@@ -17,8 +17,8 @@
*/
import org.apache.maven.model.Activation;
-import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.ActivationFile;
+import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
@@ -44,11 +44,11 @@
if ( profileActivation != null )
{
Activation activation = new Activation();
-
+
activation.setActiveByDefault( profileActivation.isActiveByDefault() );
activation.setJdk( profileActivation.getJdk() );
-
+
org.apache.maven.profiles.ActivationProperty profileProp = profileActivation.getProperty();
if ( profileProp != null )
@@ -60,7 +60,7 @@
activation.setProperty( prop );
}
-
+
org.apache.maven.profiles.ActivationFile profileFile = profileActivation.getFile();
if ( profileFile != null )
@@ -72,7 +72,7 @@
activation.setFile( file );
}
-
+
profile.setActivation( activation );
}
else
@@ -113,8 +113,6 @@
repo.setId( profileXmlRepo.getId() );
repo.setLayout( profileXmlRepo.getLayout() );
repo.setName( profileXmlRepo.getName() );
- repo.setSnapshotPolicy( profileXmlRepo.getSnapshotPolicy() );
- repo.setChecksumPolicy( profileXmlRepo.getChecksumPolicy() );
repo.setUrl( profileXmlRepo.getUrl() );
if ( profileXmlRepo.getSnapshots() != null )
Modified: maven/components/trunk/maven-settings/settings.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/settings.mdo?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/settings.mdo (original)
+++ maven/components/trunk/maven-settings/settings.mdo Mon Oct 3 05:49:40 2005
@@ -535,13 +535,6 @@
</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
here.</description>
@@ -684,24 +677,6 @@
Repository contains the information needed for establishing connections with remote repoistory
</description>
<fields>
- <!-- TODO: deprecated -->
- <field>
- <name>snapshotPolicy</name>
- <version>1.0.0</version>
- <description>
- The policy for downloading snapshots - can be "always", "daily" (default), "interval:XXX" (in minutes) or
- "never" (repository is not checked, even if the snapshot is not present locally).
- </description>
- <type>String</type>
- </field>
- <!-- TODO: deprecated -->
- <field>
- <name>checksumPolicy</name>
- <version>1.0.0</version>
- <description>What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are
- "fail" or "warn"</description>
- <type>String</type>
- </field>
<field>
<name>releases</name>
<version>1.0.0</version>
Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Mon Oct 3 05:49:40 2005
@@ -26,8 +26,6 @@
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
/**
* @author jdcasey
@@ -52,7 +50,7 @@
private File userSettingsFile;
private File globalSettingsFile;
-
+
private Settings loadedSettings;
// ----------------------------------------------------------------------
@@ -61,12 +59,14 @@
public void initialize()
{
- userSettingsFile = getFile( userSettingsPath, "user.home", MavenSettingsBuilder.ALT_USER_SETTINGS_XML_LOCATION );
+ userSettingsFile = getFile( userSettingsPath, "user.home",
+ MavenSettingsBuilder.ALT_USER_SETTINGS_XML_LOCATION );
globalSettingsFile = getFile( globalSettingsPath, "maven.home",
MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
- getLogger().debug( "Building Maven global-level settings from: '" + globalSettingsFile.getAbsolutePath() + "'" );
+ getLogger().debug(
+ "Building Maven global-level settings from: '" + globalSettingsFile.getAbsolutePath() + "'" );
getLogger().debug( "Building Maven user-level settings from: '" + userSettingsFile.getAbsolutePath() + "'" );
}
@@ -110,7 +110,7 @@
{
return buildSettings( userSettingsFile );
}
-
+
public Settings buildSettings( File userSettingsFile )
throws IOException, XmlPullParserException
{
@@ -128,7 +128,7 @@
SettingsUtils.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL );
setLocalRepository( userSettings );
-
+
loadedSettings = userSettings;
}
@@ -144,30 +144,6 @@
if ( localRepository == null || localRepository.length() < 1 )
{
localRepository = userSettings.getLocalRepository();
- }
-
- // 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.
Modified: maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java?rev=293326&r1=293325&r2=293326&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java (original)
+++ maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java Mon Oct 3 05:49:40 2005
@@ -148,7 +148,7 @@
org.apache.maven.model.Activation activation = new org.apache.maven.model.Activation();
activation.setActiveByDefault( settingsActivation.isActiveByDefault() );
-
+
activation.setJdk( settingsActivation.getJdk() );
ActivationProperty settingsProp = settingsActivation.getProperty();
@@ -194,8 +194,6 @@
repo.setId( settingsRepo.getId() );
repo.setLayout( settingsRepo.getLayout() );
repo.setName( settingsRepo.getName() );
- repo.setSnapshotPolicy( settingsRepo.getSnapshotPolicy() );
- repo.setChecksumPolicy( settingsRepo.getChecksumPolicy() );
repo.setUrl( settingsRepo.getUrl() );
if ( settingsRepo.getSnapshots() != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org