Author: kkolinko
Date: Tue Jun 30 17:42:09 2009
New Revision: 789845
URL: http://svn.apache.org/viewvc?rev=789845&view=rev
Log:
Fix build paths for embed target in build/build.xml
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=789845&r1=789844&r2=789845&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:42:09 2009
@@ -925,12 +925,12 @@
<target name="embed" description="Create a set of jars for embedded tomcat" >
<!-- Generic libraries -->
- <copy todir="embed/lib" file="${commons-logging.jar}"/>
- <copy todir="embed/lib" file="${commons-modeler.jar}"/>
+ <copy todir="${tomcat.embed}/lib" file="${commons-logging.jar}"/>
+ <copy todir="${tomcat.embed}/lib" file="${commons-modeler.jar}"/>
<!-- Connector -->
- <copy todir="embed/lib">
- <fileset dir="build/server/lib">
+ <copy todir="${tomcat.embed}/lib">
+ <fileset dir="${tomcat.build}/server/lib">
<!--<include name="tomcat-ajp.jar"/>-->
<include name="tomcat-coyote.jar"/>
<include name="tomcat-http.jar"/>
@@ -939,13 +939,13 @@
</copy>
<!-- Servlet API implementation -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
+ <copy todir="${tomcat.embed}/lib">
+ <fileset dir="${tomcat.build}/common/lib">
<include name="naming-factory.jar"/>
<include name="servlet-api.jar"/>
<include name="naming-resources.jar"/>
</fileset>
- <fileset dir="build/server/lib">
+ <fileset dir="${tomcat.build}/server/lib">
<include name="catalina.jar"/>
<include name="catalina-optional.jar"/>
<include name="servlets-default.jar"/>
@@ -953,16 +953,16 @@
</copy>
<!-- JNDI extra
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
+ <copy todir="${tomcat.embed}/lib">
+ <fileset dir="${tomcat.build}/common/lib">
<include name="naming-factory.jar"/>
</fileset>
</copy>
-->
<!-- JSP runtime -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
+ <copy todir="${tomcat.embed}/lib">
+ <fileset dir="${tomcat.build}/common/lib">
<include name="commons-el.jar"/>
<include name="jsp-api.jar"/>
<include name="jasper-runtime.jar"/>
@@ -971,24 +971,24 @@
<!-- JSP compiler - not needed for an minimal server if it
uses precompilation -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
+ <copy todir="${tomcat.embed}/lib">
+ <fileset dir="${tomcat.build}/common/lib">
<include name="jasper-compiler.jar"/>
<include name="jasper-compiler-jdt.jar"/>
</fileset>
</copy>
- <copy tofile="embed/build.xml" file="resources/mbeans/tomcat5-ant.xml" />
+ <copy tofile="${tomcat.embed}/build.xml"
file="resources/mbeans/tomcat5-ant.xml" />
<!--
- <copy tofile="embed/tomcat5-mbeans.xml"
file="resources/mbeans/tomcat5-mbeans.xml" />
- <copy tofile="embed/tomcat5-mlet.xml"
file="resources/mbeans/tomcat5-mlet.xml" />
- <copy tofile="embed/tomcat5-service.xml"
file="resources/mbeans/tomcat5-service.xml" />
+ <copy tofile="${tomcat.embed}/tomcat5-mbeans.xml"
file="resources/mbeans/tomcat5-mbeans.xml" />
+ <copy tofile="${tomcat.embed}/tomcat5-mlet.xml"
file="resources/mbeans/tomcat5-mlet.xml" />
+ <copy tofile="${tomcat.embed}/tomcat5-service.xml"
file="resources/mbeans/tomcat5-service.xml" />
-->
- <mkdir dir="embed/conf"/>
- <delete file="embed/conf/context.xml" />
- <copy todir="embed/conf">
- <fileset dir="build/conf">
+ <mkdir dir="${tomcat.embed}/conf"/>
+ <delete file="${tomcat.embed}/conf/context.xml" />
+ <copy todir="${tomcat.embed}/conf">
+ <fileset dir="${tomcat.build}/conf">
<include name="context.xml"/>
<include name="tomcat-users.xml"/>
<include name="web.xml"/>
@@ -997,14 +997,14 @@
-->
</fileset>
</copy>
- <replace file="embed/conf/context.xml" token="<Context"
value="<Context privileged='true'" />
+ <replace file="${tomcat.embed}/conf/context.xml" token="<Context"
value="<Context privileged='true'" />
- <mkdir dir="embed/webapps"/>
- <copy todir="embed/webapps" >
- <fileset dir="dist/webapps" includes="ROOT/**"/>
+ <mkdir dir="${tomcat.embed}/webapps"/>
+ <copy todir="${tomcat.embed}/webapps" >
+ <fileset dir="${tomcat.dist}/webapps" includes="ROOT/**"/>
</copy>
- <copy todir="embed/webapps" >
- <fileset dir="dist/server/webapps" includes="manager/**"/>
+ <copy todir="${tomcat.embed}/webapps" >
+ <fileset dir="${tomcat.dist}/server/webapps" includes="manager/**"/>
</copy>
</target>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789845&r1=789844&r2=789845&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:42:09 2009
@@ -109,11 +109,6 @@
+1: rjung, kkolinko
-1:
-* Fix build paths for embed target in build/build.xml
-
http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_build-paths-embed.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Make access log valves thread safe
http://people.apache.org/~markt/patches/2009-06-25-AccessLogValve-tc5.patch
+1: markt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
