svn commit: r799182 - /tomcat/trunk/extras.xml
Author: markt
Date: Thu Jul 30 06:35:54 2009
New Revision: 799182
URL: http://svn.apache.org/viewvc?rev=799182view=rev
Log:
Follow up to https://issues.apache.org/bugzilla/show_bug.cgi?id=47567
Add descriptions to the extras build script
Modified:
tomcat/trunk/extras.xml
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=799182r1=799181r2=799182view=diff
==
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Thu Jul 30 06:35:54 2009
@@ -82,11 +82,12 @@
mkdir dir=${tomcat.extras}/
/target
- target name=clean
+ target name=clean description=Delete the default output folders
delete dir=${tomcat.extras}/
/target
- target name=commons-logging
+ target name=commons-logging depends=prepare
+ description=Build JULI for log4j extras package
antcall target=downloadfile
param name=sourcefile value=${commons-logging-src.loc}/
@@ -169,7 +170,8 @@
/target
- target name=webservices
+ target name=webservices depends=prepare
+ description=Build web services extras package
mkdir dir=${tomcat.extras}/webservices/
@@ -219,7 +221,8 @@
/target
- target name=jmx-remote
+ target name=jmx-remote depends=prepare
+ description=Build JMX remote extras package
!-- Create the JAR file --
jar jarfile=${catalina-jmx-remote.jar}
fileset dir=${tomcat.classes}
@@ -232,7 +235,8 @@
/target
- target name=extras
depends=prepare,commons-logging,webservices,jmx-remote
+ target name=extras
depends=prepare,commons-logging,webservices,jmx-remote
+ description=Build all extras packages
/target
!-- Download and dependency building --
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799187 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Thu Jul 30 07:01:13 2009
New Revision: 799187
URL: http://svn.apache.org/viewvc?rev=799187view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47568
Create the tmp dir where intended
Remove it when we are done
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=799187r1=799186r2=799187view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Jul 30
07:01:13 2009
@@ -54,12 +54,12 @@
public void setUp() throws Exception {
t0 = System.currentTimeMillis();
-tempDir = new File(output/tmp);
+tempDir = new File(base + output/tmp);
tempDir.mkdir();
tomcat = new Tomcat();
-tomcat.getHost().setAppBase(tempDir.getAbsolutePath());
tomcat.setBaseDir(tempDir.getAbsolutePath());
+tomcat.getHost().setAppBase(tempDir.getAbsolutePath() + /webapps);
// If each test is running on same port - they
// may interfere with each other (on unix at least)
@@ -71,6 +71,7 @@
tomcat.stop();
System.err.println(Test time: +
(System.currentTimeMillis() - t0));
+ExpandWar.delete(tempDir);
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47568] TestTomcat fails to delete work directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=47568 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-07-30 00:01:30 PST --- Thanks for the report. This has been fixed in trunk. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799189 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Thu Jul 30 07:02:51 2009
New Revision: 799189
URL: http://svn.apache.org/viewvc?rev=799189view=rev
Log:
Fix warning
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=799189r1=799188r2=799189view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Jul 30
07:02:51 2009
@@ -46,6 +46,9 @@
* Simple servlet to test in-line registration
*/
public static class HelloWorld extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException {
res.getWriter().write(Hello world);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Can Tomcat Native be used to write SSL clients?
Apologies if this is the wrong list to ask, but I couldn't find a mailing list dedicated to Tomcat Native. I have a need to write an SSL client, in Java, using OpenSSL (because OpenSSL supports some features that are not supported by JSSE). I've noticed that there's a server example in the Tomcat Native distribution but no mention of clients. I also need to retain I/O control, exchanging buffers with OpenSSL without letting it work with my sockets directly. Is this possible? Any help and pointers would be greatly appreciated. -- Ivan Ristic Test your SSL server @ SSL Labs https://www.ssllabs.com/ssldb/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47378] welcome-file ignores servlet mapping
https://issues.apache.org/bugzilla/show_bug.cgi?id=47378 --- Comment #10 from Tim Funk funk...@apache.org 2009-07-30 08:01:55 PST --- Created an attachment (id=24065) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24065) Patch against tomcat 6.0 Here is a working patch. (At least in a simple test case) Previous attempt was wrong on s many levels. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
ISAPI Redirect and uriworkers.properties
Does anyone know if it's possible to filter by port number? I have an application running on port 3030 in Apache that also runs securely on port 8443. Incoming connections come to IIS on ports 80 and 443 respectively and are picked up by the ISAPI redirect filter (URL is /ufs). What I want to do is map the 80 connections 3030 and the 443 to 8443. At the moment, all /ufs requests go to 3030 as I can't seem to differentiate. Can anyone help? Thanks -- View this message in context: http://www.nabble.com/ISAPI-Redirect-and-uriworkers.properties-tp24742761p24742761.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799384 - /tomcat/trunk/test/org/apache/TestAll.java
Author: markt
Date: Thu Jul 30 17:54:20 2009
New Revision: 799384
URL: http://svn.apache.org/viewvc?rev=799384view=rev
Log:
Add missing test
Re-arrange to try and make it easier to see what is what
Modified:
tomcat/trunk/test/org/apache/TestAll.java
Modified: tomcat/trunk/test/org/apache/TestAll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=799384r1=799383r2=799384view=diff
==
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Thu Jul 30 17:54:20 2009
@@ -1,5 +1,6 @@
package org.apache;
+import org.apache.catalina.connector.TestRequest;
import org.apache.catalina.ha.session.TestSerializablePrincipal;
import org.apache.catalina.startup.TestTomcat;
import org.apache.catalina.tribes.test.TribesTestSuite;
@@ -15,18 +16,24 @@
public static Test suite() {
TestSuite suite = new TestSuite(Test for org.apache);
-// o.a.catalina.ha.session
+// o.a.catalina
+// connector
+suite.addTestSuite(TestRequest.class);
+// ha.session
suite.addTestSuite(TestSerializablePrincipal.class);
-// o.a.catalina.startup
+// startup
suite.addTestSuite(TestTomcat.class);
-// o.a.tomcat.util.http
-suite.addTestSuite(TestCookies.class);
-// Tribes
+// tribes
// suite.addTest(TribesTestSuite.suite());
+
// o.a.el
suite.addTestSuite(TestELSupport.class);
suite.addTestSuite(TestELEvaluation.class);
+
// o.a.tomcat.util
+// http
+suite.addTestSuite(TestCookies.class);
+// res
suite.addTestSuite(TestStringManager.class);
return suite;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47567] Add description for default build target
https://issues.apache.org/bugzilla/show_bug.cgi?id=47567 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-07-30 11:07:24 PST --- Thanks for the heads up. This has been fixed in trunk and will be included in 7.0.0 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799391 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java
Author: markt
Date: Thu Jul 30 18:09:12 2009
New Revision: 799391
URL: http://svn.apache.org/viewvc?rev=799391view=rev
Log:
Move the instance creation and clean-up to a base class so it can be re-used.
Added:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java
Added: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java?rev=799391view=auto
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java (added)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatBase.java Thu Jul
30 18:09:12 2009
@@ -0,0 +1,65 @@
+/*
+ * 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.catalina.startup;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * Base test case that provides a Tomcat instance for each test - mainly so we
+ * don't have to keep writing the cleanup code.
+ */
+public class TestTomcatBase extends TestCase {
+private Tomcat tomcat;
+private File tempDir;
+private static int port = 8001;
+
+/**
+ * Make Tomcat instance accessible to sub-classes.
+ */
+public Tomcat getTomcatInstance() {
+return tomcat;
+}
+
+/**
+ * Sub-classes need to know port so they can connect
+ */
+public int getPort() {
+return port;
+}
+
+public void setUp() throws Exception {
+tempDir = new File(output/tmp);
+tempDir.mkdir();
+
+tomcat = new Tomcat();
+tomcat.setBaseDir(tempDir.getAbsolutePath());
+tomcat.getHost().setAppBase(tempDir.getAbsolutePath() + /webapps);
+
+// If each test is running on same port - they
+// may interfere with each other (on unix at least)
+port++;
+tomcat.setPort(port);
+}
+
+public void tearDown() throws Exception {
+tomcat.stop();
+ExpandWar.delete(tempDir);
+}
+
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799392 - in /tomcat/trunk/test/org/apache/catalina: connector/TestRequest.java startup/TestTomcat.java
Author: markt
Date: Thu Jul 30 18:10:35 2009
New Revision: 799392
URL: http://svn.apache.org/viewvc?rev=799392view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47569
Use the new base class so tests clean up after themselves
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=799392r1=799391r2=799392view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Thu Jul 30
18:10:35 2009
@@ -38,14 +38,23 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.TestTomcatBase;
import org.apache.catalina.startup.Tomcat;
-import junit.framework.TestCase;
-
/**
* Test case for {...@link Request}.
*/
-public class TestRequest extends TestCase {
+public class TestRequest extends TestTomcatBase {
+@Override
+public void setUp() throws Exception {
+super.setUp();
+}
+
+@Override
+public void tearDown() throws Exception {
+super.tearDown();
+}
+
/**
* Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=37794
* POST parameters are not returned from a call to
@@ -54,6 +63,7 @@
*/
public void testBug37794() throws Exception {
Bug37794Client client = new Bug37794Client();
+client.setPort(getPort());
// Edge cases around zero
client.doRequest(-1, false); // Unlimited
@@ -97,6 +107,8 @@
private static class Bug37794Servlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
/**
* Only interested in the parameters and values for POST requests.
*/
@@ -120,15 +132,28 @@
/**
* Bug 37794 test client.
*/
-private static class Bug37794Client extends SimpleHttpClient {
+private class Bug37794Client extends SimpleHttpClient {
+
+private boolean init;
+
+private synchronized void init() throws Exception {
+if (init) return;
+
+Tomcat tomcat = getTomcatInstance();
+StandardContext root = tomcat.addContext(, TEMP_DIR);
+Tomcat.addServlet(root, Bug37794, new Bug37794Servlet());
+root.addServletMapping(/test, Bug37794);
+tomcat.start();
+
+init = true;
+}
+
private Exception doRequest(int postLimit, boolean ucChunkedHead) {
-Tomcat tomcat = new Tomcat();
+Tomcat tomcat = getTomcatInstance();
+
try {
-StandardContext root = tomcat.addContext(, TEMP_DIR);
-Tomcat.addServlet(root, Bug37794, new Bug37794Servlet());
-root.addServletMapping(/test, Bug37794);
+init();
tomcat.getConnector().setMaxPostSize(postLimit);
-tomcat.start();
// Open connection
connect();
@@ -167,12 +192,6 @@
disconnect();
} catch (Exception e) {
return e;
-} finally {
-try {
-tomcat.stop();
-} catch (Exception e) {
-// Ignore
-}
}
return null;
}
@@ -209,6 +228,7 @@
private Socket socket;
private Writer writer;
private BufferedReader reader;
+private int port = 8080;
private String[] request;
private int requestPause = 1000;
@@ -217,6 +237,10 @@
private ListString responseHeaders = new ArrayListString();
private String responseBody;
+public void setPort(int thePort) {
+port = thePort;
+}
+
public void setRequest(String[] theRequest) {
request = theRequest;
}
@@ -238,7 +262,7 @@
}
public void connect() throws UnknownHostException, IOException {
-socket = new Socket(localhost, 8080);
+socket = new Socket(localhost, port);
OutputStream os = socket.getOutputStream();
writer = new OutputStreamWriter(os);
InputStream is = socket.getInputStream();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=799392r1=799391r2=799392view=diff
==
---
DO NOT REPLY [Bug 47569] Test cases do not clear up afterwards
https://issues.apache.org/bugzilla/show_bug.cgi?id=47569 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2009-07-30 11:10:44 PST --- Fix in trunk and will be included in 7.0.0 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799396 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: FairBlockingQueue.java MultiLockFairBlockingQueue.java
Author: markt
Date: Thu Jul 30 18:13:36 2009
New Revision: 799396
URL: http://svn.apache.org/viewvc?rev=799396view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=47576
Fix exception name in Javadoc
Patch provided by sebb
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=799396r1=799395r2=799396view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
Thu Jul 30 18:13:36 2009
@@ -266,7 +266,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public int drainTo(Collection? super E c, int maxElements) {
throw new UnsupportedOperationException(int drainTo(Collection?
super E c, int maxElements));
@@ -274,7 +274,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public int drainTo(Collection? super E c) {
@@ -316,7 +316,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public void clear() {
throw new UnsupportedOperationException(void clear());
@@ -325,7 +325,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public boolean containsAll(Collection? c) {
throw new UnsupportedOperationException(boolean
containsAll(Collection? c));
@@ -340,7 +340,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public boolean removeAll(Collection? c) {
throw new UnsupportedOperationException(boolean
removeAll(Collection? c));
@@ -348,7 +348,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public boolean retainAll(Collection? c) {
throw new UnsupportedOperationException(boolean
retainAll(Collection? c));
@@ -356,7 +356,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public Object[] toArray() {
throw new UnsupportedOperationException(Object[] toArray());
@@ -364,7 +364,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public T T[] toArray(T[] a) {
throw new UnsupportedOperationException(T T[] toArray(T[] a));
@@ -372,7 +372,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public E element() {
throw new UnsupportedOperationException(E element());
@@ -380,7 +380,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public E peek() {
throw new UnsupportedOperationException(E peek());
@@ -388,7 +388,7 @@
/**
* {...@inheritdoc}
- * @throws UnsupportedOperation - this operation is not supported
+ * @throws UnsupportedOperationException - this operation is not supported
*/
public E remove() {
throw new UnsupportedOperationException(E remove());
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java?rev=799396r1=799395r2=799396view=diff
==
---
DO NOT REPLY [Bug 47576] Javadoc errors - Exception name misspelt
https://issues.apache.org/bugzilla/show_bug.cgi?id=47576 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas ma...@apache.org 2009-07-30 11:13:50 PST --- Thanks for the patch. It has been applied to trunk. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799399 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java DataSource.java DataSourceFactory.java DataSourceProxy.java PooledConnection.java jmx/Con
Author: markt Date: Thu Jul 30 18:25:37 2009 New Revision: 799399 URL: http://svn.apache.org/viewvc?rev=799399view=rev Log: Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 Remove unused imports. Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=799399r1=799398r2=799399view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Thu Jul 30 18:25:37 2009 @@ -16,7 +16,6 @@ */ package org.apache.tomcat.jdbc.pool; -import java.lang.management.ManagementFactory; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; @@ -36,9 +35,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.MBeanServer; -import javax.management.ObjectName; - import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=799399r1=799398r2=799399view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java Thu Jul 30 18:25:37 2009 @@ -17,9 +17,7 @@ package org.apache.tomcat.jdbc.pool; import java.lang.management.ManagementFactory; -import java.sql.SQLException; import java.util.Hashtable; -import java.util.Properties; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistration; @@ -27,8 +25,6 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition; - /** * A DataSource that can be instantiated through IoC and implements the DataSource interface Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=799399r1=799398r2=799399view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Thu Jul 30 18:25:37 2009 @@ -17,14 +17,8 @@ package org.apache.tomcat.jdbc.pool; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.sql.Connection; -import java.util.HashMap; import java.util.Hashtable; import java.util.Properties; Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=799399r1=799398r2=799399view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Thu Jul 30 18:25:37 2009 @@ -22,9 +22,6 @@ import java.util.Iterator; import java.util.Properties; import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java URL:
svn commit: r799400 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java jmx/ConnectionPoolMBean.java
Author: markt
Date: Thu Jul 30 18:29:30 2009
New Revision: 799400
URL: http://svn.apache.org/viewvc?rev=799400view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577
Imports / casts
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=799400r1=799399r2=799400view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Jul 30 18:29:30 2009
@@ -161,7 +161,7 @@
*/
public Connection getConnection() throws SQLException {
//check out a connection
-PooledConnection con = (PooledConnection)borrowConnection(-1);
+PooledConnection con = borrowConnection(-1);
return setupConnection(con);
}
@@ -770,9 +770,9 @@
*/
protected boolean shouldAbandon() {
if (poolProperties.getAbandonWhenPercentageFull()==0) return true;
-float used = (float)busy.size();
-float max = (float)poolProperties.getMaxActive();
-float perc = (float)poolProperties.getAbandonWhenPercentageFull();
+float used = busy.size();
+float max = poolProperties.getMaxActive();
+float perc = poolProperties.getAbandonWhenPercentageFull();
return (used/max*100f)=perc;
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=799400r1=799399r2=799400view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
Thu Jul 30 18:29:30 2009
@@ -15,8 +15,6 @@
*/
package org.apache.tomcat.jdbc.pool.jmx;
-import java.util.Properties;
-
import org.apache.tomcat.jdbc.pool.PoolConfiguration;
public interface ConnectionPoolMBean extends PoolConfiguration {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47609] New: Failsafe EOL conversion
https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Summary: Failsafe EOL conversion
Product: Tomcat 5
Version: 5.5.27
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Native:Packaging
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org
Created an attachment (id=24066)
-- (https://issues.apache.org/bugzilla/attachment.cgi?id=24066)
List of extensions used in 5.5.28
The builds/build.xml file has the following code:
target name=package-src-tgz
fixcrlf srcdir=${tomcat.dist}/src
excludes=**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war
eol=lf
encoding=ISO-8859-1 fixlast=false /
The intention is to fix all the source files so that they are readable on Unix
(LF) systems.
However, the command is inherently unsafe - if a new binary file is added with
an extension that is not listed, then the file will be damaged. In general it
is impossible to reverse LF-conversion on a binary file.
It would be much safer to use includes instead. If a new source file type is
added, then the worst that can happen is that the file is awkard to read on
Unix. Unlike the case with binary files, the file can still be converted
successfully.
The current list of extensions that are present in the 5.5.28 source archive
are included in the file extensions.txt.
At least two binary extensions (.db, .keystore) are currently missing from the
excludes list.
There are quite a few files with no extension. These appear to be all text
files, and are listed in the file no-extension.txt (duplicate names have been
removed).
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47609] Failsafe EOL conversion
https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 --- Comment #1 from Sebb s...@apache.org 2009-07-30 11:53:24 PST --- Created an attachment (id=24067) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24067) List of files with no extension -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799408 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ./ interceptor/
Author: markt
Date: Thu Jul 30 19:10:02 2009
New Revision: 799408
URL: http://svn.apache.org/viewvc?rev=799408view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577
Cosmetic fixes. Main benefit is noise reduction in Eclipse error list
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=799408r1=799407r2=799408view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Jul 30 19:10:02 2009
@@ -98,7 +98,7 @@
* Since newProxyInstance performs the same operation, over and over
* again, it is much more optimized if we simply store the constructor
ourselves.
*/
-private Constructor proxyClassConstructor;
+private Constructor? proxyClassConstructor;
/**
* Executor service used to cancel Futures
@@ -295,10 +295,10 @@
* @return constructor used to instantiate the wrapper object
* @throws NoSuchMethodException
*/
-public Constructor getProxyConstructor() throws NoSuchMethodException {
+public Constructor? getProxyConstructor() throws NoSuchMethodException {
//cache the constructor
if (proxyClassConstructor == null ) {
-Class proxyClass =
Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[]
{java.sql.Connection.class,javax.sql.PooledConnection.class});
+Class? proxyClass =
Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[]
{java.sql.Connection.class,javax.sql.PooledConnection.class});
proxyClassConstructor = proxyClass.getConstructor(new Class[] {
InvocationHandler.class });
}
return proxyClassConstructor;
@@ -431,7 +431,7 @@
//return the members as idle to the pool
for (int i = 0; i initialPool.length; i++) {
if (initialPool[i] != null) {
-try
{this.returnConnection(initialPool[i]);}catch(Exception x){}
+try
{this.returnConnection(initialPool[i]);}catch(Exception x){/*NOOP*/}
} //end if
} //for
} //catch
@@ -927,7 +927,7 @@
* @param con
*/
protected void finalize(PooledConnection con) {
-
+// NOOP
}
/**
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=799408r1=799407r2=799408view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
Thu Jul 30 19:10:02 2009
@@ -68,6 +68,7 @@
* {...@inheritdoc}
*/
public void postRegister(Boolean registrationDone) {
+// NOOP
}
@@ -76,6 +77,7 @@
* {...@inheritdoc}
*/
public void preDeregister() throws Exception {
+// NOOP
}
/**
@@ -133,6 +135,7 @@
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
mbs.unregisterMBean(oname);
} catch (InstanceNotFoundException ignore) {
+// NOOP
} catch (Exception e) {
log.error(Unable to unregister JDBC pool with JMX,e);
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
svn commit: r799416 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: DataSourceFactory.java PoolProperties.java interceptor/SlowQueryReportJmx.java
Author: markt
Date: Thu Jul 30 19:21:04 2009
New Revision: 799416
URL: http://svn.apache.org/viewvc?rev=799416view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577
A handful of generics fixes.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=799416r1=799415r2=799416view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Thu Jul 30 19:21:04 2009
@@ -168,7 +168,7 @@
* @exception Exception if an exception occurs creating the instance
*/
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment) throws Exception {
+Hashtable?,? environment) throws
Exception {
// We only know how to deal with codejavax.naming.Reference/codes
// that specify a class name of javax.sql.DataSource
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=799416r1=799415r2=799416view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Jul 30 19:21:04 2009
@@ -733,7 +733,7 @@
public static class InterceptorDefinition {
protected String className;
protected MapString,InterceptorProperty properties = new
HashMapString,InterceptorProperty();
-protected volatile Class clazz = null;
+protected volatile Class? clazz = null;
public InterceptorDefinition(String className) {
this.className = className;
}
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=799416r1=799415r2=799416view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Thu Jul 30 19:21:04 2009
@@ -265,7 +265,7 @@
}
-public static ObjectName getObjectName(Class clazz, String poolName)
throws MalformedObjectNameException {
+public static ObjectName getObjectName(Class? clazz, String poolName)
throws MalformedObjectNameException {
ObjectName oname = new
ObjectName(ConnectionPool.POOL_JMX_TYPE_PREFIX+clazz.getName()+,name= +
poolName);
return oname;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47577] Unused imports and other compilation warnings
https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 --- Comment #1 from Mark Thomas ma...@apache.org 2009-07-30 12:32:58 PST --- The low hanging fruit as been fixed. Many of the remainder can't be fixed. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799427 - /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
Author: markt
Date: Thu Jul 30 19:40:54 2009
New Revision: 799427
URL: http://svn.apache.org/viewvc?rev=799427view=rev
Log:
Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47583
Fix timing related failures.
Patch suggested by sebb
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java?rev=799427r1=799426r2=799427view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
Thu Jul 30 19:40:54 2009
@@ -36,8 +36,8 @@
@Override
protected void tearDown() throws Exception {
-Driver.reset();
ds.close(true);
+Driver.reset();
super.tearDown();
}
@@ -68,7 +68,7 @@
}
try {
while (loopcount.get()iter) {
-assertEquals(Size comparison:,10, ds.getPool().getSize());
+assertTrue(Size comparison(less than
11):,ds.getPool().getSize()=10);
if (debug) {
System.out.println(Size: +ds.getPool().getSize());
System.out.println(Used: +ds.getPool().getActive());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47583] Fix occasional test failure in TestConcurrency
https://issues.apache.org/bugzilla/show_bug.cgi?id=47583 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas ma...@apache.org 2009-07-30 12:41:15 PST --- Fixed in trunk. Thanks for the report. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47577] Unused imports and other compilation warnings
https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 --- Comment #2 from Sebb s...@apache.org 2009-07-30 12:53:47 PST --- Created an attachment (id=24068) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24068) Fix a few more compilation warnings Thanks! I think there are a few more compiler warnings that are easy to fix. For example, @Override, one raw type, and a Javadoc error (repeated @return tag) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r799467 - /tomcat/tags/JDBC_POOL_1_0_7/
Author: fhanik Date: Thu Jul 30 22:44:51 2009 New Revision: 799467 URL: http://svn.apache.org/viewvc?rev=799467view=rev Log: Tag for 1.0.7 Added: tomcat/tags/JDBC_POOL_1_0_7/ (props changed) - copied from r799466, tomcat/trunk/modules/jdbc-pool/ Propchange: tomcat/tags/JDBC_POOL_1_0_7/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 30 22:44:51 2009 @@ -0,0 +1,3 @@ +build.properties +includes +output Propchange: tomcat/tags/JDBC_POOL_1_0_7/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk/modules/jdbc-pool:742915 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47612] New: [PATCH] fix unsafe public string array in AbstractCreateStatementInterceptor
https://issues.apache.org/bugzilla/show_bug.cgi?id=47612 Summary: [PATCH] fix unsafe public string array in AbstractCreateStatementInterceptor Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Modules: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=24070) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24070) Protect array against changes; remove magic numbers As previously mentioned on the Tomcat-dev list, the AbstractCreateStatementInterceptor class has two public static String arrays. These can easily be changed accidentally or deliberately. There subclasses which use the arrays also depend on the order of the entries in the arrays. The patch makes the arrays private, and makes the array order explicit, eliminating the magic numbers currently used to access the array entries. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
