You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/05/14 21:48:31 UTC
svn commit: r537960 - in /logging/log4j/branches/v1_2-branch: build.xml
pom.xml src/java/ src/main/ src/main/java/ tests/build.xml
Author: carnold
Date: Mon May 14 12:48:30 2007
New Revision: 537960
URL: http://svn.apache.org/viewvc?view=rev&rev=537960
Log:
Bug 37930: Move src/java to src/main/java
Added:
logging/log4j/branches/v1_2-branch/src/main/
logging/log4j/branches/v1_2-branch/src/main/java/
- copied from r537920, logging/log4j/branches/v1_2-branch/src/java/
Removed:
logging/log4j/branches/v1_2-branch/src/java/
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/tests/build.xml
Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=537960&r1=537959&r2=537960
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Mon May 14 12:48:30 2007
@@ -23,7 +23,7 @@
<project name="log4j" default="usage" basedir="." >
- <!-- The build.properties file defines the parth to local jar files -->
+ <!-- The build.properties file defines the path to local jar files -->
<property file="build.properties"/>
<!-- if a Maven build has been attempted,
@@ -46,7 +46,7 @@
<property name="deprecation" value="on"/>
<!-- The directory where source files are stored. -->
- <property name="java.source.dir" value="src/java/"/>
+ <property name="java.source.dir" value="src/main/java/"/>
<!-- The directory where the package-list file is found, ./ or -->
<!-- build/ -->
@@ -718,7 +718,7 @@
<copy todir="${dist.tmp}/apache-log4j-${version}">
<fileset dir="${base}"
- includes="src/java/**,
+ includes="src/main/java/**,
docs/**,
examples/**,
build/*,
@@ -737,7 +737,7 @@
**/Makefile, **/goEnv.bat,
docs/pub-support/*,
${dist.dir}/classes/org/**,
- src/java/org/apache/log4j/test/**/*,
+ src/main/java/org/apache/log4j/test/**/*,
**/.#*,
**/*.o, **/*.res, **/*.h, **/EventLogCategories.rc"/>
</copy>
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=537960&r1=537959&r2=537960
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Mon May 14 12:48:30 2007
@@ -103,7 +103,6 @@
</configuration>
</plugin>
</plugins>
- <sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>tests/src/java</testSourceDirectory>
</build>
<repositories>
Modified: logging/log4j/branches/v1_2-branch/tests/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/build.xml?view=diff&rev=537960&r1=537959&r2=537960
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/tests/build.xml Mon May 14 12:48:30 2007
@@ -44,7 +44,7 @@
<property name="base" value="."/>
<!-- The directory where source files are stored. -->
- <property name="project.source.home" value="../src/java/"/>
+ <property name="project.source.home" value="../src/main/java/"/>
<property name="project.classes.home" value="../dist/classes/"/>
<property name="project.lib.home" value="../dist/lib/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org