Author: jdcasey
Date: Mon Jun 20 13:08:05 2005
New Revision: 191551
URL: http://svn.apache.org/viewcvs?rev=191551&view=rev
Log:
o Added conversion handling of checksumPolicy to Settings and Profiles.
o Moved the profiles-builder stuff into maven-profile, to make that API more
self-contained for reuse in Ant tasks, etc.
Added:
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
- copied unchanged from r191522,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
- copied unchanged from r191522,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
maven/components/trunk/maven-profile/src/main/resources/
maven/components/trunk/maven-profile/src/main/resources/META-INF/
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
(with props)
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=191551&r1=191550&r2=191551&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Mon Jun 20 13:08:05 2005
@@ -57,15 +57,6 @@
<!--
|
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-
<implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
- </component>
- <!--
- |
| Lifecycle executor
|
-->
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=191551&r1=191550&r2=191551&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 Jun 20 13:08:05 2005
@@ -100,6 +100,7 @@
repo.setLayout( profileXmlRepo.getLayout() );
repo.setName( profileXmlRepo.getName() );
repo.setSnapshotPolicy( profileXmlRepo.getSnapshotPolicy() );
+ repo.setChecksumPolicy( profileXmlRepo.getChecksumPolicy() );
repo.setUrl( profileXmlRepo.getUrl() );
return repo;
Added:
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml?rev=191551&view=auto
==============================================================================
---
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
Mon Jun 20 13:08:05 2005
@@ -0,0 +1,13 @@
+<component-set>
+ <components>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
+
<implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
+ </component>
+ </components>
+</component-set>
Propchange:
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author"
Propchange:
maven/components/trunk/maven-profile/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=191551&r1=191550&r2=191551&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 Jun 20 13:08:05 2005
@@ -160,6 +160,7 @@
repo.setLayout( settingsRepo.getLayout() );
repo.setName( settingsRepo.getName() );
repo.setSnapshotPolicy( settingsRepo.getSnapshotPolicy() );
+ repo.setChecksumPolicy( settingsRepo.getChecksumPolicy() );
repo.setUrl( settingsRepo.getUrl() );
return repo;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
