Author: yoavs
Date: Sat Oct 15 23:03:39 2005
New Revision: 322455
URL: http://svn.apache.org/viewcvs?rev=322455&view=rev
Log:
More dependency consolidation.
Modified:
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/build.xml?rev=322455&r1=322454&r2=322455&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/build.xml (original)
+++ tomcat/container/tc5.5.x/catalina/build.xml Sat Oct 15 23:03:39 2005
@@ -60,7 +60,6 @@
<pathelement location="${jaas.jar}"/>
<pathelement location="${javagroups.jar}"/>
<pathelement location="${jcert.jar}"/>
- <pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${jmx.jar}"/>
<pathelement location="${jmx-remote.jar}"/>
<pathelement location="${jndi.jar}"/>
@@ -92,7 +91,6 @@
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${jaas.jar}"/>
<pathelement location="${jcert.jar}"/>
- <pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${jmx.jar}"/>
<pathelement location="${jndi.jar}"/>
<pathelement location="${jnet.jar}"/>
@@ -200,14 +198,9 @@
classpath="${jsse.jar}" />
</and>
</condition>
- <condition property="jta.present">
- <and>
- <available classname="javax.sql.XADataSource"
- classpath="${jdbc20ext.jar}" />
- <available classname="javax.transaction.UserTransaction"
- classpath="${jta.jar}" />
- </and>
- </condition>
+ <available property="jta.present"
+ classname="javax.transaction.UserTransaction"
+ classpath="${jta.jar}" />
<available property="junit.present"
classname="junit.framework.TestCase"
classpath="${junit.jar}" />
@@ -234,7 +227,6 @@
<available file="${mail.jar}" />
</and>
</condition>
- <available property="jdbc20ext.jar.present" file="${jdbc20ext.jar}" />
<available property="jmx.jar.present" file="${jmx.jar}" />
<available property="jcert.jar.present" file="${jcert.jar}" />
<available property="jndi.jar.present" file="${jndi.jar}" />
@@ -448,7 +440,6 @@
<echo message="fileupload.jar.present=${fileupload.jar.present}" />
<echo message="jaas.jar.present=${jaas.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
- <echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
<echo message="jmx.jar.present=${jmx.jar.present}" />
<echo message="jta.jar.present=${jta.jar.present}" />
<echo message="junit.jar.present=${junit.jar.present}" />
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=322455&r1=322454&r2=322455&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Oct 15 23:03:39 2005
@@ -35,6 +35,13 @@
<update>
Removed unused SAXPath, Jaxen dependencies. (yoavs)
</update>
+ <update>
+ Update log4j dependency to version 1.2.12, Struts to 1.2.7. (yoavs)
+ </update>
+ <update>
+ Removed JDBC 2.0 StdExt dependency (only class from there is
javax.sql.XADataSource, which is
+ present in JDK 1.4 and later. (yoavs)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
