You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2006/09/25 13:42:20 UTC
svn commit: r449658 - in /maven/plugins/trunk/maven-ant-plugin/src:
main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java
test/resources/unit/ant-test/ant-test-plugin-config.xml
Author: vsiveton
Date: Mon Sep 25 04:42:19 2006
New Revision: 449658
URL: http://svn.apache.org/viewvc?view=rev&rev=449658
Log:
MANT-18: added Maven Project properties in the maven-build.properties
o Store Maven project properties
o updated test case
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/ant-test-plugin-config.xml
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?view=diff&rev=449658&r1=449657&r2=449658
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Mon Sep 25 04:42:19 2006
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
@@ -194,6 +195,19 @@
addProperty( properties, "maven.settings.offline", String.valueOf( settings.isOffline() ) );
addProperty( properties, "maven.settings.interactiveMode", String.valueOf( settings.isInteractiveMode() ) );
addProperty( properties, "maven.repo.local", localRepository.getAbsolutePath() );
+
+ // ----------------------------------------------------------------------
+ // Project properties
+ // ----------------------------------------------------------------------
+
+ if ( project.getProperties() != null )
+ {
+ for ( Iterator it = project.getProperties().entrySet().iterator(); it.hasNext(); )
+ {
+ Map.Entry property = (Map.Entry) it.next();
+ addProperty( properties, property.getKey().toString(), property.getValue().toString() );
+ }
+ }
properties.store( os, "Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!" );
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java?view=diff&rev=449658&r1=449657&r2=449658
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AntTestMavenProjectStub.java Mon Sep 25 04:42:19 2006
@@ -20,6 +20,7 @@
import java.io.FileReader;
import java.util.Collections;
import java.util.List;
+import java.util.Properties;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
@@ -167,5 +168,13 @@
repo.setUrl( "http://repo1.maven.org/maven2" );
return Collections.singletonList( repo );
+ }
+
+ /**
+ * @see org.apache.maven.project.MavenProject#getProperties()
+ */
+ public Properties getProperties()
+ {
+ return getModel().getProperties();
}
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/ant-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/ant-test-plugin-config.xml?view=diff&rev=449658&r1=449657&r2=449658
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/ant-test-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/ant-test-plugin-config.xml Mon Sep 25 04:42:19 2006
@@ -48,4 +48,7 @@
</plugin>
</plugins>
</build>
+ <properties>
+ <myKey>myValue</myKey>
+ </properties>
</project>