Add missing files and license header

Add NOTICE/LICENSE to all JAR files

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

diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default
index 23b40cf..46fcb47 100644 (file)
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=1
 version.build=0
-version.patch=0
+version.patch=1
 version.suffix=
 
 # ----- Default Base Path for Dependent Packages -----

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 0e82550..389b910 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -76,6 +76,11 @@
     <pathelement location="${h2.jar}"/>
   </path>
   
+  <fileset id="license.notice" dir="${basedir}">
+    <include name="NOTICE"/>
+    <include name="LICENSE"/>
+  </fileset>
+  
   <!-- Version info filter set -->
   <tstamp>
     <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
@@ -126,6 +131,7 @@
     <!-- connection pool API  file-->
     <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
       <fileset dir="${tomcat.api}"/>
+      <fileset refid="license.notice"/>
     </jar>
     <delete file="${basedir}/java/org/apache/tomcat/jdbc/pool/package.html"/>
   </target>
@@ -152,6 +158,7 @@
       <fileset dir="${basedir}/java">
         <include name="org/apache/tomcat/jdbc/**/*.xml" />
       </fileset>
+      <fileset refid="license.notice"/>
     </jar>
 
     <!-- connection pool source file-->
@@ -159,6 +166,7 @@
       <fileset dir="${basedir}/java">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
+      <fileset refid="license.notice"/>
     </jar>
   </target>
 
@@ -184,11 +192,13 @@
       <fileset dir="${basedir}/test">
         <include name="org/apache/tomcat/jdbc/**/*.xml" />
       </fileset>
+      <fileset refid="license.notice"/>
     </jar>
     <jar jarfile="${tomcat-jdbc-test-src.jar}" update="true">
       <fileset dir="${basedir}/test">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
+      <fileset refid="license.notice"/>
     </jar>
   </target>
 

diff --git a/modules/jdbc-pool/sign.sh b/modules/jdbc-pool/sign.sh
index 3b67642..d589140 100755 (executable)
--- a/modules/jdbc-pool/sign.sh
+++ b/modules/jdbc-pool/sign.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION=v1.1.0.0
+VERSION=v1.1.0.1
 for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
   echo Signing $i
   echo $1|gpg --passphrase-fd 0 -a -b $i

diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
new file mode 100644 (file)
index 0000000..8a5650c
--- /dev/null
+++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
@@ -0,0 +1,39 @@
+/*\r
+ * Licensed to the Apache Software Foundation (ASF) under one or more\r
+ * contributor license agreements.  See the NOTICE file distributed with\r
+ * this work for additional information regarding copyright ownership.\r
+ * The ASF licenses this file to You under the Apache License, Version 2.0\r
+ * (the "License"); you may not use this file except in compliance with\r
+ * the License.  You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+package org.apache.tomcat.jdbc.test;\r
+\r
+import org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;\r
+\r
+public class Bug50571 extends DefaultTestCase{\r
+    \r
+    public Bug50571(String name) {\r
+        super(name);\r
+    }\r
+    \r
+    @Override\r
+    public void setUp() throws Exception {\r
+        super.setUp();\r
+        this.datasource.setUrl("jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE");\r
+        this.datasource.setJdbcInterceptors(ConnectionState.class.getName());\r
+        this.datasource.setDefaultTransactionIsolation(-55);\r
+        this.datasource.setInitialSize(1);\r
+    }\r
+    \r
+    public void testBug50571() throws Exception {\r
+        this.datasource.getConnection().close();\r
+    }\r
+}\r

diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
index 3605e1e..80fc23e 100644 (file)
--- a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
+++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.tomcat.jdbc.test;
 
 import java.sql.Connection;