Author: kkolinko
Date: Tue Jun 30 17:23:54 2009
New Revision: 789836

URL: http://svn.apache.org/viewvc?rev=789836&view=rev
Log:
Use different (not the same) values for ${tomcat-dbcp.home} and 
${jasper-compiler-jdt.home}.
In TC 6.0 they are already different, but were not in 5.5.

Modified:
    tomcat/build/tc5.5.x/build.xml
    tomcat/container/tc5.5.x/webapps/docs/changelog.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=789836&r1=789835&r2=789836&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jun 30 17:23:54 2009
@@ -76,10 +76,10 @@
   <property name="tomcat.release"   value="${basedir}/release"/>
   <property name="webapps.build"    value="${catalina.home}/webapps/build"/>
   <property name="webapps.dist"     value="${catalina.home}/webapps/dist"/>
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
+  <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps/dbcp" />
   <property name="tomcat-dbcp.jar"
        value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
-  <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
+  <property name="jasper-compiler-jdt.home" 
value="${base.path}/tomcat-deps/jdt" />
   <property name="jasper-compiler-jdt.jar"
        value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=789836&r1=789835&r2=789836&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jun 30 17:23:54 2009
@@ -42,6 +42,10 @@
       <update>
         Update to NSIS 2.44 (kkolinko)
       </update>
+      <update>
+        Build scripts: use different values for ${tomcat-dbcp.home} and
+        ${jasper-compiler-jdt.home} in tomcat-deps. (kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Catalina">

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=789836&r1=789835&r2=789836&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun 30 17:23:54 2009
@@ -126,12 +126,6 @@
   +1: kkolinko, markt, rjung
   -1:
 
-* Use different (not the same) values for ${tomcat-dbcp.home} and 
${jasper-compiler-jdt.home}.
-  In TC 6.0 they are already different, but were not in 5.5.
-  http://people.apache.org/~kkolinko/patches/2009-06-24_tc55_deps-home.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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to