[Bug 55336] Cannot start apache tomcat 7.0 if server path contains two consecutive spaces.
https://issues.apache.org/bugzilla/show_bug.cgi?id=55336 --- Comment #1 from Rainer Jung --- Adding analysis reported by Ognjen Blagojevic on tomcat users here: On several places in catalina.sh, there is eval command which seems to be inproperly escaped. E.g, if I want to pass parameter with two consecutive spaces using eval, this is the wrong way to do it: eval echo \"foo bar\" (prints: foo bar) This is the right way to do it: eval echo "\"foo bar\"" (prints: foo bar) I believe that catalina.sh should quote every parameter pass to eval in order to prevent whitespace collapse. -- 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: r1509128 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Thu Aug 1 08:59:18 2013
New Revision: 1509128
URL: http://svn.apache.org/r1509128
Log:
Refactor test with a view to extending it to cover bug 55331. No functional
change to this point.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1509128&r1=1509127&r2=1509128&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Thu
Aug 1 08:59:18 2013
@@ -400,13 +400,13 @@ public class TestAsyncContextImpl extend
@Test
public void testTimeoutListenerCompleteDispatch() throws Exception {
// Should trigger an error - can't do both
-doTestTimeout(Boolean.TRUE, "/nonasync");
+doTestTimeout(Boolean.TRUE, Boolean.FALSE);
}
@Test
public void testTimeoutListenerNoCompleteDispatch() throws Exception {
// Should work
-doTestTimeout(Boolean.FALSE, "/nonasync");
+doTestTimeout(Boolean.FALSE, Boolean.FALSE);
}
@Test
@@ -415,8 +415,18 @@ public class TestAsyncContextImpl extend
doTestTimeout(null, null);
}
-private void doTestTimeout(Boolean completeOnTimeout, String dispatchUrl)
-throws Exception {
+private void doTestTimeout(Boolean completeOnTimeout, Boolean
asyncDispatch)
+throws Exception {
+
+String dispatchUrl = null;
+if (asyncDispatch != null) {
+if (asyncDispatch.booleanValue()) {
+dispatchUrl = "/async";
+} else {
+dispatchUrl = "/nonasync";
+}
+}
+
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
@@ -437,13 +447,19 @@ public class TestAsyncContextImpl extend
Wrapper wrapper = Tomcat.addServlet(ctx, "time", timeout);
wrapper.setAsyncSupported(true);
-ctx.addServletMapping("/async", "time");
+ctx.addServletMapping("/start", "time");
-if (dispatchUrl != null) {
-NonAsyncServlet nonAsync = new NonAsyncServlet();
-Tomcat.addServlet(ctx, "nonasync", nonAsync);
-ctx.addServletMapping(dispatchUrl, "nonasync");
-}
+if (asyncDispatch != null) {
+if (asyncDispatch.booleanValue()) {
+AsyncStartRunnable asyncStartRunnable = new
AsyncStartRunnable();
+Tomcat.addServlet(ctx, "async", asyncStartRunnable);
+ctx.addServletMapping(dispatchUrl, "async");
+} else {
+NonAsyncServlet nonAsync = new NonAsyncServlet();
+Tomcat.addServlet(ctx, "nonasync", nonAsync);
+ctx.addServletMapping(dispatchUrl, "nonasync");
+}
+ }
ctx.addApplicationListener(new ApplicationListener(
TrackingRequestListener.class.getName(), false));
@@ -456,7 +472,7 @@ public class TestAsyncContextImpl extend
tomcat.start();
ByteChunk res = new ByteChunk();
try {
-getUrl("http://localhost:"; + getPort() + "/async", res, null);
+getUrl("http://localhost:"; + getPort() + "/start", res, null);
} catch (IOException ioe) {
// Ignore - expected for some error conditions
}
@@ -470,8 +486,12 @@ public class TestAsyncContextImpl extend
expected.append("requestDestroyed");
} else {
expected.append("onTimeout-");
-if (dispatchUrl != null) {
-expected.append("NonAsyncServletGet-");
+if (asyncDispatch != null) {
+if (asyncDispatch.booleanValue()) {
+// TODO
+} else {
+expected.append("NonAsyncServletGet-");
+}
}
expected.append("onComplete-");
expected.append("requestDestroyed");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509134 - /tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
Author: kfujino
Date: Thu Aug 1 09:12:47 2013
New Revision: 1509134
URL: http://svn.apache.org/r1509134
Log:
Fix NPE in FileMessageFactory.main when specify empty file as arguments.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1509134&r1=1509133&r2=1509134&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Thu
Aug 1 09:12:47 2013
@@ -374,6 +374,10 @@ public class FileMessageFactory {
FileMessageFactory write = getInstance(new File(args[1]), true);
FileMessage msg = new FileMessage(null, args[0], args[0]);
msg = read.readMessage(msg);
+if (msg == null) {
+System.out.println("Empty input file : " + args[0]);
+return;
+}
System.out.println("Expecting to write " + msg.getTotalNrOfMsgs()
+ " messages.");
int cnt = 0;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509143 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/deploy/FileMessageFactory.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Aug 1 09:25:12 2013
New Revision: 1509143
URL: http://svn.apache.org/r1509143
Log:
Fix NPE in FileMessageFactory.main when specify empty file as arguments.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1509143&r1=1509142&r2=1509143&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
Thu Aug 1 09:25:12 2013
@@ -376,6 +376,10 @@ public class FileMessageFactory {
FileMessageFactory write = getInstance(new File(args[1]), true);
FileMessage msg = new FileMessage(null, args[0], args[0]);
msg = read.readMessage(msg);
+if (msg == null) {
+System.out.println("Empty input file : " + args[0]);
+return;
+}
System.out.println("Expecting to write " + msg.getTotalNrOfMsgs()
+ " messages.");
int cnt = 0;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1509143&r1=1509142&r2=1509143&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 1 09:25:12 2013
@@ -193,6 +193,10 @@
55301: Fix IllegalArgumentException thrown by
simple test for McastService. (kfujino)
+
+55332: Fix NPE in FileMessageFactory.main when
+specify empty file as arguments. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55332] empty input file cause exception in FileMessageFactory
https://issues.apache.org/bugzilla/show_bug.cgi?id=55332 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Keiichi Fujino --- Fixed in trunk and 7.0.x and will be included in 7.0.43 onwards. -- 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
Re: svn commit: r1509143 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/deploy/FileMessageFactory.java webapps/docs/changelog.xml
Hi,
On Thu, Aug 1, 2013 at 11:25 AM, wrote:
> Author: kfujino
> Date: Thu Aug 1 09:25:12 2013
> New Revision: 1509143
>
> URL: http://svn.apache.org/r1509143
> Log:
> Fix NPE in FileMessageFactory.main when specify empty file as arguments.
>
> Modified:
>
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1509143&r1=1509142&r2=1509143&view=diff
>
> ==
> ---
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
> Thu Aug 1 09:25:12 2013
> @@ -376,6 +376,10 @@ public class FileMessageFactory {
> FileMessageFactory write = getInstance(new File(args[1]), true);
> FileMessage msg = new FileMessage(null, args[0], args[0]);
> msg = read.readMessage(msg);
> +if (msg == null) {
> +System.out.println("Empty input file : " + args[0]);
>
Do you really mean "System.out" here ?
Usually loggers are used.
> +return;
> +}
> System.out.println("Expecting to write " + msg.getTotalNrOfMsgs()
> + " messages.");
>
I see it is used even before.
> int cnt = 0;
>
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1509143&r1=1509142&r2=1509143&view=diff
>
> ==
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 1 09:25:12
> 2013
> @@ -193,6 +193,10 @@
> 55301: Fix IllegalArgumentException
> thrown by
> simple test for McastService. (kfujino)
>
> +
> +55332: Fix NPE in FileMessageFactory.main
> when
> +specify empty file as arguments. (kfujino)
> +
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
svn commit: r1509151 - in /tomcat/trunk: java/org/apache/coyote/AsyncStateMachine.java test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Thu Aug 1 09:46:15 2013
New Revision: 1509151
URL: http://svn.apache.org/r1509151
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55331
A disatch to an async servlet during the onTimeout method of an async listener
should not trigger an ISE.
Modified:
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1509151&r1=1509150&r2=1509151&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java Thu Aug 1
09:46:15 2013
@@ -216,6 +216,10 @@ public class AsyncStateMachine {
} else if (state == AsyncState.DISPATCHING) {
state = AsyncState.DISPATCHED;
return SocketState.ASYNC_END;
+} else if (state == AsyncState.STARTED) {
+// This can occur if an async listener does a dispatch to an async
+// servlet during onTimeout
+return SocketState.LONG;
} else {
throw new IllegalStateException(
sm.getString("asyncStateMachine.invalidAsyncState",
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1509151&r1=1509150&r2=1509151&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Thu
Aug 1 09:46:15 2013
@@ -46,8 +46,6 @@ import javax.servlet.http.HttpServletRes
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -398,18 +396,31 @@ public class TestAsyncContextImpl extend
}
@Test
-public void testTimeoutListenerCompleteDispatch() throws Exception {
+public void testTimeoutListenerCompleteNonAsyncDispatch() throws Exception
{
// Should trigger an error - can't do both
doTestTimeout(Boolean.TRUE, Boolean.FALSE);
}
@Test
-public void testTimeoutListenerNoCompleteDispatch() throws Exception {
+public void testTimeoutListenerNoCompleteNonAsyncDispatch()
+throws Exception {
// Should work
doTestTimeout(Boolean.FALSE, Boolean.FALSE);
}
@Test
+public void testTimeoutListenerCompleteAsyncDispatch() throws Exception {
+// Should trigger an error - can't do both
+doTestTimeout(Boolean.TRUE, Boolean.TRUE);
+}
+
+@Test
+public void testTimeoutListenerNoCompleteAsyncDispatch() throws Exception {
+// Should work
+doTestTimeout(Boolean.FALSE, Boolean.TRUE);
+}
+
+@Test
public void testTimeoutNoListener() throws Exception {
// Should work
doTestTimeout(null, null);
@@ -433,13 +444,6 @@ public class TestAsyncContextImpl extend
// Must have a real docBase - just use temp
File docBase = new File(System.getProperty("java.io.tmpdir"));
-// Create the folder that will trigger the redirect
-File foo = new File(docBase, "async");
-addDeleteOnTearDown(foo);
-if (!foo.mkdirs() && !foo.isDirectory()) {
-fail("Unable to create async directory in docBase");
-}
-
Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
TimeoutServlet timeout =
@@ -451,8 +455,11 @@ public class TestAsyncContextImpl extend
if (asyncDispatch != null) {
if (asyncDispatch.booleanValue()) {
-AsyncStartRunnable asyncStartRunnable = new
AsyncStartRunnable();
-Tomcat.addServlet(ctx, "async", asyncStartRunnable);
+AsyncStartRunnable asyncStartRunnable =
+new AsyncStartRunnable();
+Wrapper async =
+Tomcat.addServlet(ctx, "async", asyncStartRunnable);
+async.setAsyncSupported(true);
ctx.addServletMapping(dispatchUrl, "async");
} else {
NonAsyncServlet nonAsync = new NonAsyncServlet();
@@ -488,7 +495,7 @@ public class TestAsyncContextImpl extend
expected.append("onTimeout-");
if (asyncDispatch != null) {
if (asyncDispatch.booleanValue()) {
-// TODO
+expected.append("onStartAsync-Runnable-");
} else {
expected.append("NonAsyncServl
Re: svn commit: r1509143 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/deploy/FileMessageFactory.java webapps/docs/changelog.xml
On 01/08/2013 11:27, Martin Grigorov wrote:
> Hi,
>
>
> On Thu, Aug 1, 2013 at 11:25 AM, wrote:
>
>> Author: kfujino
>> Date: Thu Aug 1 09:25:12 2013
>> New Revision: 1509143
>>
>> URL: http://svn.apache.org/r1509143
>> Log:
>> Fix NPE in FileMessageFactory.main when specify empty file as arguments.
>>
>> Modified:
>>
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1509143&r1=1509142&r2=1509143&view=diff
>>
>> ==
>> ---
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
>> (original)
>> +++
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
>> Thu Aug 1 09:25:12 2013
>> @@ -376,6 +376,10 @@ public class FileMessageFactory {
>> FileMessageFactory write = getInstance(new File(args[1]), true);
>> FileMessage msg = new FileMessage(null, args[0], args[0]);
>> msg = read.readMessage(msg);
>> +if (msg == null) {
>> +System.out.println("Empty input file : " + args[0]);
>>
>
> Do you really mean "System.out" here ?
> Usually loggers are used.
Yes, I am sure he does. This is a main method, not something that is
called in normal Tomcat usage. It should probably move to the test tree.
>> +return;
>> +}
>> System.out.println("Expecting to write " + msg.getTotalNrOfMsgs()
>> + " messages.");
>>
>
> I see it is used even before.
Yes. Perfectly reasonably.
I'd strongly recommend looking at the source code before commenting on a
commit. The context provided by the diff isn't always the full story.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55331] Dispatch after async timeout fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=55331 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 7.0.x and will be included in 7.0.43 onwards. Note that the example servlet provided above will trigger an infinite loop as once the dispatch occurs, request.isAsyncStarted() will return false. -- 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: r1509155 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AsyncStateMachine.java test/org/apache/catalina/core/TestAsyncContextImpl.java webapps/docs/changelog.xml
Author: markt
Date: Thu Aug 1 10:08:29 2013
New Revision: 1509155
URL: http://svn.apache.org/r1509155
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55331
A dispatch to an async servlet during the onTimeout method of an async listener
should not trigger an ISE.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1507872,1509128,1509151
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1509155&r1=1509154&r2=1509155&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Thu Aug
1 10:08:29 2013
@@ -200,6 +200,10 @@ public class AsyncStateMachine {
} else if (state == AsyncState.DISPATCHING) {
state = AsyncState.DISPATCHED;
return SocketState.ASYNC_END;
+} else if (state == AsyncState.STARTED) {
+// This can occur if an async listener does a dispatch to an async
+// servlet during onTimeout
+return SocketState.LONG;
} else {
throw new IllegalStateException(
sm.getString("asyncStateMachine.invalidAsyncState",
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1509155&r1=1509154&r2=1509155&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Thu Aug 1 10:08:29 2013
@@ -46,8 +46,6 @@ import javax.servlet.http.HttpServletRes
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -398,15 +396,28 @@ public class TestAsyncContextImpl extend
}
@Test
-public void testTimeoutListenerCompleteDispatch() throws Exception {
+public void testTimeoutListenerCompleteNonAsyncDispatch() throws Exception
{
+// Should trigger an error - can't do both
+doTestTimeout(Boolean.TRUE, Boolean.FALSE);
+}
+
+@Test
+public void testTimeoutListenerNoCompleteNonAsyncDispatch()
+throws Exception {
+// Should work
+doTestTimeout(Boolean.FALSE, Boolean.FALSE);
+}
+
+@Test
+public void testTimeoutListenerCompleteAsyncDispatch() throws Exception {
// Should trigger an error - can't do both
-doTestTimeout(Boolean.TRUE, "/nonasync");
+doTestTimeout(Boolean.TRUE, Boolean.TRUE);
}
@Test
-public void testTimeoutListenerNoCompleteDispatch() throws Exception {
+public void testTimeoutListenerNoCompleteAsyncDispatch() throws Exception {
// Should work
-doTestTimeout(Boolean.FALSE, "/nonasync");
+doTestTimeout(Boolean.FALSE, Boolean.TRUE);
}
@Test
@@ -415,21 +426,24 @@ public class TestAsyncContextImpl extend
doTestTimeout(null, null);
}
-private void doTestTimeout(Boolean completeOnTimeout, String dispatchUrl)
-throws Exception {
+private void doTestTimeout(Boolean completeOnTimeout, Boolean
asyncDispatch)
+throws Exception {
+
+String dispatchUrl = null;
+if (asyncDispatch != null) {
+if (asyncDispatch.booleanValue()) {
+dispatchUrl = "/async";
+} else {
+dispatchUrl = "/nonasync";
+}
+}
+
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
File docBase = new File(System.getProperty("java.io.tmpdir"));
-// Create the folder that will trigger the redirect
-File foo = new File(docBase, "async");
-addDeleteOnTearDown(foo);
-if (!foo.mkdirs() && !foo.isDirectory()) {
-fail("Unable to create async directory in docBase");
-}
-
Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
TimeoutServlet timeout =
@@ -437,13 +451,22 @@ public class TestAsyncContextImpl extend
Wrapper wrapper = Tomcat.addServlet(ctx, "time", timeout);
wrapper.setAsyncSup
svn commit: r1509156 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Author: markt
Date: Thu Aug 1 10:13:31 2013
New Revision: 1509156
URL: http://svn.apache.org/r1509156
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55333
Correct regression in fix for bug 55071.
Don't commit the connection until after the ResultSet has been used.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1509156&r1=1509155&r2=1509156&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Aug 1
10:13:31 2013
@@ -534,12 +534,12 @@ public class JDBCRealm
stmt = credentials(dbConnection, username);
rs = stmt.executeQuery();
-dbConnection.commit();
-
if (rs.next()) {
dbCredentials = rs.getString(1);
}
+dbConnection.commit();
+
if (dbCredentials != null) {
dbCredentials = dbCredentials.trim();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509159 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Author: markt
Date: Thu Aug 1 10:15:47 2013
New Revision: 1509159
URL: http://svn.apache.org/r1509159
Log:
Remove trailing whitespace
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1509159&r1=1509158&r2=1509159&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Aug
1 10:15:47 2013
@@ -5,9 +5,9 @@
* 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.
@@ -428,7 +428,7 @@ public class JDBCRealm
}
ArrayList roles = getRoles(username);
-
+
// Create and return a suitable Principal for this user
return (new GenericPrincipal(username, credentials, roles));
@@ -550,19 +550,19 @@ public class JDBCRealm
try {
// Ensure that we have an open database connection
open();
-
+
stmt = credentials(dbConnection, username);
rs = stmt.executeQuery();
dbConnection.commit();
-
+
if (rs.next()) {
dbCredentials = rs.getString(1);
}
-
+
if (dbCredentials != null) {
dbCredentials = dbCredentials.trim();
}
-
+
return dbCredentials;
} catch (SQLException e) {
@@ -583,10 +583,10 @@ public class JDBCRealm
if (dbConnection != null) {
close(dbConnection);
}
-
+
numberOfTries--;
}
-
+
return (null);
}
@@ -608,7 +608,7 @@ public class JDBCRealm
* Return the roles associated with the gven user name.
*/
protected ArrayList getRoles(String username) {
-
+
if (allRolesMode != AllRolesMode.STRICT_MODE && !isRoleStoreDefined())
{
// Using an authentication only configuration and no role store has
// been defined so don't spend cycles looking
@@ -629,10 +629,10 @@ public class JDBCRealm
int numberOfTries = 2;
while (numberOfTries>0) {
try {
-
+
// Ensure that we have an open database connection
open();
-
+
try {
// Accumulate the user's roles
ArrayList roleList = new ArrayList();
@@ -646,9 +646,9 @@ public class JDBCRealm
}
rs.close();
rs = null;
-
+
return (roleList);
-
+
} finally {
if (rs!=null) {
try {
@@ -659,25 +659,25 @@ public class JDBCRealm
}
dbConnection.commit();
}
-
+
} catch (SQLException e) {
-
+
// Log the problem for posterity
containerLog.error(sm.getString("jdbcRealm.exception"), e);
-
+
// Close the connection so that it gets reopened next time
if (dbConnection != null)
close(dbConnection);
-
+
}
-
+
numberOfTries--;
}
-
+
return null;
}
-
-
+
+
/**
* Open (if necessary) and return a database connection for use by
* this Realm.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509160 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JDBCRealm.java webapps/docs/changelog.xml
Author: markt
Date: Thu Aug 1 10:17:46 2013
New Revision: 1509160
URL: http://svn.apache.org/r1509160
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55333
Correct regression in fix for bug 55071.
Don't commit the connection until after the ResultSet has been used.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1509156
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1509160&r1=1509159&r2=1509160&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Aug
1 10:17:46 2013
@@ -553,12 +553,12 @@ public class JDBCRealm
stmt = credentials(dbConnection, username);
rs = stmt.executeQuery();
-dbConnection.commit();
-
if (rs.next()) {
dbCredentials = rs.getString(1);
}
+dbConnection.commit();
+
if (dbCredentials != null) {
dbCredentials = dbCredentials.trim();
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1509160&r1=1509159&r2=1509160&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 1 10:17:46 2013
@@ -97,6 +97,10 @@
AsyncListener.onTimeout() should not trigger an
IllegalStateException. (markt)
+
+55333: Correct a regression in the fix for 55071.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55333] JDBCRealm Digest authentication Flow is not working throws Function sequence error
https://issues.apache.org/bugzilla/show_bug.cgi?id=55333 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. This has been fixed in trunk and 7.0.x and will be incuded in 7.0.43 onwards. -- 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: r1509161 - /tomcat/trunk/bin/catalina.sh
Author: markt Date: Thu Aug 1 10:40:18 2013 New Revision: 1509161 URL: http://svn.apache.org/r1509161 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55336 Correctly quote parameters passed to eval Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1509161&r1=1509160&r2=1509161&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Aug 1 10:40:18 2013 @@ -309,20 +309,20 @@ elif [ "$1" = "run" ]; then echo "Using Security Manager" fi shift -eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start else -eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start fi @@ -373,22 +373,22 @@ elif [ "$1" = "start" ] ; then echo "Using Security Manager" fi shift -eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" else -eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" @@ -434,11 +434,11 @@ elif [ "$1" = "stop" ] ; then fi fi - eval \"$_RUNJAVA\" $LOGGING_MANAGER $JAVA_OPTS \ --Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ --Dcatalina.base=\"$CATALINA_BASE\" \ --Dcatalina.home=\"$CATALINA_HOME\" \ --Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ +-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ +-Dcatalina.base="\"$CATALINA_BASE\"" \ +-Dcatalina.home="\"$CATALINA_HOME\"" \ +-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" stop if [ ! -z "$CATALINA_PID" ]; then @@ -501,11 +501,11 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval \"$_RUNJAVA\" $LOGGING_MANAGER $JAVA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CAT
svn commit: r1509163 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml
Author: markt Date: Thu Aug 1 10:44:08 2013 New Revision: 1509163 URL: http://svn.apache.org/r1509163 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55336 Correctly quote parameters passed to eval Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/catalina.sh tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1509161 Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1509163&r1=1509162&r2=1509163&view=diff == --- tomcat/tc7.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc7.0.x/trunk/bin/catalina.sh Thu Aug 1 10:44:08 2013 @@ -309,20 +309,20 @@ elif [ "$1" = "run" ]; then echo "Using Security Manager" fi shift -eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start else -eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start fi @@ -373,22 +373,22 @@ elif [ "$1" = "start" ] ; then echo "Using Security Manager" fi shift -eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ - -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" else -eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" start \ >> "$CATALINA_OUT" 2>&1 "&" @@ -434,11 +434,11 @@ elif [ "$1" = "stop" ] ; then fi fi - eval \"$_RUNJAVA\" $LOGGING_MANAGER $JAVA_OPTS \ --Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ --Dcatalina.base=\"$CATALINA_BASE\" \ --Dcatalina.home=\"$CATALINA_HOME\" \ --Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \ +-Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ +-Dcatalina.base="\"$CATALINA_BASE\"" \ +-Dcatalina.home="\"$CATALINA_HOME\"" \ +-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ org.apache.catalina.startup.Bootstrap "$@" stop if [ ! -z "$CATALINA_PID" ]; then @@ -501,11 +501,11
[Bug 55336] Cannot start apache tomcat 7.0 if server path contains two consecutive spaces.
https://issues.apache.org/bugzilla/show_bug.cgi?id=55336 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the report and the suggested fix. The fix has been applied to trunk and 7.0.x and will be included in 7.0.43 onwards. -- 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
Time for 7.0.43? Looking for a new release manager
All, Continuing the roughly monthly release cycle for 7.0.x, it is the start of a new month and time for another release. The open 7.0.x bugs have been fixed so 7.0.x/trunk should be in a suitable state for tagging. I'd like to free up some more time for Tomcat 8 so I am therefore looking to hand over the role of release manager for 7.0.x to another committer. The process is pretty straight forward these days. I'll add something to the wiki to document the process but I usually spend more time waiting for files to upload than anything else. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FrontPage" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FrontPage" page has been changed by markt: https://wiki.apache.org/tomcat/FrontPage?action=diff&rev1=32&rev2=33 Comment: Add link to new release pages * '''[[WhatIsComet|What is Comet]]''' - What is the Tomcat Comet API. * '''[[GSOC]]''' - Google Summer of Code * '''[[AddOns]]''' - Third party tools and add-ons not included in the official distribution + * '''[[ReleaseProcess|Release Process]]''' - How to perform an offical Apache Tomcat release = Special Wiki pages = * '''HelpContents''' - A basic guide to the MoinMoin wiki (including information about wiki syntax). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "ReleaseProcess" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "ReleaseProcess" page has been changed by markt:
https://wiki.apache.org/tomcat/ReleaseProcess
Comment:
Start release notes. Needs more work.
New page:
= Apache Tomcat Release Process =
== Introduction ==
This is written primarily for Apache Tomcat release managers although it may
also be of interest to anyone looking to validate and/or replicate the release
process. This page uses Tomcat 7 as an example but the same process applies to
later versions as well. Note that earlier versions have a slightly different,
more complex release process.
== Pre-requisites ==
* A subversion client installed and on your path
* Apache Ant installed and on your path (see BUILDING.txt in the root of the
svn repo for version requirements)
* The latest release of the minimum Java version that the Tomcat version runs
on installed and on your path
* The ability to run Windows binaries (to build the Windows installer)
* A reasonable internet connection (you will need to upload ~100MB)
== Create the tag ==
The aim is to create a copy of the current trunk but without the "-dev"
appended to the end of the version number.
* Perform an svn checkout of tc7.0.x/trunk (e.g. to 7.0.x-release)
* Edit 7.0.x-release/build.properties to remove the "-dev" from the version
number
{{{
version.suffix=
}}}
* svn cp . https://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_XX
* Check the diff mailed to the dev list
I found it simplest to keep this checkout with the modified
build.properties.default and just do an svn up prior to each tag. I only used
the checkout for tagging to ensure no other edits found their way into the tag.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "ReleaseProcess" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "ReleaseProcess" page has been changed by markt:
https://wiki.apache.org/tomcat/ReleaseProcess?action=diff&rev1=1&rev2=2
Comment:
Fix formatting. Add remaining sections to complete.
== Create the tag ==
The aim is to create a copy of the current trunk but without the "-dev"
appended to the end of the version number.
* Perform an svn checkout of tc7.0.x/trunk (e.g. to 7.0.x-release)
+ * Edit 7.0.x-release/build.properties and change the line
{{{version.suffix=-dev}}} to {{{version.suffix=}}}
- * Edit 7.0.x-release/build.properties to remove the "-dev" from the version
number
- {{{
- version.suffix=
- }}}
- * svn cp . https://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_XX
+ * {{{svn cp .
https://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_XX}}}
* Check the diff mailed to the dev list
- I found it simplest to keep this checkout with the modified
build.properties.default and just do an svn up prior to each tag. I only used
the checkout for tagging to ensure no other edits found their way into the tag.
+ I found it simplest to keep this checkout with the modified
{{{build.properties.default}}} and just do an {{{svn up}}} prior to each tag. I
only used the checkout for tagging to ensure no other edits found their way
into the tag.
+ == Build the release ==
+
+ TBD
+
+ == Upload the release ==
+
+ TBD
+
+ == Generate the Maven artifacts ==
+
+ TBD
+
+ == Call a vote ==
+
+ TBD
+
+ == If the vote passes ===
+
+ TBD
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "ReleaseProcess" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "ReleaseProcess" page has been changed by markt:
https://wiki.apache.org/tomcat/ReleaseProcess?action=diff&rev1=2&rev2=3
Comment:
Fill in the gaps
* A subversion client installed and on your path
* Apache Ant installed and on your path (see BUILDING.txt in the root of the
svn repo for version requirements)
* The latest release of the minimum Java version that the Tomcat version
runs on installed and on your path
- * The ability to run Windows binaries (to build the Windows installer)
+ * Windows OS (you can do it on Linux but it involves a lot more hassle)
+ * GnuPG installed
+ * A public key that is part of the Apache web of trust
* A reasonable internet connection (you will need to upload ~100MB)
== Create the tag ==
@@ -22, +24 @@
== Build the release ==
- TBD
+ * {{{svn export
https://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_XX
TOMCAT_7_0_XX}}}
+ * Add a build.properties file with the following configuration (adjust paths
for your environment)
+ {{{
+ execute.validate=true
+
+ execute.test.bio=true
+ execute.test.nio=true
+ execute.test.apr=true
+
+ test.haltonfailure=true
+
+ gpg.exec=C:/Program Files (x86)/GNU/GnuPG/gpg2.exe
+
+ base.path=C:/temp/libs
+ }}}
+ * {{{ant release}}}
+
+ Notes:
+ * GPG should be configured to use your Apache code signing key by default
+ * I always ensured {{{c:/temp/libs}}} was empty so that the buildhad to
download all the dependencies
== Upload the release ==
- TBD
+ Upload the contents of {{{TOMCAT_7_0_XX/output/release}}} to
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/
== Generate the Maven artifacts ==
- TBD
+ See https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/res/maven/README.txt
== Call a vote ==
- TBD
+ E.g. http://markmail.org/message/gvmbwocspnwb2dfe
== If the vote passes ===
- TBD
+ * {{{ svn mv https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.XX
https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/v7.0.XX}}}
+ * Wait for the mirrors to sync (upto 24 hours depending on what percentage
of the mirrors you want to sync)
+ * Update the website (e.g.
http://svn.apache.org/viewvc?view=revision&revision=1500109)
+ * Update the docs (see
http://svn.apache.org/repos/asf/tomcat/site/trunk/README.txt)
+ * Announce the release (e.g. http://markmail.org/message/xyantb3ozzmucdjt)
to users@t.a.o, cc dev@t.a.o, announce@t.a.o, announce@a.o
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Trivial Update of "ReleaseProcess" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "ReleaseProcess" page has been changed by markt:
https://wiki.apache.org/tomcat/ReleaseProcess?action=diff&rev1=3&rev2=4
Comment:
Fix typo
E.g. http://markmail.org/message/gvmbwocspnwb2dfe
- == If the vote passes ===
+ == If the vote passes ==
* {{{ svn mv https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.XX
https://dist.apache.org/repos/dist/release/tomcat/tomcat-7/v7.0.XX}}}
* Wait for the mirrors to sync (upto 24 hours depending on what percentage
of the mirrors you want to sync)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55215] Improvements to sample log4j configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=55215 --- Comment #6 from Brian Burch --- Created attachment 30657 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30657&action=edit clarify log4j and AccessLog issues Following Konstantin's explanation of the design of AccessLog, I have linked the various sections of this page, clarified some phrases and added some new information. The intent is to assist readers coming at this subject from any of several directions to not overlook this important exception. -- 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
[Bug 55215] Improvements to sample log4j configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=55215 --- Comment #7 from Brian Burch --- Created attachment 30658 --> https://issues.apache.org/bugzilla/attachment.cgi?id=30658&action=edit clarify log4j and AccessLog issues -- 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
[Bug 55215] Improvements to sample log4j configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=55215 Brian Burch changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #8 from Brian Burch --- Documentation changes to explain log4j not capturing AccessLogValve events. Also, several clarifications and phrasing changes. -- 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: r1509370 - in /tomcat/trunk: ./ java/org/apache/naming/factory/ res/dbcp/ res/maven/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Thu Aug 1 18:25:22 2013
New Revision: 1509370
URL: http://svn.apache.org/r1509370
Log:
Update Tomcat 8 to the latest DBCP2 snapshot
Removed:
tomcat/trunk/res/dbcp/
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/naming/factory/Constants.java
tomcat/trunk/res/maven/tomcat-dbcp.pom
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1509370&r1=1509369&r2=1509370&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Aug 1 18:25:22 2013
@@ -148,16 +148,27 @@ tomcat-native.win.1=${base-tomcat.loc.1}
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
# - Commons DBCP, version 1.1 or later -
-commons-dbcp.version=1.4
-commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
-commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+#commons-dbcp.version=1.4
+#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
+#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+commons-dbcp.version=2.0-20130801.161025-126
+commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
+commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
+commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
# - Commons Pool, version 1.1 or later -
-commons-pool.version=1.5.7
-commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
-commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
-commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#commons-pool.version=1.5.7
+#commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
+#commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
+#Temporary use of snapshots until Commons Pool 2 has its first release
+commons-pool.version=2.0-20130801.160158-233
+commons-pool.home=${base.path}/commons-pool2-2.0-SNAPSHOT-src
+commons-pool-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
+commons-pool-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
+
+
# - NSIS, version 2.0 or later -
nsis.home=${base.path}/nsis-2.46
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1509370&r1=1509369&r2=1509370&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 1 18:25:22 2013
@@ -598,7 +598,7 @@
-
+
-
+
-
@@ -2554,11 +2554,14 @@ Apache Tomcat ${version} native binaries
-
-
+
+
+
+
+
@@ -2566,20 +2569,18 @@ Apache Tomcat ${version} native binaries
-
-
+
-
+
-
+
@@ -2598,6 +2599,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
includeantruntime="false">
+
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/Constants.java?rev=1509370&r1=1509369&r2=1509370&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/Constants.java Thu Aug 1
18:25:22 2013
@@ -49,7 +49,7 @@ public final class Constants {
Package + ".HandlerFactory";
public static final String DBCP_DATASOURCE_FACTORY =
-
Re: svn commit: r1509370 - in /tomcat/trunk: ./ java/org/apache/naming/factory/ res/dbcp/ res/maven/ webapps/docs/ webapps/docs/config/
On 01/08/2013 20:25, ma...@apache.org wrote: > Author: markt > Date: Thu Aug 1 18:25:22 2013 > New Revision: 1509370 > > URL: http://svn.apache.org/r1509370 > Log: > Update Tomcat 8 to the latest DBCP2 snapshot Notable changes: - Should have similar performance in highly concurrent environments to Tomcat's jdbc-pool - Object pools are exposed via JMX Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509388 - /tomcat/trunk/build.properties.default
Author: markt
Date: Thu Aug 1 19:31:23 2013
New Revision: 1509388
URL: http://svn.apache.org/r1509388
Log:
Update pool2 & dbcp2 versions
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1509388&r1=1509387&r2=1509388&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Aug 1 19:31:23 2013
@@ -152,7 +152,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20130801.161025-126
+commons-dbcp.version=2.0-20130801.192813-128
commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
@@ -163,7 +163,7 @@ commons-dbcp-src.loc.2=https://repositor
#commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
#commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
#Temporary use of snapshots until Commons Pool 2 has its first release
-commons-pool.version=2.0-20130801.160158-233
+commons-pool.version=2.0-20130801.192625-235
commons-pool.home=${base.path}/commons-pool2-2.0-SNAPSHOT-src
commons-pool-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
commons-pool-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-pool2/2.0-SNAPSHOT/commons-pool2-${commons-pool.version}-src.tar.gz
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509391 - /tomcat/trunk/build.xml
Author: markt
Date: Thu Aug 1 19:39:22 2013
New Revision: 1509391
URL: http://svn.apache.org/r1509391
Log:
Ensure we pick up the latest versions when using the snapshots
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1509391&r1=1509390&r2=1509391&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 1 19:39:22 2013
@@ -2410,7 +2410,10 @@ Apache Tomcat ${version} native binaries
-
+
+
+
+
svn commit: r2657 - /release/tomcat/tomcat-7/v7.0.41/
Author: markt Date: Thu Aug 1 19:41:54 2013 New Revision: 2657 Log: Remove old version Removed: release/tomcat/tomcat-7/v7.0.41/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2657 - /release/tomcat/tomcat-7/v7.0.41/
Author: markt Date: Thu Aug 1 19:41:54 2013 New Revision: 2657 Log: Remove old version Removed: release/tomcat/tomcat-7/v7.0.41/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2658 - /dev/tomcat/tomcat-8/ /release/tomcat/tomcat-8/
Author: markt Date: Thu Aug 1 19:45:01 2013 New Revision: 2658 Log: Prep for Tomcat 8 RC Added: dev/tomcat/tomcat-8/ release/tomcat/tomcat-8/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2658 - /dev/tomcat/tomcat-8/ /release/tomcat/tomcat-8/
Author: markt Date: Thu Aug 1 19:45:01 2013 New Revision: 2658 Log: Prep for Tomcat 8 RC Added: dev/tomcat/tomcat-8/ release/tomcat/tomcat-8/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54522] Add patch binary as prerequisite in BUILDING.txt
https://issues.apache.org/bugzilla/show_bug.cgi?id=54522 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas --- This has been fixed by switching to (a snapshot of) DBCP2 which implemented JDBC 4.1 so has no need of any patching. -- 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: r1509398 - in /tomcat/tags/TOMCAT_8_0_0_RC1: ./ build.properties.default
Author: markt Date: Thu Aug 1 19:53:50 2013 New Revision: 1509398 URL: http://svn.apache.org/r1509398 Log: Tag 8.0.0-RC1 Added: tomcat/tags/TOMCAT_8_0_0_RC1/ - copied from r1509396, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default?rev=1509398&r1=1509396&r2=1509398&view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default Thu Aug 1 19:53:50 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC1 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509406 - /tomcat/tags/TOMCAT_8_0_0_RC1/
Author: markt Date: Thu Aug 1 20:04:35 2013 New Revision: 1509406 URL: http://svn.apache.org/r1509406 Log: Tag broken Removed: tomcat/tags/TOMCAT_8_0_0_RC1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509410 - /tomcat/trunk/build.xml
Author: markt
Date: Thu Aug 1 20:11:17 2013
New Revision: 1509410
URL: http://svn.apache.org/r1509410
Log:
Fix dependencies
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1509410&r1=1509409&r2=1509410&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 1 20:11:17 2013
@@ -598,7 +598,7 @@
-
+
-
+
-
@@ -2489,7 +2489,6 @@ Apache Tomcat ${version} native binaries
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1509411 - in /tomcat/tags/TOMCAT_8_0_0_RC1: ./ build.properties.default
Author: markt Date: Thu Aug 1 20:11:49 2013 New Revision: 1509411 URL: http://svn.apache.org/r1509411 Log: Tag 8.0.0-RC1 Added: tomcat/tags/TOMCAT_8_0_0_RC1/ - copied from r1509410, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default?rev=1509411&r1=1509410&r2=1509411&view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC1/build.properties.default Thu Aug 1 20:11:49 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC1 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2663 [2/2] - in /dev/tomcat/tomcat-8/v8.0.0-RC1: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc Thu Aug 1 20:50:46 2013 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.20 (MingW32) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABAgAGBQJR+sJNAAoJEBDAHFovYFnngv8P/ij2puLutiYWcCbVJJXb5NgC +Z26DdRJ9DORIgasPpVCXrdhGCmXuRjAXVODBQm/cJyrzuuwPNqrYmhhH3NmNGNrt +0TL5LxwQAk+KvOnX8Xu4COrLmNQp+EcDKvkzvc62Q9BXhSkCiFMluI4dbbRVorr9 +hX5DyoxnmWfI1OwRoXvSJc4OGzTImHoOTJly4FG8RB/velSPZnlIkiTfz18bJjtg +Vnh6NpKosZTjXzXemWTPCVFuDxTixWrRwpgLG1skI2ixc8y8ideYs9/tc/zMyGj6 +0WR8YwP9XUZ/U/snRZpH7zm8eIAHq45GvB4AWGrRvEE9LRJLDkwhMCWq3xpKVeas +U1sbhiERAs7wWqlFiWCUKNXGZNcrlHgkQQ2+ie+5fJWYePqEAB1sYCWTuldcrLWp +I7ZP0xfoLdtzjm9XBEWtgP0MWJ9Wsj9VeogC13xCLR6ePw2J9KXqFS7b6nH2WQPM +IIdQG0JVfbvkzZ95PggBN3mpyUEpcvYJ5It+ticnoq7Me2HTaswmx7xpaVhaO1vZ +zJZ0cVcsibQtaRJuPcCC5yBxy486TY2tbu+9e+r9JnMGUH/FlvK2eoxW6RpLuICO +sLbZEtMTCRf/tvV76+ijKMqx0gmU9VQ/lNRIGcWGPnhUn3OCd1Hf6QdM13Hg2tQ8 +MSJpfX7tKFKq0FxqvpKr +=lFJ+ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 Thu Aug 1 20:50:46 2013 @@ -0,0 +1 @@ +2f02569373ba5480fd2406596132385b *apache-tomcat-8.0.0-RC1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc Thu Aug 1 20:50:46 2013 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.20 (MingW32) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABAgAGBQJR+sJBAAoJEBDAHFovYFnnWwgP+gKzMQQ/Q2nPQR+9fZ1w3lxH +bvAT379jXJnJbMCHwrDlsFoelTFr16xmkdhhO+9FWfDiN7N6mZ9HlZ9EiaY/aOf0 +XNBjurkmph0JEVvRMVcnp8eN7KBdglJVd3tLS8E1H/nue9k4jXtz2LK2W0TetOne +d3z6c7xe9X2//TQ3Z4jr9s8/lN0KC4LfJka5juLsSgLHSk/pXfoF2kd1EU/S936Y +y6tF5nXVVHRf8yLX+IM4t1HArsUTjUonUG7oCxuNy6dR/CZMHQRVRqXIYQsmTn7+ +2YdyupwISVmNWe609KKzA+HVm8kwvONM+/8AwI6V9K8UxxxI/FY3WY1Ogq8wkjGN +OXqsf/+Wx6AbZ3pxeo2bga3933IbCh8CzyZveG8mdhDF3oxPFO9ZrN3vP9spkz3x +ijnL+qsi5xalDWQeNLdfDTC/HzEKt6ug/RNvbwii0gUDww2Mpa+uPbihxwXrD+sA +U1PLl1HFrLBKlzLr3qCmwY7FngctZO7XqF+6SI51/taaQNIY79kOAkEZ6SRU4zDy +g2hRZurTapa+GCd1Bt2r8H33cSfGkUzj2181nfJve86SQ25u94V5hT3UuOxb8I7k +/hFj49HraJJdA2SffdtRRiqVB8B94T5fuaM5QjubYIlE0a7TSoJef2EXwW1nQ9ik +OYXBw4SaVfRMAyjvMW19 +=ud00 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 Thu Aug 1 20:50:46 2013 @@ -0,0 +1 @@ +113b600101a48b0f2f7e4e09947fa427 *apache-tomcat-8.0.0-RC1-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r2663 [2/2] - in /dev/tomcat/tomcat-8/v8.0.0-RC1: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.asc Thu Aug 1 20:50:46 2013 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.20 (MingW32) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABAgAGBQJR+sJNAAoJEBDAHFovYFnngv8P/ij2puLutiYWcCbVJJXb5NgC +Z26DdRJ9DORIgasPpVCXrdhGCmXuRjAXVODBQm/cJyrzuuwPNqrYmhhH3NmNGNrt +0TL5LxwQAk+KvOnX8Xu4COrLmNQp+EcDKvkzvc62Q9BXhSkCiFMluI4dbbRVorr9 +hX5DyoxnmWfI1OwRoXvSJc4OGzTImHoOTJly4FG8RB/velSPZnlIkiTfz18bJjtg +Vnh6NpKosZTjXzXemWTPCVFuDxTixWrRwpgLG1skI2ixc8y8ideYs9/tc/zMyGj6 +0WR8YwP9XUZ/U/snRZpH7zm8eIAHq45GvB4AWGrRvEE9LRJLDkwhMCWq3xpKVeas +U1sbhiERAs7wWqlFiWCUKNXGZNcrlHgkQQ2+ie+5fJWYePqEAB1sYCWTuldcrLWp +I7ZP0xfoLdtzjm9XBEWtgP0MWJ9Wsj9VeogC13xCLR6ePw2J9KXqFS7b6nH2WQPM +IIdQG0JVfbvkzZ95PggBN3mpyUEpcvYJ5It+ticnoq7Me2HTaswmx7xpaVhaO1vZ +zJZ0cVcsibQtaRJuPcCC5yBxy486TY2tbu+9e+r9JnMGUH/FlvK2eoxW6RpLuICO +sLbZEtMTCRf/tvV76+ijKMqx0gmU9VQ/lNRIGcWGPnhUn3OCd1Hf6QdM13Hg2tQ8 +MSJpfX7tKFKq0FxqvpKr +=lFJ+ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.tar.gz.md5 Thu Aug 1 20:50:46 2013 @@ -0,0 +1 @@ +2f02569373ba5480fd2406596132385b *apache-tomcat-8.0.0-RC1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.asc Thu Aug 1 20:50:46 2013 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.20 (MingW32) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABAgAGBQJR+sJBAAoJEBDAHFovYFnnWwgP+gKzMQQ/Q2nPQR+9fZ1w3lxH +bvAT379jXJnJbMCHwrDlsFoelTFr16xmkdhhO+9FWfDiN7N6mZ9HlZ9EiaY/aOf0 +XNBjurkmph0JEVvRMVcnp8eN7KBdglJVd3tLS8E1H/nue9k4jXtz2LK2W0TetOne +d3z6c7xe9X2//TQ3Z4jr9s8/lN0KC4LfJka5juLsSgLHSk/pXfoF2kd1EU/S936Y +y6tF5nXVVHRf8yLX+IM4t1HArsUTjUonUG7oCxuNy6dR/CZMHQRVRqXIYQsmTn7+ +2YdyupwISVmNWe609KKzA+HVm8kwvONM+/8AwI6V9K8UxxxI/FY3WY1Ogq8wkjGN +OXqsf/+Wx6AbZ3pxeo2bga3933IbCh8CzyZveG8mdhDF3oxPFO9ZrN3vP9spkz3x +ijnL+qsi5xalDWQeNLdfDTC/HzEKt6ug/RNvbwii0gUDww2Mpa+uPbihxwXrD+sA +U1PLl1HFrLBKlzLr3qCmwY7FngctZO7XqF+6SI51/taaQNIY79kOAkEZ6SRU4zDy +g2hRZurTapa+GCd1Bt2r8H33cSfGkUzj2181nfJve86SQ25u94V5hT3UuOxb8I7k +/hFj49HraJJdA2SffdtRRiqVB8B94T5fuaM5QjubYIlE0a7TSoJef2EXwW1nQ9ik +OYXBw4SaVfRMAyjvMW19 +=ud00 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC1/src/apache-tomcat-8.0.0-RC1-src.zip.md5 Thu Aug 1 20:50:46 2013 @@ -0,0 +1 @@ +113b600101a48b0f2f7e4e09947fa427 *apache-tomcat-8.0.0-RC1-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 8.0.0-RC1
The proposed Apache Tomcat 8.0.0 release candidate 1 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. That said: - Servlet 3.1 is complete - JSP 2.3 is complete - EL 3.0 is complete - WebSocket 1.0 is complete - DBCP2 is working but in a state of flux but the early stages of JMX monitoring are available It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC1/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-048/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC1/ The proposed 8.0.0-RC1 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC1 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC1
On 01/08/2013 22:53, Mark Thomas wrote: > [X] Alpha - go ahead and release as 8.0.0-RC1 alpha Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4779 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1509410 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 48550] Update examples and default server.xml to use UTF-8
https://issues.apache.org/bugzilla/show_bug.cgi?id=48550 Konstantin Preißer changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #8 from Konstantin Preißer --- Hi, as this has not been applied to Tomcat 7, what about Tomcat 8? -- 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
[jira] [Created] (MTOMCAT-232) Mapping webapps to "/" does not work
Alessandro Giannone created MTOMCAT-232: --- Summary: Mapping webapps to "/" does not work Key: MTOMCAT-232 URL: https://issues.apache.org/jira/browse/MTOMCAT-232 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.1 Environment: Windows 7, Oracle JDK 1.6 Reporter: Alessandro Giannone Assignee: Olivier Lamy (*$^¨%`£) This issue is essentially the same as MTOMCAT-133 except that it's specific to the webapps portion on the configuration. So if I configure an artifact as a webapp and use the contextPath property to set the path to "/" then the JSTL libraries will output "/" incorrectly. If I use the artifactId then the issue doesn't occur. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54596] Relative path functionality truncates last character of configuration parameters preventing connector from working.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54596 Brad Cobb changed: What|Removed |Added Summary|Relative paths truncates|Relative path functionality |last character of values|truncates last character of ||configuration parameters ||preventing connector from ||working. -- 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
[Bug 55342] New: Lost interruption
https://issues.apache.org/bugzilla/show_bug.cgi?id=55342
Bug ID: 55342
Summary: Lost interruption
Product: Tomcat Modules
Version: unspecified
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: jdbc-pool
Assignee: dev@tomcat.apache.org
Reporter: as...@apache.org
org.apache.tomcat.jdbc.pool.ConnectionPool#close should not call
Thread.interrupted() because interrupt was already reset by code that thrown
InterruptedException.
} catch (InterruptedException ex) {
if (getPoolProperties().getPropagateInterruptState()) {
Thread.currentThread().interrupt();
- } else {
- Thread.interrupted();
}
}
--
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
[Bug 55342] Lost interruption
https://issues.apache.org/bugzilla/show_bug.cgi?id=55342 --- Comment #1 from Mikhail Mazursky --- Also, why this flag (PropagateInterruptState) is false by default? Why it even exists? Why someone may want pool to swallow interruptions? -- 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
[Bug 55343] New: Add flag to ignore exceptions while creating initial pool
https://issues.apache.org/bugzilla/show_bug.cgi?id=55343 Bug ID: 55343 Summary: Add flag to ignore exceptions while creating initial pool Product: Tomcat Modules Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: as...@apache.org I want my initial pool to be of some size i.e. not empty AND start even if it fails to create all or some of connections. If pool fails to create initial connections for some reason it just throws exceptions. To workaround that I have to set initial pool size to 0. It can be handy to add a flag to ignore (just log them) exceptions that occur while creating initial connections. -- 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
Tomcat Channel Issue in EC2 clustering environment
Hi all Axis2 Tribes utilizes Tomcat underneath. In Tomcat clustering, there's away to add a listener to a channel, and get notifications based on different scenarios such as member join, member leave etc. Axis2 tribes registers a such listener in Tomcat, in order to identify whether a new member is joined/left a Tomcat channel. We are using EC2 based clustering environment, In this case, intermittently, we've seen that the memberDisappear event of that particular listener hasn't been triggered when a member leaves a tomcat channel. Any Idea ?? /Jasintha -- *Thanks & Regards Jasintha Dasanayake * * * * *mobile +94 (0)71 624 1368 ,
