vmassol 2002/06/01 10:50:50
Modified: . build-bootstrap.xml project.xml
Log:
remove log4j warnings by including a log4j.properties file in the maven jar, which
outputs by default all maven logs to a maven.log file
Revision Changes Path
1.92 +21 -8 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- build-bootstrap.xml 1 Jun 2002 03:31:55 -0000 1.91
+++ build-bootstrap.xml 1 Jun 2002 17:50:50 -0000 1.92
@@ -24,6 +24,11 @@
value="${maven.bootstrap.dir}/classes"
/>
+ <property
+ name="maven.conf.dir"
+ value="src/conf"
+ />
+
<path id="pre-bootstrap-classpath">
<pathelement location="${maven.bootstrap.classes}"/>
</path>
@@ -239,6 +244,12 @@
<exclude name="org/apache/maven/ProjectResolver*"/>
</javac>
+ <!--
+ Copy Maven configuration files that need to be in the maven jar
+ -->
+ <copy file="${maven.conf.dir}/log4j.properties"
+ todir="${maven.bootstrap.classes}"/>
+
<!--
After we have compiled the classes required to generate
the build system we need to make a temporary bootstrap
@@ -250,12 +261,14 @@
maven.jar with the completely populated maven.jar.
-->
- <jar
- jarfile="${lib.repo}/maven.jar"
- basedir="${maven.bootstrap.classes}"
- excludes="**/package.html"
- />
-
+ <jar jarfile="${lib.repo}/maven.jar">
+ <fileset dir="${maven.bootstrap.classes}">
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </jar>
+
</target>
<!-- ================================================================== -->
@@ -306,8 +319,8 @@
</copy>
<!--
- Make the examples directory in the Maven install that will
- allow a user to easily create a sample Maven project.
+ Make the examples directory in the Maven install that will
+ allow a user to easily create a sample Maven project.
-->
<copy
1.88 +1 -0 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- project.xml 1 Jun 2002 03:31:55 -0000 1.87
+++ project.xml 1 Jun 2002 17:50:50 -0000 1.88
@@ -387,6 +387,7 @@
<jarResources>
<jarResource>include = *.dtd</jarResource>
+ <jarResource>include = log4j.properties</jarResource>
</jarResources>
<jars>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
