Re: svn commit: r1005367 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProtocol.java java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/ajp/AjpProtocol.java webapps/docs
> On 10/07/2010 10:54 AM, kfuj...@apache.org wrote:
>>
>> + /**
>> + * AJP packet size.
>> + */
>> + protected int packetSize = Constants.MAX_PACKET_SIZE;
>> + public int getPacketSize() { return packetSize; }
>> + public void setPacketSize(int packetSize) {
>> + if(packetSize< Constants.MAX_PACKET_SIZE) {
>> + this.packetSize = Constants.MAX_PACKET_SIZE;
>> + } else {
>> + this.packetSize = packetSize;
>> + }
>> + }
>> +
>
> This would make AJP fixed to MAX_PACKET_SIZE
> IMO this should be:
>
> public void setPacketSize(int packetSize) {
> if(packetSize < Constants.MIN_PACKET_SIZE) {
> this.packetSize = Constants.MIN_PACKET_SIZE;
>
> Also, 'if(foo)' -> 'if (foo)'
>
>
>
> Regards
> --
> ^TM
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
Does it mean to rename MAX_PACKET_SIZE to MIN_PACKET_SIZE ?
--
Keiichi.Fujino
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1005722 - /tomcat/trunk/webapps/docs/default-servlet.xml
Author: timw Date: Fri Oct 8 08:11:24 2010 New Revision: 1005722 URL: http://svn.apache.org/viewvc?rev=1005722&view=rev Log: Minor fixes to DefaultServlet docs Modified: tomcat/trunk/webapps/docs/default-servlet.xml Modified: tomcat/trunk/webapps/docs/default-servlet.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/default-servlet.xml?rev=1005722&r1=1005721&r2=1005722&view=diff == --- tomcat/trunk/webapps/docs/default-servlet.xml (original) +++ tomcat/trunk/webapps/docs/default-servlet.xml Fri Oct 8 08:11:24 2010 @@ -54,7 +54,7 @@ By default here is it's declaration:listings -true +false 1 @@ -69,7 +69,7 @@ By default here is it's declaration: So by default, the default servlet is loaded at webapp startup and -directory listings are enabled and debugging is turned off. +directory listings are disabled and debugging is turned off. @@ -81,7 +81,7 @@ The DefaultServlet allows the following Debugging level. It is not very useful unless you are a tomcat developer. As -of this writing, useful values are 0, 1, 11, 1000. +of this writing, useful values are 0, 1, 11, 1000. [0] @@ -89,7 +89,7 @@ The DefaultServlet allows the following If no welcome file is present, can a directory listing be shown? -value may be true or false +value may be true or false [false] Welcome files are part of the servlet api. @@ -103,7 +103,7 @@ The DefaultServlet allows the following If a directory listing is presented, a readme file may also be presented with the listing. This file is inserted as is -so it may contain HTML. default value is null +so it may contain HTML. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50017] Make private immutable fields final
https://issues.apache.org/bugzilla/show_bug.cgi?id=50017 Tim Whittington changed: What|Removed |Added Priority|P2 |P5 Severity|normal |trivial -- 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 50027] NullPointerException if context.xml is present with
https://issues.apache.org/bugzilla/show_bug.cgi?id=50027 Tim Whittington changed: What|Removed |Added Priority|P2 |P3 Status|NEW |NEEDINFO --- Comment #2 from Tim Whittington 2010-10-08 04:22:48 EDT --- Can you attach a server.xml that actually breaks - it's not clear from your report what you're actually having problems with. -- 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 50054] When the AJP connector is used, minSpareThreads cannot be used.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50054 --- Comment #4 from Mark Thomas 2010-10-08 04:48:24 EDT --- (In reply to comment #3) > (In reply to comment #2) > > Fixed in trunk and will be in 7.0.4 onwards. > > i downloaded tomcat 7.0.4 lately and I still experiencing this issue. Unlikely. Tomcat 7.0.4 has not yet been tagged let alone made available for download. > can someone advise me how to patch and test in my tomcat... That would be a question for the users mailing list. -- 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 48716] Embedded Tomcat JULI aggressively resetting default logging configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=48716 --- Comment #18 from Henning Blohm 2010-10-08 04:50:46 EDT --- Not calling LogManager.getLogManager().reset(); when it is java.util.logging.LogManager would help. I suppose a mix of this with cleaning up what is JULI's looks promising (possibly like S. Ali suggested, or similarly - sorry, I didn't look into the code again and it's been a while). Developers that define (for whatever reason) application local handlers can either rely on JULI to clean up or register a context listener and clean up on their own (e.g. use commons logging ServletContextCleaner if applicable) - if they want to make sure. In any case, usage of java.util.logging outside of the web container would not be harmed. Sounds good to me. Thanks, Henning -- 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 43642] Add prestartminSpareThreads attribute for Executor
https://issues.apache.org/bugzilla/show_bug.cgi?id=43642 Tim Whittington changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Tim Whittington 2010-10-08 04:52:56 EDT --- This has been implemented in 7.0 at some point (it's documented at http://tomcat.apache.org/tomcat-7.0-doc/config/executor.html). -- 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
Re: svn commit: r1005367 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProtocol.java java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/ajp/AjpProtocol.java webapps/docs
On 10/08/2010 09:50 AM, Keiichi Fujino wrote: Does it mean to rename MAX_PACKET_SIZE to MIN_PACKET_SIZE ? Huh, I thought we enlarged the MAX_PACKET_SIZE to 65536. We should have DEF_PACKET_SIZE=8192 (or MIN_PACKET_SIZE) and MAX_PACKET_SIZE=65536 Currently we allow to set packet size to > 65536 which is hazardous. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Domino Tomcat connector: I'd like to hire somebody to bring it back
On 08.10.2010 08:48, Mladen Turk wrote: On 10/08/2010 12:08 AM, Erik C. Brooks wrote: Hello group, I'd like to modernize the Domino Tomcat connector for Win64. I've got a great Domino C developer here who has a lot of DSAPI experience. I'm more than willing to pay, and would love to release it back to the community. Please contact me if interested at the email below. This is not going to happen since the Lotus Domino is proprietary software which cannot be used freely. Solution would be that IBM donates Domino licenses to the ASF so that development could took place, but that's a different story. To add some motivation: reviving the DSAPI connector would only make sense, if the project were able to maintain it long-term. So it is not primarily the question of someone bringing it up to date now, but having people in the project who can maintain the code. Being able to access Domino in order to test and improve is a critical part of that. It could be fixed by IBM like another proprietary web server vendor with connector support did by providing licenses for development inside the ASF. Devoting development time is another issue. Of course you can pay someone now to do the initial work, but there needs to be someone there who has a sustained interest in maintaining the code afterwards. The project is open for contributions and if the project is convinced that a contributor has a sustained interest in maintaining the code long-term there is a chance of becoming part of the project. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49991] Tomcat 7 JAAS problem with CDI
https://issues.apache.org/bugzilla/show_bug.cgi?id=49991 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO OS/Version||All --- Comment #1 from Mark Thomas 2010-10-08 06:50:57 EDT --- This bug report refers to JAAS but the Glassfish fix seems to be more related to FORM authentication. It isn't at all clear to me at this point what the problem is. A test case for Tomcat - with the necessary steps to re-create from a clean 7.0.x install - would help. What also isn't clear is whether there is a Servlet specification compliance issue or if CDI expects things to be a certain way and Tomcat does them differently. The former will certainly get fixed, the latter will probably get 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
Re: svn commit: r1005367 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProtocol.java java/org/apache/coyote/ajp/AjpAprProtocol.java java/org/apache/coyote/ajp/AjpProtocol.java webapps/doc
On 08.10.2010 11:14, Mladen Turk wrote: On 10/08/2010 09:50 AM, Keiichi Fujino wrote: Does it mean to rename MAX_PACKET_SIZE to MIN_PACKET_SIZE ? Huh, I thought we enlarged the MAX_PACKET_SIZE to 65536. We should have DEF_PACKET_SIZE=8192 (or MIN_PACKET_SIZE) and MAX_PACKET_SIZE=65536 Currently we allow to set packet size to > 65536 which is hazardous. I think MAX_PACKET_SIZE was the old limit on AJP packets. Packets were allowed of any sizes up to MAX_PACKET_SIZE. Buffers were always allocated at that size, which was the mativation for the "<" comparison. Later e added the ability to configure bigger maximum packet sizes and I think there is no "maximum maximum packet size" on the Tomcat side. If you want you can try to use monster sizes. In mod_jk we limit it to 64KB (I forgot why). So I think the code is OK, it depends on what your interpretation of the "MAX" is. Renaming from MAX_PACKET_SIZE to DEFAULT_MAX_PACKET_SIZE wouldn't harm except for moving the code further away from the previous versions without any real benefit. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1005789 - in /tomcat/trunk/java/org/apache/naming: NamingContext.java NamingContextBindingsEnumeration.java
Author: markt
Date: Fri Oct 8 11:57:04 2010
New Revision: 1005789
URL: http://svn.apache.org/viewvc?rev=1005789&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49994
Lookup of JNDI references should return a new object instance each time
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1005789&r1=1005788&r2=1005789&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Fri Oct 8 11:57:04
2010
@@ -797,10 +797,6 @@ public class NamingContext implements Co
try {
Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
-if (obj != null) {
-entry.value = obj;
-entry.type = NamingEntry.ENTRY;
-}
return obj;
} catch (NamingException e) {
throw e;
Modified:
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java?rev=1005789&r1=1005788&r2=1005789&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
(original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
Fri Oct 8 11:57:04 2010
@@ -105,13 +105,13 @@ public class NamingContextBindingsEnumer
private Binding nextElementInternal() throws NamingException {
NamingEntry entry = iterator.next();
+Object value;
// If the entry is a reference, resolve it
if (entry.type == NamingEntry.REFERENCE
|| entry.type == NamingEntry.LINK_REF) {
try {
-// A lookup will resolve the entry
-ctx.lookup(new CompositeName(entry.name));
+value = ctx.lookup(new CompositeName(entry.name));
} catch (NamingException e) {
throw e;
} catch (Exception e) {
@@ -119,12 +119,11 @@ public class NamingContextBindingsEnumer
ne.initCause(e);
throw ne;
}
+} else {
+value = entry.value;
}
-return new Binding(entry.name, entry.value.getClass().getName(),
- entry.value, true);
+return new Binding(entry.name, value.getClass().getName(), value,
true);
}
-
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50059] New: Resources are not served from /WEB-INF/lib/{*.jar}/META-INF/resources if metadata-complete="true" is set in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=50059
Summary: Resources are not served from
/WEB-INF/lib/{*.jar}/META-INF/resources if
metadata-complete="true" is set in web.xml
Product: Tomcat 7
Version: 7.0.2
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kiralyattila...@gmail.com
To reproduce:
1. Make a Servlet 3.0 webapp (lets name it foo) with metadata-complete="true"
attribute set on the web-app element in the /WEB-IBNF/web.xml.
2. Make a jar holding a single /META-INF/resources/index.html file. The jar
should be placed in /WEB-INF/lib (lets name it bar.jar).
3. Start the web app in Tomcat 7.0.2 and in browser go to
http://localhost:8080/foo/index.html.
Expected result: 200 response and index.html served.
Actual result: 404
If you modify the web.xml to metadata-complete="false" and restart the app now
/foo/index.html will respond as expected.
I tried the same webapp with Glassfish v3.0.1 and it works as expected
regardless what I set in metadata-complete attribute.
I made a quick look in the servlet 3.0 spec and as far as I can see
metadata-complete only regulates annotation and web fragment processing. In the
example bar.jar has nothing to do with annotations and it is not a web fragment
either but it is still handled differently depending on the metadata-complete
attribute.
--
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: r1005790 - in /tomcat/trunk/test/org/apache/naming/resources: TestNamingContext.java TesterFactory.java TesterObject.java
Author: markt
Date: Fri Oct 8 11:57:57 2010
New Revision: 1005790
URL: http://svn.apache.org/viewvc?rev=1005790&view=rev
Log:
Add test cases for:
- https://issues.apache.org/bugzilla/show_bug.cgi?id=49994
- https://issues.apache.org/bugzilla/show_bug.cgi?id=23950
Based on the original test case for bug 23950 provided by Eli Miller
Added:
tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
(with props)
tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java (with
props)
tomcat/trunk/test/org/apache/naming/resources/TesterObject.java (with
props)
Added: tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1005790&view=auto
==
--- tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java (added)
+++ tomcat/trunk/test/org/apache/naming/resources/TestNamingContext.java Fri
Oct 8 11:57:57 2010
@@ -0,0 +1,143 @@
+/*
+ * 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.naming.resources;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestNamingContext extends TomcatBaseTest {
+
+public void testLookup() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+
+// Must have a real docBase - just use temp
+StandardContext ctx = (StandardContext)
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+// Create the resource
+ContextResource cr = new ContextResource();
+cr.setName("list/foo");
+cr.setType("org.apache.naming.resources.TesterObject");
+cr.setProperty("factory", "org.apache.naming.resources.TesterFactory");
+ctx.getNamingResources().addResource(cr);
+
+// Map the test Servlet
+Bug49994Servlet bug49994Servlet = new Bug49994Servlet();
+Tomcat.addServlet(ctx, "bug49994Servlet", bug49994Servlet);
+ctx.addServletMapping("/", "bug49994Servlet");
+
+tomcat.start();
+
+ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/");
+assertEquals("OK", bc.toString());
+
+}
+
+public final class Bug49994Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+resp.setContentType("text/plain;UTF-8");
+PrintWriter out = resp.getWriter();
+
+try {
+Context ctx = new InitialContext();
+Object obj1 = ctx.lookup("java:comp/env/list/foo");
+Object obj2 = ctx.lookup("java:comp/env/list/foo");
+if (obj1 == obj2) {
+out.print("FAIL");
+} else {
+out.print("OK");
+}
+} catch (NamingException ne) {
+ne.printStackTrace(out);
+}
+}
+}
+
+public void testListBindings() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+tomcat.enableNaming();
+
+// Must have a real docBase - just use temp
+StandardContext ctx = (StandardContext)
+tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+
+// Create the resource
+ContextResource cr = new ContextResource();
+cr.s
svn commit: r1005792 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Oct 8 11:59:22 2010 New Revision: 1005792 URL: http://svn.apache.org/viewvc?rev=1005792&view=rev Log: Update change log Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1005792&r1=1005791&r2=1005792&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 8 11:59:22 2010 @@ -85,6 +85,10 @@ 49987: Fix thread safety issue with population of servlet context initialization parameters. (markt) + +49994: As per the Java EE 6 specification, return a new +object instance for each JNDI look up of a resource reference. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49994] NamingContext Possible Bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=49994 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-10-08 07:59:54 EDT --- This has been fixed in trunk and will be included in 7.0.4 onwards. I also added a test case for this and a related issue (bug 23950). -- 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: r1005795 - in /tomcat/trunk: bin/catalina-tasks.xml build.xml webapps/docs/changelog.xml
Author: markt Date: Fri Oct 8 12:10:28 2010 New Revision: 1005795 URL: http://svn.apache.org/viewvc?rev=1005795&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50013 Correctly package classes from org.apache.tomcat.util.file and add the tomcat-util.jar to the class path for the Ant tasks. Based on a patch provided by Sylvain Laurent. Modified: tomcat/trunk/bin/catalina-tasks.xml tomcat/trunk/build.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina-tasks.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1005795&r1=1005794&r2=1005795&view=diff == --- tomcat/trunk/bin/catalina-tasks.xml (original) +++ tomcat/trunk/bin/catalina-tasks.xml Fri Oct 8 12:10:28 2010 @@ -29,6 +29,7 @@ + Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1005795&r1=1005794&r2=1005795&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Fri Oct 8 12:10:28 2010 @@ -277,6 +277,7 @@ + @@ -312,6 +313,7 @@ + Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1005795&r1=1005794&r2=1005795&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 8 12:10:28 2010 @@ -135,6 +135,16 @@ + + + +50013: Correctly package classes from +org.apache.tomcat.util.file and add the tomcat-util.jar to +the class path for the Ant tasks. Based on a patch provided by +Sylvain Laurent. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50013] missing classes when running catalina ant tasks
https://issues.apache.org/bugzilla/show_bug.cgi?id=50013 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #2 from Mark Thomas 2010-10-08 08:11:11 EDT --- Thanks. Fixed in trunk and will be included in 7.0.4 onwards. I tweaked the suggested patch slightly to move the o.a.t.u.file.* classes to the tomcat-util.jar rather than duplicate them. -- 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: r1005802 - /tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Author: markt
Date: Fri Oct 8 12:21:55 2010
New Revision: 1005802
URL: http://svn.apache.org/viewvc?rev=1005802&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48716
Don't call reset if the default LngManager is in use
Modified:
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1005802&r1=1005801&r2=1005802&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Fri Oct 8
12:21:55 2010
@@ -323,8 +323,13 @@ public /* abstract */ class LogFactory {
*/
public static void release(
@SuppressWarnings("unused") ClassLoader classLoader) {
-// JULI's log manager looks at the current classLoader
-LogManager.getLogManager().reset();
+// JULI's log manager looks at the current classLoader, the default
+// implementation does not so calling reset in that case will break
+// things
+if (!LogManager.getLogManager().getClass().getName().equals(
+"java.util.logging.LogManager")) {
+LogManager.getLogManager().reset();
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48716] Embedded Tomcat JULI aggressively resetting default logging configuration
https://issues.apache.org/bugzilla/show_bug.cgi?id=48716 --- Comment #19 from Mark Thomas 2010-10-08 08:31:47 EDT --- I've added the additional check before the reset() call to trunk and it will be in 7.0.4 onwards. For users that want to use the default LogManager, as long as applications are not reloaded the worst that should happen is loggers being shared across multiple applications. If application reload is required and memory leaks are not acceptable then the suggested approach in comment #10 / comment #16 should address any potential memory leak issues and could be implemented as a ServletContextListener. I don't propose adding this code to the Tomcat code-base. -- 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
Re: svn commit: r1005789 - in /tomcat/trunk/java/org/apache/naming: NamingContext.java NamingContextBindingsEnumeration.java
FYI ...
There was a similar fix applied here but reverted ...
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4
http://svn.apache.org/viewvc?view=revision&revision=832792
http://svn.apache.org/viewvc?view=revision&revision=832638
-Tim
On 10/8/2010 7:57 AM, ma...@apache.org wrote:
Author: markt
Date: Fri Oct 8 11:57:04 2010
New Revision: 1005789
URL: http://svn.apache.org/viewvc?rev=1005789&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49994
Lookup of JNDI references should return a new object instance each time
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1005789&r1=1005788&r2=1005789&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Fri Oct 8 11:57:04
2010
@@ -797,10 +797,6 @@ public class NamingContext implements Co
try {
Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
-if (obj != null) {
-entry.value = obj;
-entry.type = NamingEntry.ENTRY;
-}
return obj;
} catch (NamingException e) {
throw e;
Modified:
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java?rev=1005789&r1=1005788&r2=1005789&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
(original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
Fri Oct 8 11:57:04 2010
@@ -105,13 +105,13 @@ public class NamingContextBindingsEnumer
private Binding nextElementInternal() throws NamingException {
NamingEntry entry = iterator.next();
+Object value;
// If the entry is a reference, resolve it
if (entry.type == NamingEntry.REFERENCE
|| entry.type == NamingEntry.LINK_REF) {
try {
-// A lookup will resolve the entry
-ctx.lookup(new CompositeName(entry.name));
+value = ctx.lookup(new CompositeName(entry.name));
} catch (NamingException e) {
throw e;
} catch (Exception e) {
@@ -119,12 +119,11 @@ public class NamingContextBindingsEnumer
ne.initCause(e);
throw ne;
}
+} else {
+value = entry.value;
}
-return new Binding(entry.name, entry.value.getClass().getName(),
- entry.value, true);
+return new Binding(entry.name, value.getClass().getName(), value,
true);
}
-
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1005789 - in /tomcat/trunk/java/org/apache/naming: NamingContext.java NamingContextBindingsEnumeration.java
On 08/10/2010 13:48, Tim Funk wrote: > FYI ... > There was a similar fix applied here but reverted ... > https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4 > > http://svn.apache.org/viewvc?view=revision&revision=832792 > http://svn.apache.org/viewvc?view=revision&revision=832638 The Java EE 6 supports the fix. So does the Java EE 5 spec. That change should go back in to TC6. I get Konstantin's point, but that isn't what the spec says. Mark > > -Tim > > On 10/8/2010 7:57 AM, ma...@apache.org wrote: >> Author: markt >> Date: Fri Oct 8 11:57:04 2010 >> New Revision: 1005789 >> >> URL: http://svn.apache.org/viewvc?rev=1005789&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49994 >> Lookup of JNDI references should return a new object instance each time - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1005811 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ webapps/docs/
Author: markt
Date: Fri Oct 8 13:22:04 2010
New Revision: 1005811
URL: http://svn.apache.org/viewvc?rev=1005811&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50015
Re-factor dynamic servlet security implementation to make extensions, such as
JACC implementations, simpler. Patch provided by David Jencks.
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1005811&r1=1005810&r2=1005811&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Fri Oct 8 13:22:04 2010
@@ -24,8 +24,10 @@ import java.util.Set;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
+import javax.servlet.ServletSecurityElement;
import javax.servlet.descriptor.JspConfigDescriptor;
+import org.apache.catalina.core.ApplicationServletRegistration;
import org.apache.catalina.deploy.ApplicationParameter;
import org.apache.catalina.deploy.ErrorPage;
import org.apache.catalina.deploy.FilterDef;
@@ -1222,5 +1224,16 @@ public interface Context extends Contain
* Is this context using version 2.2 of the Servlet spec?
*/
boolean isServlet22();
+
+/**
+ * Notification that servlet security has been dynamically set in a
+ * {...@link ServletRegistration.Dynamic}
+ * @param registration servlet security was modified for
+ * @param servletSecurityElement new security constraints for this servlet
+ * @return urls currently mapped to this registration that are already
+ * present in web.xml
+ */
+Set addServletSecurity(ApplicationServletRegistration registration,
+ServletSecurityElement servletSecurityElement);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1005811&r1=1005810&r2=1005811&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Oct
8 13:22:04 2010
@@ -1082,10 +1082,10 @@ public class ApplicationContext
} else {
wrapper.setServletClass(servlet.getClass().getName());
wrapper.setServlet(servlet);
- }
-
-return new ApplicationServletRegistration(wrapper, context);
-}
+}
+
+return context.dynamicServletAdded(wrapper);
+}
public T createServlet(Class c)
@@ -1093,6 +1093,7 @@ public class ApplicationContext
try {
@SuppressWarnings("unchecked")
T servlet = (T)
context.getInstanceManager().newInstance(c.getName());
+context.dynamicServletCreated(servlet);
return servlet;
} catch (IllegalAccessException e) {
throw new ServletException(e);
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1005811&r1=1005810&r2=1005811&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
Fri Oct 8 13:22:04 2010
@@ -117,10 +117,12 @@ public class ApplicationServletRegistrat
// Have to add in a separate loop since spec requires no updates at all
// if there is an issue
-for (Map.Entry entry : initParameters.entrySet()) {
-setInitParameter(entry.getKey(), entry.getValue());
+if (conflicts.isEmpty()) {
+for (Map.Entry entry : initParameters.entrySet()) {
+setInitParameter(entry.getKey(), entry.getValue());
+}
}
-
+
return conflicts;
}
@@ -158,53 +160,7 @@ public class ApplicationServletRegistrat
getName(), context.getPath()));
}
-Set conflicts = new HashSet();
-
-Collection urlPatterns = getMappings();
-for (String urlPattern : urlPatterns) {
-boolean foundConflict = false;
-
-SecurityConstraint[] securityConstraints =
-context.findConstraints();
-f
DO NOT REPLY [Bug 50015] dynamic servlet security incomplete and badly distributed
https://issues.apache.org/bugzilla/show_bug.cgi?id=50015 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #2 from Mark Thomas 2010-10-08 09:22:03 EDT --- Thanks. Patch applied. Will be in 7.0.4 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
DO NOT REPLY [Bug 50016] bad division of responsibility around isUserInRole and new Request login and logout methods
https://issues.apache.org/bugzilla/show_bug.cgi?id=50016 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #1 from Mark Thomas 2010-10-08 09:59:47 EDT --- Fixed in trunk with some alterations: - removed rather than deprecated unnecessary code - kept line lengths to <=80 - Used string manager so messages have i18n support The fix will be in 7.0.4 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: r1005834 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/realm/ webapps/docs/
Author: markt
Date: Fri Oct 8 14:02:05 2010
New Revision: 1005834
URL: http://svn.apache.org/viewvc?rev=1005834&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50016
Re-factor isUserInRole() and login() / logout() methods to support JACC
implementations and to improve encapsulation.
Patch provided by David Jencks.
Modified:
tomcat/trunk/java/org/apache/catalina/Authenticator.java
tomcat/trunk/java/org/apache/catalina/Realm.java
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Authenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Authenticator.java?rev=1005834&r1=1005833&r2=1005834&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Authenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Authenticator.java Fri Oct 8
14:02:05 2010
@@ -19,8 +19,8 @@
package org.apache.catalina;
import java.io.IOException;
-import java.security.Principal;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Request;
@@ -53,21 +53,8 @@ public interface Authenticator {
public boolean authenticate(Request request, HttpServletResponse response,
LoginConfig config) throws IOException;
-/**
- * Register an authenticated Principal and authentication type in our
- * request, in the current session (if there is one), and with our
- * SingleSignOn valve, if there is one. Set the appropriate cookie
- * to be returned. Passing in a null principal will de-register any
- * SSO sessions.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are populating
- * @param principal The authenticated Principal to be registered
- * @param authType The authentication type to be registered
- * @param username Username used to authenticate (if any)
- * @param password Password used to authenticate (if any)
- */
-public void register(Request request, HttpServletResponse response,
-Principal principal, String authType,
-String username, String password);
+public void login(String userName, String password, Request request)
+throws ServletException;
+
+public void logout(Request request) throws ServletException;
}
Modified: tomcat/trunk/java/org/apache/catalina/Realm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Realm.java?rev=1005834&r1=1005833&r2=1005834&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Realm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Realm.java Fri Oct 8 14:02:05 2010
@@ -158,10 +158,11 @@ public interface Realm {
* security role, within the context of this Realm; otherwise return
* false.
*
+ * @param wrapper wrapper context for evaluating role
* @param principal Principal for whom the role is to be checked
* @param role Security role to be checked
*/
-public boolean hasRole(Principal principal, String role);
+public boolean hasRole(Wrapper wrapper, Principal principal, String role);
/**
* Enforce any user data constraint required by the security constraint
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1005834&r1=1005833&r2=1005834&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Fri Oct 8 14:02:05 2010
@@ -829,6 +829,29 @@ public abstract class AuthenticatorBase
}
+public void login(String username, String password, Request request)
+throws ServletException {
+Pri
svn commit: r1005837 - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/javax/servlet/jsp/ java/javax/servlet/jsp/tagext/ webapps/docs/
Author: markt
Date: Fri Oct 8 14:16:23 2010
New Revision: 1005837
URL: http://svn.apache.org/viewvc?rev=1005837&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50017
Code clean-up. No functional change.
Patch provided by sebb
Modified:
tomcat/trunk/java/javax/el/ValueReference.java
tomcat/trunk/java/javax/servlet/AsyncEvent.java
tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/jsp/ErrorData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java
tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/el/ValueReference.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueReference.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==
--- tomcat/trunk/java/javax/el/ValueReference.java (original)
+++ tomcat/trunk/java/javax/el/ValueReference.java Fri Oct 8 14:16:23 2010
@@ -26,8 +26,8 @@ public class ValueReference implements S
private static final long serialVersionUID = 1L;
-private Object base;
-private Object property;
+private final Object base;
+private final Object property;
public ValueReference(Object base, Object property) {
this.base = base;
Modified: tomcat/trunk/java/javax/servlet/AsyncEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncEvent.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncEvent.java Fri Oct 8 14:16:23 2010
@@ -21,13 +21,16 @@ package javax.servlet;
* @since Servlet 3.0
*/
public class AsyncEvent {
-private AsyncContext context;
-private ServletRequest request;
-private ServletResponse response;
-private Throwable throwable;
+private final AsyncContext context;
+private final ServletRequest request;
+private final ServletResponse response;
+private final Throwable throwable;
public AsyncEvent(AsyncContext context) {
this.context = context;
+this.request = null;
+this.response = null;
+this.throwable = null;
}
public AsyncEvent(AsyncContext context, ServletRequest request,
@@ -35,11 +38,14 @@ public class AsyncEvent {
this.context = context;
this.request = request;
this.response = response;
+this.throwable = null;
}
public AsyncEvent(AsyncContext context, Throwable throwable) {
this.context = context;
this.throwable = throwable;
+this.request = null;
+this.response = null;
}
public AsyncEvent(AsyncContext context, ServletRequest request,
Modified: tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpConstraintElement.java?rev=1005837&r1=1005836&r2=1005837&view=diff
==
--- tomcat/trunk/java/javax/servlet/HttpConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpConstraintElement.java Fri Oct 8
14:16:23 2010
@@ -31,15 +31,18 @@ public class HttpConstraintElement {
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
-private EmptyRoleSemantic emptyRoleSemantic = EmptyRoleSemantic.PERMIT;
-private TransportGuarantee transportGuarantee = TransportGuarantee.NONE;
-private String[] rolesAllowed = new String[0];
+private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
+private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
+private final String[] rolesAllowed;// = new String[0];
/**
DO NOT REPLY [Bug 50017] Make private immutable fields final
https://issues.apache.org/bugzilla/show_bug.cgi?id=50017 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-10-08 10:16:33 EDT --- Fixed in trunk. Will be in 7.0.4 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
DO NOT REPLY [Bug 50044] NIO HTTP connector aborts GET requests incorrectly.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 --- Comment #1 from Mark Thomas 2010-10-08 11:01:14 EDT --- The provided test case is incomplete. I had to reverse engineer a handful of support classes. Testing with the latest 7.0.x code shows no issues. I don't see any hanging on readThread.join(). The connectors in 7.0.x recently went through a major refactoring that addressed some async threading issues and may have fixed the root cause here too. Next up, testing with the latest 6.0.x... -- 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 50044] NIO HTTP connector aborts GET requests incorrectly.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 --- Comment #2 from Mark Thomas 2010-10-08 11:15:30 EDT --- I do see problems running this on Tomcat 6. Investigating now... -- 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 50027] NullPointerException if context.xml is present with
https://issues.apache.org/bugzilla/show_bug.cgi?id=50027 --- Comment #3 from Flávio Henrique 2010-10-08 11:27:39 EDT --- Created an attachment (id=26143) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26143) server.xml that crashes tomcat 7.0.2 Server.xml that crash tomcat 7.02. Only added information inside . -- 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 50027] NullPointerException if context.xml is present with
https://issues.apache.org/bugzilla/show_bug.cgi?id=50027 --- Comment #4 from Flávio Henrique 2010-10-08 11:29:28 EDT --- Here is the server.xml (zipped). I only added to the default server.xml inside Thanks -- 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 49991] Tomcat 7 JAAS problem with CDI
https://issues.apache.org/bugzilla/show_bug.cgi?id=49991 --- Comment #2 from Flávio Henrique 2010-10-08 11:36:21 EDT --- Sorry, the problem is related to FORM authentication, not JAAS. Again: sorry for this mistake. I will prepare the test as soon I reach my Office. Thanks -- 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 50044] NIO HTTP connector aborts GET requests incorrectly.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50044 --- Comment #3 from Mark Thomas 2010-10-08 13:03:33 EDT --- No joy tracking this down yet. Also, Tomcat 7 seems to be adding a 1s delay to each request. -- 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
Re: [taglibs] How about splitting up the resource bundle?
On Thu, Oct 7, 2010 at 9:29 PM, Jeremy Boynes wrote: > Now that we require 1.5, I refactored Resources to use varargs rather than > having multiple methods taking combinations of parameters. However, now that > it is greatly simplified, i was wondering whether we should replace the > single resource bundle containing messages for all implementations with > smaller ones associated with each tag or tag library. When you say, "we require 1.5", are you talking about code specifically for a JSTL 1.2 impl? If it's code that's targeted at a JSTL 1.1 impl, then it should really run on something as crusty as Java 1.3 (minimum for a JSP 2.0 standalone container). > For example, moving the messages for core to > o.a.t.s.tag.common.core.Resources.properties or for to > o.a.t.s.tag.common.core.importSupport.properties > > Thoughts? > Jeremy -- Kris Schneider - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50059] Resources are not served from /WEB-INF/lib/{*.jar}/META-INF/resources if metadata-complete="true" is set in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=50059 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-10-08 17:32:39 EDT --- Thanks for the report. Fixed in trunk and will be in 7.0.4 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: r1006033 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Fri Oct 8 21:37:19 2010
New Revision: 1006033
URL: http://svn.apache.org/viewvc?rev=1006033&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50059
Always make JAR resources available
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1006033&r1=1006032&r2=1006033&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Oct 8
21:37:19 2010
@@ -1214,7 +1214,7 @@ public class ContextConfig
webXmlVersion = Double.parseDouble(webXml.getVersion());
}
-if (webXmlVersion >= 3 && !webXml.isMetadataComplete()) {
+if (webXmlVersion >= 3) {
// Ordering is important here
// Step 1. Identify all the JARs packaged with the application
@@ -1222,67 +1222,78 @@ public class ContextConfig
// point.
Map fragments = processJarsForWebFragments();
-// Step 2. Order the fragments.
-Set orderedFragments =
-WebXml.orderWebFragments(webXml, fragments);
-
-// Step 3. Look for ServletContainerInitializer implementations
-ok = processServletContainerInitializers(orderedFragments);
-
-// Step 4. Process /WEB-INF/classes for annotations
-// This will add any matching classes to the typeInitializerMap
-if (ok) {
-URL webinfClasses;
-try {
-webinfClasses =
-
context.getServletContext().getResource("/WEB-INF/classes");
-processAnnotationsUrl(webinfClasses, webXml);
-} catch (MalformedURLException e) {
-log.error(sm.getString("contextConfig.webinfClassesUrl"),
e);
+// Only need to process fragments and annotations if metadata is
+// not complete
+Set orderedFragments = null;
+if (!webXml.isMetadataComplete()) {
+// Step 2. Order the fragments.
+orderedFragments = WebXml.orderWebFragments(webXml, fragments);
+
+// Step 3. Look for ServletContainerInitializer implementations
+ok = processServletContainerInitializers(orderedFragments);
+
+// Step 4. Process /WEB-INF/classes for annotations
+// This will add any matching classes to the typeInitializerMap
+if (ok) {
+URL webinfClasses;
+try {
+webinfClasses =
context.getServletContext().getResource(
+"/WEB-INF/classes");
+processAnnotationsUrl(webinfClasses, webXml);
+} catch (MalformedURLException e) {
+log.error(sm.getString(
+"contextConfig.webinfClassesUrl"), e);
+}
}
-}
-
-// Step 5. Process JARs for annotations - only need to process
those
-// fragments we are going to use
-// This will add any matching classes to the typeInitializerMap
-if (ok) {
-processAnnotations(orderedFragments);
-}
-
-// Step 6. Merge web-fragment.xml files into the main web.xml file.
-if (ok) {
-ok = webXml.merge(orderedFragments);
-}
-
-// Step 6.5 Convert explicitly mentioned jsps to servlets
-if (!false) {
-convertJsps(webXml);
-}
-
-// Step 7. Apply merged web.xml to Context
-if (ok) {
-webXml.configureContext(context);
-
-// Step 7a. Make the merged web.xml available to other
-// components, specifically Jasper, to save those components
-// from having to re-generate it.
-// TODO Use a ServletContainerInitializer for Jasper
-String mergedWebXml = webXml.toXml();
-context.getServletContext().setAttribute(
- org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
-mergedWebXml);
-if (context.getLogEffectiveWebXml()) {
-log.info("web.xml:\n" + mergedWebXml);
+
+// Step 5. Process JARs for annotations - only need to process
+// those fragments we are going to use
+// This will add any matching classes to the typeInitializerMap
+if (ok) {
+
svn commit: r1006037 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Fri Oct 8 21:46:05 2010
New Revision: 1006037
URL: http://svn.apache.org/viewvc?rev=1006037&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50027
Avoid NPE on start when a Context is defined in server.xml with one or more
JNDI resources.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1006037&r1=1006036&r2=1006037&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Oct 8
21:46:05 2010
@@ -1760,9 +1760,13 @@ public class StandardContext extends Con
support.firePropertyChange("namingResources",
oldNamingResources, this.namingResources);
-unregister(onameNamingResources);
-onameNamingResources = register(namingResources,
-"type=NamingResources," + getObjectKeyPropertiesNameOnly());
+// If set from server.xml, getObjectKeyPropertiesNameOnly() will
+// trigger an NPE. Initial registration takes place on INIT.
+if (getState() != LifecycleState.NEW) {
+unregister(onameNamingResources);
+onameNamingResources = register(namingResources,
+"type=NamingResources," +
getObjectKeyPropertiesNameOnly());
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1006037&r1=1006036&r2=1006037&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 8 21:46:05 2010
@@ -104,6 +104,10 @@
sebb. (markt)
+50027: Avoid NPE on start when a Context is defined in
+server.xml with one or more JNDI resources. (markt)
+
+
50059: JARs should always be searched for static resources
even if the web application is marked as meta-data complete. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50027] NullPointerException if context.xml is present with
https://issues.apache.org/bugzilla/show_bug.cgi?id=50027 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2010-10-08 17:46:33 EDT --- Thanks for the example. That made it much clearer. This has been fixed in trunk and will be included in 7.0.4 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
DO NOT REPLY [Bug 49991] Tomcat 7 JAAS problem with CDI
https://issues.apache.org/bugzilla/show_bug.cgi?id=49991 --- Comment #3 from Flávio Henrique 2010-10-08 22:25:58 EDT --- Created an attachment (id=26144) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26144) Tomcat FormAuthentication and CDI problem You will need to grab Weld 1.1.0 and put weld-1.1.0.Beta1\artifacts\weld\weld-servlet.jar inside WEB-CONTENT/lib, because I couldn´t updaload the project with the library (file size limit). You can download weld here http://seamframework.org/Weld/Downloads This problem happens with all Weld versions, even with the newest beta. -- 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 49991] Tomcat 7 JAAS problem with CDI
https://issues.apache.org/bugzilla/show_bug.cgi?id=49991 --- Comment #4 from Flávio Henrique 2010-10-08 22:28:11 EDT --- Mark, here is the project for Eclipse Helios 3.6 SR1. You will need to grab Weld 1.1.0 and put weld-1.1.0.Beta1\artifacts\weld\weld-servlet.jar inside WEB-CONTENT/lib, because I couldn´t updaload the project with the library (file size limit). You can download weld here http://seamframework.org/Weld/Downloads This problem happens with all Weld versions, even with the newest beta. The instructions are in the readme.txt, that I will also put here: how to see the bug: 1 - import the project in Helios 3.6 SR1 2 - run on Tomcat 7.0.2 3 - try to access the protected page in restricted/restrictedpage.jsp (right click on the page and execute) 4 - you will get the exception org.jboss.weld.context.ContextNotActiveException: WELD-001303 No active contexts for scope type javax.enterprise.context.RequestScoped Comment the security constraint that fire the form authentication and you have NO exception. I also discoverd that: a) in eclipse, if you run restricted.jsp with right click (Run On Server) the exception is throw, but if you run the project and after the server start type the complete URL to restricted.jsp, the bug doesn´t happen. b) if you "run on server" the project and open the URL in another browser (don´t use eclipse build in browser), this problem happens. -- 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 50063] New: Latest trunck can't configure context when metadata-complete is true and version is 3.0
https://issues.apache.org/bugzilla/show_bug.cgi?id=50063
Summary: Latest trunck can't configure context when
metadata-complete is true and version is 3.0
Product: Tomcat 7
Version: trunk
Platform: PC
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: heyou...@hotmail.com
patch:
### Eclipse Workspace Patch 1.0
#P tomcat-7.0.x
Index: java/org/apache/catalina/startup/ContextConfig.java
===
--- java/org/apache/catalina/startup/ContextConfig.java(revision 1006105)
+++ java/org/apache/catalina/startup/ContextConfig.java(working copy)
@@ -1281,6 +1281,7 @@
}
}
} else {
+webXml.configureContext(context);
ok = true;
}
--
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
