dion 2003/08/18 21:19:01
Modified: src/conf log4j.properties driver.jelly
Log:
Switch stable branch back to HEAD
Revision Changes Path
1.16 +1 -1 maven/src/conf/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/maven/src/conf/log4j.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- log4j.properties 31 Dec 2002 07:28:17 -0000 1.15
+++ log4j.properties 19 Aug 2003 04:19:01 -0000 1.16
@@ -25,7 +25,7 @@
# ------------------------------------------------------------------------
# M A V E N
# ------------------------------------------------------------------------
-log4j.category.org.apache.maven.MavenSession=INFO,maven
+log4j.category.org.apache.maven=INFO,maven
log4j.appender.maven=org.apache.log4j.ConsoleAppender
log4j.appender.maven.layout=org.apache.log4j.PatternLayout
log4j.appender.maven.layout.ConversionPattern=%m%n
1.27 +44 -4 maven/src/conf/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/maven/src/conf/driver.jelly,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- driver.jelly 4 Aug 2003 02:53:06 -0000 1.26
+++ driver.jelly 19 Aug 2003 04:19:01 -0000 1.27
@@ -6,10 +6,50 @@
xmlns:define="jelly:define"
xmlns:util="jelly:util">
- <!-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- |
- | THIS FILE IS NO LONGER IN USE BY MAVEN AND WILL BE DELETED
- |-->
+ <!-- ================================================================== -->
+ <!-- D R I V E R I N I T I A L I Z A T I O N -->
+ <!-- ================================================================== -->
+ <!-- All things we want to provide to all plugins, or processes we -->
+ <!-- performed before every build are declared/defined here. -->
+ <!-- ================================================================== -->
+ <j:set var="dir__" value="${pom.build.sourceDirectory}X"/>
+ <j:if test="${dir__ != 'X'}">
+ <available
+ property="sourcesPresent"
+ file="${pom.build.sourceDirectory}"
+ />
+ </j:if>
+
+ <j:set var="dir__" value="${pom.build.unitTestSourceDirectory}X"/>
+ <j:if test="${dir__ != 'X'}">
+ <available
+ property="unitTestSourcesPresent"
+ file="${pom.build.unitTestSourceDirectory}"
+ />
+ </j:if>
+
+ <path id="maven-classpath">
+ <fileset dir="${maven.home}/lib"/>
+ </path>
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <!--
+ | FIXME: It would be nice for other plugins to have the source available
+ | as a fileset
+ |-->
+ <path id="maven.compile.src.set">
+ <pathelement location="${pom.build.sourceDirectory}"/>
+ </path>
+ </j:if>
+
+ <j:if test="${unitTestSourcesPresent == 'true'}">
+ <path id="maven.test.compile.src.set">
+ <pathelement location="${pom.build.unitTestSourceDirectory}"/>
+ </path>
+ </j:if>
+
+ <goal name="build:end">
+ </goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
