Author: fhanik
Date: Thu Mar 3 19:20:38 2011
New Revision: 1076736
URL: http://svn.apache.org/viewvc?rev=1076736&view=rev
Log:
Add missing files and license header
Add NOTICE/LICENSE to all JAR files
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/sign.sh
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1076736&r1=1076735&r2=1076736&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Mar 3 19:20:38
2011
@@ -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 -----
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1076736&r1=1076735&r2=1076736&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Mar 3 19:20:38 2011
@@ -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>
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=1076736&r1=1076735&r2=1076736&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Thu Mar 3 19:20:38 2011
@@ -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
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java?rev=1076736&view=auto
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
Thu Mar 3 19:20:38 2011
@@ -0,0 +1,39 @@
+/*
+ * 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 org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;
+
+public class Bug50571 extends DefaultTestCase{
+
+ public Bug50571(String name) {
+ super(name);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
this.datasource.setUrl("jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=FALSE");
+ this.datasource.setJdbcInterceptors(ConnectionState.class.getName());
+ this.datasource.setDefaultTransactionIsolation(-55);
+ this.datasource.setInitialSize(1);
+ }
+
+ public void testBug50571() throws Exception {
+ this.datasource.getConnection().close();
+ }
+}
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java?rev=1076736&r1=1076735&r2=1076736&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
Thu Mar 3 19:20:38 2011
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
