You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/02/21 05:25:50 UTC
svn commit: r379329 -
/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
Author: brett
Date: Mon Feb 20 20:25:48 2006
New Revision: 379329
URL: http://svn.apache.org/viewcvs?rev=379329&view=rev
Log:
[MNG-1509] fix profile activation from settings.xml (merged from r379314)
Modified:
maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
Modified: maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java?rev=379329&r1=379328&r2=379329&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java Mon Feb 20 20:25:48 2006
@@ -163,9 +163,9 @@
activation.setProperty( prop );
}
-
+
ActivationOS settingsOs = settingsActivation.getOs();
-
+
if ( settingsOs != null )
{
org.apache.maven.model.ActivationOS os = new org.apache.maven.model.ActivationOS();
@@ -174,8 +174,10 @@
os.setFamily( settingsOs.getFamily() );
os.setName( settingsOs.getName() );
os.setVersion( settingsOs.getVersion() );
+
+ activation.setOs( os );
}
-
+
org.apache.maven.settings.ActivationFile settingsFile = settingsActivation.getFile();
if ( settingsFile != null )
@@ -187,6 +189,8 @@
activation.setFile( file );
}
+
+ profile.setActivation( activation );
}
profile.setProperties( settingsProfile.getProperties() );