You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2002/12/08 00:12:11 UTC
cvs commit: jakarta-turbine-maven/src/test/touchstone-build/src/conf log4j.properties
jvanzyl 2002/12/07 15:12:11
Modified: src/test/touchstone-build maven.xml project.xml
Added: src/test/touchstone-build/src/conf log4j.properties
Log:
o Cleaning up the touchstone build, going to hook it into the bootstrap.
Revision Changes Path
1.2 +1 -8 jakarta-turbine-maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 15 Nov 2002 23:56:26 -0000 1.1
+++ maven.xml 7 Dec 2002 23:12:10 -0000 1.2
@@ -1,10 +1,3 @@
-<project default="java:jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:ant="jelly:ant"
- xmlns:m="maven"
- xmlns:reactor="reactor"
- xmlns:deploy="deploy"
- xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary">
+<project>
</project>
1.5 +7 -35 jakarta-turbine-maven/src/test/touchstone-build/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 15 Nov 2002 15:11:25 -0000 1.4
+++ project.xml 7 Dec 2002 23:12:11 -0000 1.5
@@ -93,26 +93,6 @@
<dependencies>
<dependency>
- <id>dom4j</id>
- <version>1.4-dev-8</version>
- <url>http://www.dom4j.org/</url>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5</version>
- <url>http://jakarta.apache.org/ant/</url>
- </dependency>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5</version>
- <url>http://jakarta.apache.org/ant/</url>
- </dependency>
-
- <dependency>
<id>a</id>
<version>1.0</version>
</dependency>
@@ -126,7 +106,7 @@
<build>
<nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
<sourceDirectory>src/main</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
@@ -135,21 +115,13 @@
</unitTest>
<resources>
- <includes>
- <include>*.xsd</include>
- <include>*.dtd</include>
- <include>*.mod</include>
- <include>log4j.properties</include>
- <include>driver.jelly</include>
- <include>driver.properties</include>
- </includes>
+ <resource>
+ <directory>src/conf</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
</resources>
</build>
-
- <properties>
- <testName>${propertyOneValue}</testName>
- <pomProperty>${pomProperty}</pomProperty>
- </properties>
-
</project>
1.1 jakarta-turbine-maven/src/test/touchstone-build/src/conf/log4j.properties
Index: log4j.properties
===================================================================
# ------------------------------------------------------------------------
# L O G 4 J C O N F I G U R A T I O N
# ------------------------------------------------------------------------
# This is the log4j configuration file that is distributed with Maven.
# ------------------------------------------------------------------------
# ------------------------------------------------------------------------
# R O O T C A T E G O R Y
# ------------------------------------------------------------------------
log4j.rootCategory = DEBUG, default
log4j.appender.default = org.apache.log4j.FileAppender
log4j.appender.default.file = maven.log
log4j.appender.default.layout = org.apache.log4j.PatternLayout
log4j.appender.default.layout.conversionPattern = %d %-5p %c - %m%n
log4j.appender.default.append = false
# ------------------------------------------------------------------------
# J E L L Y T A G S
# ------------------------------------------------------------------------
log4j.category.org.apache.commons.jelly.tags.log=INFO,console
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%m%n
# ------------------------------------------------------------------------
# M A V E N
# ------------------------------------------------------------------------
log4j.category.org.apache.maven.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
# ------------------------------------------------------------------------
# C O M M O N S
# ------------------------------------------------------------------------
log4j.category.org.apache.commons=WARN