jvanzyl 2002/07/11 06:37:12
Modified: src/bin driver.jelly driver.properties
Log:
o Move the creation of the dependency classpath and the maven classpath
to the driver so these are available early on. This fixes a problem
where a preGoal is set in a maven.xml file that needs the dependency
classpath to, say, load a taskdef. My particular example was generating
torque sources for turbine-fulcrum. The driver is loaded before maven.xml
so everything is cool now.
Revision Changes Path
1.14 +15 -0 jakarta-turbine-maven/src/bin/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- driver.jelly 11 Jul 2002 06:35:49 -0000 1.13
+++ driver.jelly 11 Jul 2002 13:37:11 -0000 1.14
@@ -22,6 +22,21 @@
/>
</j:if>
+ <path id="maven.dependency.classpath">
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <pathelement location="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
+ </j:forEach>
+ </path>
+
+ <path id="maven-classpath">
+ <fileset dir="${maven.home}/lib"/>
+ </path>
+
+ <property
+ name="maven-dependency-classpath"
+ refid="maven.dependency.classpath"
+ />
+
<!-- ================================================================== -->
<!-- M A V E N T A G L I B R A R Y -->
<!-- ================================================================== -->
1.2 +30 -0 jakarta-turbine-maven/src/bin/driver.properties
Index: driver.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driver.properties 9 Jul 2002 22:49:23 -0000 1.1
+++ driver.properties 11 Jul 2002 13:37:11 -0000 1.2
@@ -2,4 +2,34 @@
# D R I V E R P R O P E R T I E S
# -------------------------------------------------------------------
+# -------------------------------------------------------------------
+# M A V E N R E M O T E R E P O S
+# -------------------------------------------------------------------
+maven.repo.remote = http://jakarta.apache.org/turbine/jars2/
+
+# -------------------------------------------------------------------
+# M A V E N U P D A T E S I T E A N D S E L F U P D A T I N G
+# -------------------------------------------------------------------
+# This needs to be changed before prime time.
+maven.updateSite = http://www.apache.org/~jvanzyl/maven/update
+
+# -------------------------------------------------------------------
+# M A V E N D I S T R I B U T I O N S
+# -------------------------------------------------------------------
+maven.distBuildDirectory = ${basedir}/target
+maven.distBuildIndicator = DIST_BUILD_DIRECTORY
+maven.distDirectory = ${basedir}/dist
+
+# -------------------------------------------------------------------
+# E N V I R O N M E N T D E P E N D E N T T O O L S
+# -------------------------------------------------------------------
+maven.scp.executable = scp
+maven.ssh.executable = ssh
+
+# -------------------------------------------------------------------
+# Mark the defaults as loaded - PLEASE DON'T OVERRIDE
+# -------------------------------------------------------------------
+maven.defaults.loaded = true
+
+maven.build = MAVEN_BUILD_NOT_SET
maven.username=USERNAME_NOT_SET
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
