Add manifest to binary JAR

Fix XML error in doc

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@792969 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 119694d..2da561d 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -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>

diff --git a/modules/jdbc-pool/doc/jdbc-pool.xml b/modules/jdbc-pool/doc/jdbc-pool.xml
index aa1863f..f9d5768 100644 (file)
--- a/modules/jdbc-pool/doc/jdbc-pool.xml
+++ b/modules/jdbc-pool/doc/jdbc-pool.xml
@@ -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 . \