Author: brett
Date: Tue Jun 7 22:54:25 2005
New Revision: 189530
URL: http://svn.apache.org/viewcvs?rev=189530&view=rev
Log:
PR: MNG-457
add support to select a set of profiles
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=189530&r1=189529&r2=189530&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Tue Jun 7 22:54:25 2005
@@ -24,6 +24,7 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.profile.activation.ProfileActivationUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@@ -286,5 +287,14 @@
public void addLocalRepository( LocalRepository localRepository )
{
this.localRepository = localRepository;
+ }
+
+ public void setProfiles( String profiles )
+ {
+ if ( profiles != null )
+ {
+ // TODO: not sure this is the best way to do this...
+ System.setProperty( ProfileActivationUtils.ACTIVE_PROFILE_IDS,
profiles );
+ }
}
}
Modified:
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=189530&r1=189529&r2=189530&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Tue Jun 7 22:54:25 2005
@@ -225,7 +225,59 @@
<requirement>
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
</requirement>
+ <requirement>
+
<role>org.apache.maven.profile.activation.ProfileActivationCalculator</role>
+ </requirement>
</requirements>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+
<role>org.apache.maven.profile.activation.ProfileActivationCalculator</role>
+
<implementation>org.apache.maven.profile.activation.ProfileActivationCalculator</implementation>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.profile.activation.ProfileActivator</role>
+ <role-hint>always-on</role-hint>
+
<implementation>org.apache.maven.profile.activation.AlwaysOnProfileActivator</implementation>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.profile.activation.ProfileActivator</role>
+ <role-hint>jdk-prefix</role-hint>
+
<implementation>org.apache.maven.profile.activation.JdkPrefixProfileActivator</implementation>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.profile.activation.ProfileActivator</role>
+ <role-hint>system-property</role-hint>
+
<implementation>org.apache.maven.profile.activation.SystemPropertyProfileActivator</implementation>
+ </component>
+ <!--
+ |
+ |
+ |
+ -->
+ <component>
+ <role>org.apache.maven.profile.activation.ProfileActivator</role>
+ <role-hint>explicit-listing</role-hint>
+
<implementation>org.apache.maven.profile.activation.ExplicitListingProfileActivator</implementation>
</component>
<!--
|
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
