You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/10/30 20:19:50 UTC
svn commit: r709227 [2/2] - in
/maven/components/branches/sisbell-maven-3.0-mercury:
maven-mercury/src/main/java/org/apache/maven/mercury/
maven-mercury/src/test/java/org/apache/maven/mercury/
maven-mercury/src/test/resources/ maven-project-builder/ ma...
Added: maven/components/branches/sisbell-maven-3.0-mercury/maven-project-builder/src/test/resources/test.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-project-builder/src/test/resources/test.txt?rev=709227&view=auto
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-project-builder/src/test/resources/test.txt (added)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-project-builder/src/test/resources/test.txt Thu Oct 30 12:19:47 2008
@@ -0,0 +1 @@
+test
\ No newline at end of file
Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java?rev=709227&r1=709226&r2=709227&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java (original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java Thu Oct 30 12:19:47 2008
@@ -91,7 +91,7 @@
if ( !context.isCustomActivatorFailureSuppressed() )
{
throw new ProfileActivationException(
- "Cannot find custom ProfileActivator: " + type + ". \nPerhaps you're missing a build extension?",
+ "Cannot find custom ActiveProfileMatcher: " + type + ". \nPerhaps you're missing a build extension?",
e );
}
}
@@ -108,7 +108,7 @@
{
if ( !context.isCustomActivatorFailureSuppressed() )
{
- throw new ProfileActivationException( "Failed to configure custom ProfileActivator: " + type + ".", e );
+ throw new ProfileActivationException( "Failed to configure custom ActiveProfileMatcher: " + type + ".", e );
}
}
Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java?rev=709227&r1=709226&r2=709227&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java (original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelTransformerContext.java Thu Oct 30 12:19:47 2008
@@ -314,6 +314,8 @@
return this.transform( domainModels, fromModelTransformer, toModelTransformer, null, systemInterpolatorProperties );
}
+ //mixins
+
private static List<ModelProperty> importModelProperties(Collection<ImportModel> importModels,
List<ModelProperty> modelProperties) {
List<ModelProperty> properties = new ArrayList<ModelProperty>();