tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r792969 - in /tomcat/trunk/modules/jdbc-pool: build.xml doc/jdbc-pool.xml
Date Fri, 10 Jul 2009 15:03:44 GMT
Author: fhanik
Date: Fri Jul 10 15:03:43 2009
New Revision: 792969

URL: http://svn.apache.org/viewvc?rev=792969&view=rev
Log:
Add manifest to binary JAR
Fix XML error in doc

Modified:
    tomcat/trunk/modules/jdbc-pool/build.xml
    tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=792969&r1=792968&r2=792969&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Fri Jul 10 15:03:43 2009
@@ -77,9 +77,11 @@
         <include name="NOTICE"/>
         <include name="build.xml"/>
         <include name="doc/*.xml"/>
+        <include name="resources/MANIFEST.MF"/>
       </fileset>
       <filterset>
         <filter token="tomcat.project.dest" value="${project.xml}"/>
+        <filter token="version" value="${version}"/>
       </filterset>  
     </copy>
   </target>
@@ -107,7 +109,7 @@
     </javac>
 
     <!-- connection pool JAR File -->
-    <jar jarfile="${tomcat-jdbc.jar}" update="true">
+    <jar jarfile="${tomcat-jdbc.jar}" update="true" manifest="${tomcat.pool}/resources/MANIFEST.MF">
       <fileset dir="${tomcat.classes}">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>

Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=792969&r1=792968&r2=792969&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Fri Jul 10 15:03:43 2009
@@ -693,7 +693,7 @@
   <p>We build the JDBC pool code with 1.6, but it is backwards compatible down to 1.5
for runtime environment. For unit test, we use 1.6 and higher</p>
   <p>Other examples of Tomcat configuration for JDBC usage can be found <a href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html">in
the Tomcat documentation</a>. </p>
   <subsection name="Building from source">
-    <p>Building is pretty simple. The pool has a dependency on <code>tomcat-juli.jar</code>
and in case you want the <code>SlowQueryReportJmx</code>
+    <p>Building is pretty simple. The pool has a dependency on <code>tomcat-juli.jar</code>
and in case you want the <code>SlowQueryReportJmx</code></p>
     <source>
        javac -classpath tomcat-juli.jar \
              -d . \



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message