werken 2002/06/12 22:25:17
Modified: src/bin maven maven-bootstrap.jelly maven-scripts.jelly
Added: src/bin banner.jelly core-plugin.jelly driver.jelly
init.jelly plugin-core.jelly plugins.jelly
Log:
More hacking on the jellywerkz maven.
Revision Changes Path
1.3 +2 -2 jakarta-turbine-maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven 10 Jun 2002 15:43:58 -0000 1.2
+++ maven 13 Jun 2002 05:25:17 -0000 1.3
@@ -144,7 +144,7 @@
LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
fi
-echo $LOCALCLASSPATH
+## echo $LOCALCLASSPATH
$JAVACMD -classpath "$LOCALCLASSPATH" -Dmaven.home="${MAVEN_HOME}" $MAVEN_OPTS \
- org.apache.commons.jelly.Jelly file://${MAVEN_HOME}/bin/maven-ng.jelly
$MAVEN_ARGS "$@"
+ org.apache.commons.jelly.Jelly file://${MAVEN_HOME}/bin/driver.jelly
$MAVEN_ARGS "$@"
1.6 +7 -9 jakarta-turbine-maven/src/bin/maven-bootstrap.jelly
Index: maven-bootstrap.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven-bootstrap.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven-bootstrap.jelly 10 Jun 2002 15:43:58 -0000 1.5
+++ maven-bootstrap.jelly 13 Jun 2002 05:25:17 -0000 1.6
@@ -2,7 +2,6 @@
|| This file lives in ${maven.home}
-->
<jelly:jelly
- preserveWhitespace="false"
trim="true"
xmlns:jelly="jelly:core"
xmlns:def="jelly:define"
@@ -13,17 +12,16 @@
-->
<maven:init>
+ </maven:init>
- <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-properties.jelly</jelly:set>
- <jelly:import uri="${file}"/>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-properties.jelly</jelly:set>
+ <jelly:import uri="${file}"/>
- <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-scripts.jelly</jelly:set>
- <jelly:import uri="${file}" inherit="true"/>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-scripts.jelly</jelly:set>
+ <jelly:import uri="${file}" inherit="true"/>
- <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven.jelly</jelly:set>
- <jelly:import uri="${file}" inherit="true"/>
-
- </maven:init>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven.jelly</jelly:set>
+ <jelly:import uri="${file}" inherit="true"/>
1.5 +0 -1 jakarta-turbine-maven/src/bin/maven-scripts.jelly
Index: maven-scripts.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven-scripts.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven-scripts.jelly 10 Jun 2002 15:43:58 -0000 1.4
+++ maven-scripts.jelly 13 Jun 2002 05:25:17 -0000 1.5
@@ -3,7 +3,6 @@
-->
<jelly:jelly
trim="true"
- preserveWhitespace="false"
xmlns:ant="jelly:ant"
xmlns:jelly="jelly:core"
xmlns:def="jelly:define"
1.1 jakarta-turbine-maven/src/bin/banner.jelly
Index: banner.jelly
===================================================================
<jelly
trim="false"
xmlns="jelly:core">
| intelligent projects
maven | copyright 2002 the apache software foundation
| http://jakarta.apache.org/turbine/maven
</jelly>
1.1 jakarta-turbine-maven/src/bin/core-plugin.jelly
Index: core-plugin.jelly
===================================================================
<jelly
trim="true"
xmlns:werkz="jelly:werkz"
xmlns:ant="jelly:ant"
xmlns="jelly:core">
<werkz:project>
<werkz:goal
name="maven:prepare-source">
</werkz:goal>
<werkz:goal
name="maven:compile"
prereqs="maven:prepare-source">
</werkz:goal>
<werkz:goal
name="maven:compile-test">
</werkz:goal>
<werkz:goal
name="maven:test"
prereqs="maven:compile-test">
</werkz:goal>
<werkz:goal
name="maven:jar"
prereqs="maven:compile, maven:test">
</werkz:goal>
</werkz:project>
</jelly>
1.1 jakarta-turbine-maven/src/bin/driver.jelly
Index: driver.jelly
===================================================================
<jelly
trim="true"
xmlns:werkz="jelly:werkz"
xmlns:ant="jelly:ant"
xmlns="jelly:core">
<werkz:project>
<import uri="banner.jelly"/>
<import uri="init.jelly"/>
<import uri="plugins.jelly"/>
<forEach var="arg" items="${args}" begin="1">
<werkz:attainGoal name="${arg}"/>
</forEach>
</werkz:project>
</jelly>
1.1 jakarta-turbine-maven/src/bin/init.jelly
Index: init.jelly
===================================================================
<jelly
trim="true"
xmlns="jelly:core">
</jelly>
1.1 jakarta-turbine-maven/src/bin/plugin-core.jelly
Index: plugin-core.jelly
===================================================================
<!--
|| This file lives in ${maven.home}/plugins
-->
<jelly:jelly
trim="true"
xmlns:ant="jelly:ant"
xmlns:jelly="jelly:core"
xmlns:util="maven:util"
xmlns:maven="jelly:org.apache.maven.jelly.MavenTagLibrary">
<!--
|| Dispatch each argument as a maven build target.
-->
<jelly:forEach
var="target"
items="${args}"
begin="1">
<maven:maven target="${target}"/>
</jelly:forEach>
</jelly:jelly>
1.1 jakarta-turbine-maven/src/bin/plugins.jelly
Index: plugins.jelly
===================================================================
<jelly
trim="true"
xmlns="jelly:core">
<import uri="core-plugin.jelly"/>
</jelly>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
