Author: markt
Date: Mon Mar 25 20:19:52 2013
New Revision: 1460873
URL: http://svn.apache.org/r1460873
Log:
Fix extras logging build broken by upgrade to CL 1.1.2. The change of source
path needed to replicated in more places.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1460873&r1=1460872&r2=1460873&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Mar 25 20:19:52 2013
@@ -1365,8 +1365,8 @@
<replacefilter token="org.apache.commons"
value="org.apache.juli" />
</replace>
- <mkdir
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/juli"
/>
- <move
todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/juli">
+ <mkdir
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/juli"
/>
+ <move
todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/juli">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
/>
</move>
@@ -1429,7 +1429,7 @@
<!-- Source JARs -->
<jar jarfile="${tomcat-juli-extras-src.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.java" />
<include name="org/apache/juli/logging/impl/WeakHashtable*.java" />
@@ -1452,7 +1452,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jarIt jarfile="${tomcat-juli-adapters-src.jar}"
-
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java"
+
filesDir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java"
filesId="files.tomcat-extras-juli-adapters" />
</target>
@@ -1558,7 +1558,7 @@
<jar jarfile="${tomcat-embed-log4j-src.jar}"
manifest="${tomcat.manifests}/default.manifest" >
- <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java">
+ <fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/*.java" />
<!-- Javadoc and i18n exclusions -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
