jvanzyl 2002/11/24 10:05:39
Modified: . build-bootstrap.xml maven.xml
src/conf driver.jelly
src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
Removed: src/java/org/apache/maven/util JellyUtils.java
Log:
o refactoring
Revision Changes Path
1.175 +1 -20 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- build-bootstrap.xml 11 Nov 2002 23:17:40 -0000 1.174
+++ build-bootstrap.xml 24 Nov 2002 18:05:39 -0000 1.175
@@ -194,26 +194,6 @@
<echo>
+------------------------------------------------------------------+
| |
-| B U I L D I N G T H E R E A C T O R |
-| |
-+------------------------------------------------------------------+
-About to execute Maven via ${maven.command}
- </echo>
-
- <exec executable="${maven.command}" failonerror="true">
- <arg value="${maven.bootstrap.online}"/>
- <arg value="maven:reactor-install"/>
- </exec>
-
- <copy todir="${maven.home}/plugins" flatten="yes">
- <fileset dir="src/plugins-build">
- <include name="**/target/*reactor*.jar"/>
- </fileset>
- </copy>
-
- <echo>
-+------------------------------------------------------------------+
-| |
| B U I L D I N G T H E P L U G I N S |
| |
+------------------------------------------------------------------+
@@ -222,6 +202,7 @@
<exec executable="${maven.command}" failonerror="true">
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:plugins-build"/>
+ <arg value="-e"/>
</exec>
<echo>
1.56 +23 -34 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- maven.xml 11 Nov 2002 23:17:40 -0000 1.55
+++ maven.xml 24 Nov 2002 18:05:39 -0000 1.56
@@ -3,7 +3,6 @@
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
xmlns:m="maven"
- xmlns:reactor="reactor"
xmlns:deploy="deploy"
xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary">
@@ -18,15 +17,32 @@
</j:choose>
</goal>
- <goal name="maven:reactor-install">
+ <!-- ================================================================== -->
+ <!-- B U I L D P L U G I N S -->
+ <!-- ================================================================== -->
+
+ <goal name="maven:plugins-build"
+ description="Build each Maven plugin into an installable jar">
- <maven:maven
- basedir="${maven.src.dir}/plugins-build/reactor"
- descriptor="${maven.src.dir}/plugins-build/reactor/project.xml"
+ <maven:reactor
+ basedir="${maven.src.dir}/plugins-build"
+ glob="*/project.xml"
goals="clean,plugin"
+ banner="Building"
ignoreFailures="false"
/>
+ </goal>
+
+ <goal name="maven:plugins-clean"
+ description="Build each Maven plugin into an installable jar">
+ <maven:reactor
+ basedir="${maven.src.dir}/plugins-build"
+ glob="*/project.xml"
+ goals="clean"
+ banner="Building"
+ ignoreFailures="true"
+ />
</goal>
<!-- ================================================================== -->
@@ -36,7 +52,7 @@
<goal name="maven:plugin-docs"
description="Build each Maven plugin's documentation">
- <reactor:execute
+ <maven:reactor
basedir="${maven.src.dir}/plugins-build"
glob="*/project.xml"
goals="xdoc"
@@ -45,35 +61,7 @@
/>
</goal>
-
- <!-- ================================================================== -->
- <!-- D E V E L O P E R & B O O T S T R A P G O A L S -->
- <!-- ================================================================== -->
-
- <goal name="maven:plugins-build"
- description="Build each Maven plugin into an installable jar">
-
- <reactor:execute
- basedir="${maven.src.dir}/plugins-build"
- glob="*/project.xml"
- goals="clean,plugin"
- banner="Building"
- ignoreFailures="false"
- />
- </goal>
- <!-- execute a supplied goal on all plugins -->
- <goal name="maven:plugins-do"
- description="Execute the goals listed in the pluginGoals property for all
plugins">
- <reactor:execute
- basedir="${maven.src.dir}/plugins-build"
- glob="*/project.xml"
- goals="${pluginGoals}"
- banner="${pluginGoals}"
- ignoreFailures="false"
- />
- </goal>
-
<goal name="maven:plugins-install"
description="Copy all plugin jars from ${maven.src.dir}/plugins/*/target to
${maven.home}/plugins">
@@ -367,6 +355,7 @@
<postGoal name="java:jar-resources">
<j:if test="${maven.test.distribution}">
+ <echo>Using test log4j.properties file ...</echo>
<copy
file="src/test/log4j.properties"
todir="${maven.build.dest}"
1.2 +0 -11 jakarta-turbine-maven/src/conf/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/conf/driver.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driver.jelly 11 Nov 2002 23:20:45 -0000 1.1
+++ driver.jelly 24 Nov 2002 18:05:39 -0000 1.2
@@ -39,12 +39,6 @@
</j:if>
</define:tag>
- <define:jellybean
- name="create-dependency-classpath"
- className="org.apache.maven.CreateDependencyClasspath"
- method="execute"
- />
-
</define:taglib>
<!-- Allow a hook for processing around the build start. -->
@@ -73,11 +67,6 @@
file="${pom.build.unitTestSourceDirectory}"
/>
</j:if>
-
- <m:create-dependency-classpath
- refid="maven.dependency.classpath"
- context="${context}"
- />
<path id="maven-classpath">
<fileset dir="${maven.home}/lib"/>
1.20 +4 -4
jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ProjectInheritanceTest.java 13 Nov 2002 17:48:05 -0000 1.19
+++ ProjectInheritanceTest.java 24 Nov 2002 18:05:39 -0000 1.20
@@ -204,9 +204,9 @@
maven.runtimeInitialization();
//assertEquals("maven", maven.getProperty("maven.final.name"));
- assertEquals("conf/java", maven.getProperty("maven.jarResources.basedir"));
- assertEquals("right", maven.getProperty("maven.xdoc.date"));
- assertEquals("myValue", maven.getProperty("myProperty"));
- assertEquals("myValue2", maven.getProperty("myProperty2"));
+ assertEquals("conf/java", (String)
maven.getVariable("maven.jarResources.basedir"));
+ assertEquals("right", (String) maven.getVariable("maven.xdoc.date"));
+ assertEquals("myValue", (String) maven.getVariable("myProperty"));
+ assertEquals("myValue2", (String) maven.getVariable("myProperty2"));
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
