You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ka...@apache.org on 2002/12/16 02:02:31 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/uberjar/src/conf classworlds.conf
kaz 2002/12/15 17:02:31
Modified: src/plugins-build/uberjar maven.xml plugin.jelly
Added: src/plugins-build/uberjar/src/conf classworlds.conf
Log:
Updated the uberjar plugin to use the new Velocity taglib, instead of
using an inline XML-scripted template.
Revision Changes Path
1.2 +0 -1 jakarta-turbine-maven/src/plugins-build/uberjar/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/uberjar/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 14 Dec 2002 23:43:13 -0000 1.1
+++ maven.xml 16 Dec 2002 01:02:31 -0000 1.2
@@ -17,7 +17,6 @@
<copy todir="${assemblyDir}">
<fileset dir=".">
<exclude name="target/**"/>
- <exclude name="src/**"/>
<exclude name="maven.xml"/>
<exclude name="maven.log"/>
</fileset>
1.2 +9 -11 jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/uberjar/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 14 Dec 2002 23:43:13 -0000 1.1
+++ plugin.jelly 16 Dec 2002 01:02:31 -0000 1.2
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core">
+<project xmlns:j="jelly:core"
+ xmlns:velocity="jelly:org.apache.maven.jelly.tags.velocity.VelocityTagLibrary">
<!--==================================================================-->
<!-- Default goal : Builds a uberjar file -->
@@ -95,16 +96,13 @@
</fail>
</j:if>
- <j:file
- trim="false"
- omitXmlDeclaration="true"
- name="${dest}/classworlds.conf">main is ${ubermain} from app
-
-[app]
- <j:forEach var="dep" items="${pom.dependencies}">
- load $${classworlds.lib}/${dep.artifact}</j:forEach>
- load $${classworlds.lib}/${maven.final.name}.jar
- </j:file>
+ <!-- Need to add the ant property 'maven.final.name' to the context
+ those are preloaded into the jelly context which is supposed to
+ happen soon. -->
+ <j:set var="self" value="${maven.final.name}"/>
+ <velocity:merge
+ name="${dest}/classworlds.conf"
+ template="${plugin.dir}/src/conf/classworlds.conf"/>
</goal>
1.1 jakarta-turbine-maven/src/plugins-build/uberjar/src/conf/classworlds.conf
Index: classworlds.conf
===================================================================
main is $ubermain from app
[app]
#foreach ( $dep in $pom.dependencies )
load ${classworlds.lib}/$dep.artifact
#end
load ${classworlds.lib}/${self}.jar