[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

2012-08-15 Thread Gump 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 14 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency httpunit failed with reason build failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
 to 
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing 
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing 
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO] 
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO] 
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking 
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] ---

svn commit: r1373488 - /tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 16:01:19 2012
New Revision: 1373488

URL: http://svn.apache.org/viewvc?rev=1373488&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53654
Support file:// URLs for JSP dependencies

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1373488&r1=1373487&r2=1373488&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Aug 15 
16:01:19 2012
@@ -496,7 +496,7 @@ public abstract class Compiler {
 try {
 String key = include.getKey();
 URL includeUrl;
-if (key.startsWith("jar:")) {
+if (key.startsWith("jar:") || key.startsWith("file:")) {
 includeUrl = new URL(key);
 } else {
 includeUrl = ctxt.getResource(include.getKey());



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1373489 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Compiler.java webapps/docs/changelog.xml

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 16:03:06 2012
New Revision: 1373489

URL: http://svn.apache.org/viewvc?rev=1373489&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53654
Support file:// URLs for JSP dependencies
Patch provided by Viola Lu

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1373488

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1373489&r1=1373488&r2=1373489&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Aug 
15 16:03:06 2012
@@ -496,7 +496,7 @@ public abstract class Compiler {
 try {
 String key = include.getKey();
 URL includeUrl;
-if (key.startsWith("jar:")) {
+if (key.startsWith("jar:") || key.startsWith("file:")) {
 includeUrl = new URL(key);
 } else {
 includeUrl = ctxt.getResource(include.getKey());

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=1373489&r1=1373488&r2=1373489&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 16:03:06 2012
@@ -160,6 +160,10 @@
 53545: Ensure buffered data is cleared when using a
 jsp:forward action inside a classic custom tag. (markt)
   
+  
+53654: Support file:// URLs for JSP
+dependencies. Patch provided by Viola Lu. (markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 53654] JSP file is always recompiled for using file based TLD URL

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53654

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas  ---
Thanks for the patch. It has been applied to trunk and 7.0.x and will be
included in 7.0.30 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

[Bug 53725] New: Some GZipped responses result in java.io.IOException: Corrupt GZIP trailer during gunzip.

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53725

  Priority: P2
Bug ID: 53725
  Assignee: dev@tomcat.apache.org
   Summary: Some GZipped responses result in java.io.IOException:
Corrupt GZIP trailer during gunzip.
  Severity: critical
Classification: Unclassified
OS: Linux
  Reporter: kevin.l.st...@nokia.com
  Hardware: PC
Status: NEW
   Version: unspecified
 Component: Connectors
   Product: Tomcat 7

Created attachment 29238
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29238&action=edit
Please see description for purpose of attachment.

FlushableGZIPOutputStream gives corrupt output in rare circumstances.  Tomcat 7
encounters this bug when compression is turned on.

Please see the attachment:  Compile and run ErrorCase.java which uses
FlushableGZIPOutputStream to GZIP the contents of data.bin (included in the
attachment) and then uses GZIPInputStream to gunzip the output of
FlushableGZIPOutputStream, resulting in java.io.IOException: Corrupt GZIP
trailer.

-- 
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 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

--- Comment #3 from Mark Thomas  ---
https://chrislacy.net/downloads/tomcat-bug-53697.tar.gz returns a 404 reponse

Without a test case that demonstrates the issue, this is going to get closed as
wontfix.

-- 
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: r1373570 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProcessor.java AjpAprProcessor.java AjpAprProtocol.java AjpMessage.java AjpNioProcessor.java AjpNioProtocol.java AjpProto

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 18:57:37 2012
New Revision: 1373570

URL: http://svn.apache.org/viewvc?rev=1373570&view=rev
Log:
Clean-up: final markers (UCDetector)

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1373570&r1=1373569&r2=1373570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Aug 
15 18:57:37 2012
@@ -137,7 +137,7 @@ public abstract class AbstractAjpProcess
 /**
  * AJP packet size.
  */
-protected int packetSize;
+protected final int packetSize;
 
 /**
  * Header message. Note that this header is merely the one used during the
@@ -145,25 +145,25 @@ public abstract class AbstractAjpProcess
  * request header. It will stay unchanged during the processing of the 
whole
  * request.
  */
-protected AjpMessage requestHeaderMessage = null;
+protected final AjpMessage requestHeaderMessage;
 
 
 /**
  * Message used for response composition.
  */
-protected AjpMessage responseMessage = null;
+protected final AjpMessage responseMessage;
 
 
 /**
  * Body message.
  */
-protected AjpMessage bodyMessage = null;
+protected final AjpMessage bodyMessage;
 
 
 /**
  * Body message.
  */
-protected MessageBytes bodyBytes = MessageBytes.newInstance();
+protected final MessageBytes bodyBytes = MessageBytes.newInstance();
 
 
 /**
@@ -181,13 +181,13 @@ public abstract class AbstractAjpProcess
 /**
  * Temp message bytes used for processing.
  */
-protected MessageBytes tmpMB = MessageBytes.newInstance();
+protected final MessageBytes tmpMB = MessageBytes.newInstance();
 
 
 /**
  * Byte chunk for certs.
  */
-protected MessageBytes certificates = MessageBytes.newInstance();
+protected final MessageBytes certificates = MessageBytes.newInstance();
 
 
 /**

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1373570&r1=1373569&r2=1373570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed Aug 15 
18:57:37 2012
@@ -84,13 +84,13 @@ public class AjpAprProcessor extends Abs
 /**
  * Direct buffer used for input.
  */
-protected ByteBuffer inputBuffer = null;
+protected final ByteBuffer inputBuffer;
 
 
 /**
  * Direct buffer used for output.
  */
-protected ByteBuffer outputBuffer = null;
+protected final ByteBuffer outputBuffer;
 
 
 // - Public Methods

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1373570&r1=1373569&r2=1373570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Aug 15 
18:57:37 2012
@@ -77,7 +77,7 @@ public class AjpAprProtocol extends Abst
 /**
  * Connection handler for AJP.
  */
-private AjpConnectionHandler cHandler;
+private final AjpConnectionHandler cHandler;
 
 
 // - Public Methods
@@ -106,7 +106,7 @@ public class AjpAprProtocol extends Abst
 extends AbstractAjpConnectionHandler
 implements Handler {
 
-protected AjpAprProtocol proto;
+protected final AjpAprProtocol proto;
 
 public AjpConnectionHandler(AjpAprProtocol proto) {
 this.proto = proto;

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1373570&r1=1373569&r2=1373570&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/trunk/java/org/apache/coyote/

[Bug 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

--- Comment #4 from lac...@gmail.com ---
Please try again.  Server overhaul yesterday evening took download down.

-- 
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: r1373578 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 19:12:38 2012
New Revision: 1373578

URL: http://svn.apache.org/viewvc?rev=1373578&view=rev
Log:
Clean-up l12n messages

Added:
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties   (with 
props)
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1373578&r1=1373577&r2=1373578&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Aug 15 
19:12:38 2012
@@ -628,11 +628,11 @@ public abstract class AbstractProtocol i
 } catch(java.net.SocketException e) {
 // SocketExceptions are normal
 getLog().debug(sm.getString(
-"ajpprotocol.proto.socketexception.debug"), e);
+"abstractConnectionHandler.socketexception.debug"), e);
 } catch (java.io.IOException e) {
 // IOExceptions are normal
 getLog().debug(sm.getString(
-"ajpprotocol.proto.ioexception.debug"), e);
+"abstractConnectionHandler.ioexception.debug"), e);
 }
 // Future developers: if you discover any other
 // rare-but-nonfatal exceptions, catch them here, and log as
@@ -642,7 +642,8 @@ public abstract class AbstractProtocol i
 // any other exception or error is odd. Here we log it
 // with "ERROR" level, so it will show up even on
 // less-than-verbose logs.
-getLog().error(sm.getString("ajpprotocol.proto.error"), e);
+getLog().error(
+sm.getString("abstractConnectionHandler.error"), e);
 }
 // Don't try to add upgrade processors back into the pool
 if (!(processor instanceof UpgradeProcessor)) {

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1373578&r1=1373577&r2=1373578&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Wed Aug 15 
19:12:38 2012
@@ -12,6 +12,9 @@
 # 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.
+abstractConnectionHandler.error=Error reading request, ignored
+abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
+abstractConnectionHandler.socketexception.debug=SocketExceptions are normal, 
ignored
 
 abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
 abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]

Added: tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties?rev=1373578&view=auto
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties (added)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties Wed Aug 15 
19:12:38 2012
@@ -0,0 +1,15 @@
+# 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.
+abstractConnectionHandler.error = Error leyendo requerimiento, ignorado

Propchange: tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
-

svn commit: r1373589 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/ajp/

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 19:20:39 2012
New Revision: 1373589

URL: http://svn.apache.org/viewvc?rev=1373589&view=rev
Log:
Clean-up l12n messages

Added:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings_es.properties
  - copied unchanged from r1373578, 
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1373578

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Wed Aug 
15 19:20:39 2012
@@ -628,11 +628,11 @@ public abstract class AbstractProtocol i
 } catch(java.net.SocketException e) {
 // SocketExceptions are normal
 getLog().debug(sm.getString(
-"ajpprotocol.proto.socketexception.debug"), e);
+"abstractConnectionHandler.socketexception.debug"), e);
 } catch (java.io.IOException e) {
 // IOExceptions are normal
 getLog().debug(sm.getString(
-"ajpprotocol.proto.ioexception.debug"), e);
+"abstractConnectionHandler.ioexception.debug"), e);
 }
 // Future developers: if you discover any other
 // rare-but-nonfatal exceptions, catch them here, and log as
@@ -642,7 +642,8 @@ public abstract class AbstractProtocol i
 // any other exception or error is odd. Here we log it
 // with "ERROR" level, so it will show up even on
 // less-than-verbose logs.
-getLog().error(sm.getString("ajpprotocol.proto.error"), e);
+getLog().error(
+sm.getString("abstractConnectionHandler.error"), e);
 }
 // Don't try to add upgrade processors back into the pool
 if (!(processor instanceof UpgradeProcessor)) {

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1373589&r1=1373588&r2=1373589&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/LocalStrings.properties Wed Aug 
15 19:20:39 2012
@@ -12,6 +12,9 @@
 # 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.
+abstractConnectionHandler.error=Error reading request, ignored
+abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
+abstractConnectionHandler.socketexception.debug=SocketExceptions are normal, 
ignored
 
 abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
 abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1373589&r1=1373588&r2=1373589&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed 
Aug 15 19:20:39 2012
@@ -319,7 +319,7 @@ public class AjpAprProcessor extends Abs
 if (nRead > 0) {
 inputBuffer.limit(inputBuffer.limit() + nRead);
 } else {
-throw new IOException(sm.getString("ajpprotocol.failedread"));
+throw new IOException(sm.getString("ajpprocessor.failedread"));
 }
 }
 
@@ -355,7 +355,7 @@ public class AjpAprProcessor extends Abs
 if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP) 
{
 return

svn commit: r1373595 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProtocol.java AjpNioProtocol.java LocalStrings.properties

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 19:28:57 2012
New Revision: 1373595

URL: http://svn.apache.org/viewvc?rev=1373595&view=rev
Log:
Fix unused StringManager by using it.

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1373595&r1=1373594&r2=1373595&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Aug 15 
19:28:57 2012
@@ -28,7 +28,7 @@ public abstract class AbstractAjpProtoco
  * The string manager for this package.
  */
 protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
+StringManager.getManager(Constants.Package);
 
 
 @Override

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1373595&r1=1373594&r2=1373595&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Aug 15 
19:28:57 2012
@@ -121,7 +121,7 @@ public class AjpNioProtocol extends Abst
 @Override
 public void release(SocketChannel socket) {
 if (log.isDebugEnabled())
-log.debug("Iterating through our connections to release a 
socket channel:"+socket);
+log.debug(sm.getString("ajpnioprotocol.releaseStart", socket));
 boolean released = false;
 Iterator>> 
it = connections.entrySet().iterator();
 while (it.hasNext()) {
@@ -136,7 +136,8 @@ public class AjpNioProtocol extends Abst
 }
 }
 if (log.isDebugEnabled())
-log.debug("Done iterating through our connections to release a 
socket channel:"+socket +" released:"+released);
+log.debug(sm.getString("ajpnioprotocol.releaseEnd",
+socket, Boolean.valueOf(released)));
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1373595&r1=1373594&r2=1373595&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Wed Aug 15 
19:28:57 2012
@@ -12,6 +12,9 @@
 # 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.
+ajpnioprotocol.releaseStart=Iterating through our connections to release a 
socket channel [{0}]
+ajpnioprotocol.releaseEnd=Done iterating through our connections to release a 
socket channel [{0}] released [{1}]
+
 ajpprocessor.failedread=Socket read failed
 ajpprocessor.failedsend=Failed to send AJP message
 ajpprocessor.header.error=Header message parsing failed



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1373607 - /tomcat/trunk/java/org/apache/coyote/ajp/Constants.java

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 20:06:15 2012
New Revision: 1373607

URL: http://svn.apache.org/viewvc?rev=1373607&view=rev
Log:
Java 7 <>

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/Constants.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/Constants.java?rev=1373607&r1=1373606&r2=1373607&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/Constants.java Wed Aug 15 20:06:15 
2012
@@ -231,7 +231,7 @@ public final class Constants {
 }
 
 private static final Hashtable  responseTransHash =
-new Hashtable(20);
+new Hashtable<>(20);
 
 static {
 try {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1373618 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationJspPropertyGroupDescriptor.java deploy/JspPropertyGroup.java deploy/WebXml.java startup/WebRuleSet.java

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 20:32:44 2012
New Revision: 1373618

URL: http://svn.apache.org/viewvc?rev=1373618&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53702
 may contain multiple 

Modified:

tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1373618&r1=1373617&r2=1373618&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 Wed Aug 15 20:32:44 2012
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.core;
 
 import java.util.Collection;
-import java.util.HashSet;
 
 import javax.servlet.descriptor.JspPropertyGroupDescriptor;
 
@@ -160,13 +158,6 @@ public class ApplicationJspPropertyGroup
 
 @Override
 public Collection getUrlPatterns() {
-Collection result = new HashSet<>();
-
-if (jspPropertyGroup.getUrlPattern() != null) {
-result.add(jspPropertyGroup.getUrlPattern());
-}
-
-return result;
+return jspPropertyGroup.getUrlPatterns();
 }
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1373618&r1=1373617&r2=1373618&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java Wed Aug 
15 20:32:44 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.catalina.deploy;
 
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -71,11 +72,11 @@ public class JspPropertyGroup {
 }
 public Boolean getTrimWhitespace() { return trimWhitespace; }
 
-private String urlPattern = null;
-public void setUrlPattern(String urlPattern) {
-this.urlPattern = urlPattern;
+private Set urlPattern = new HashSet<>();
+public void addUrlPattern(String urlPattern) {
+this.urlPattern.add(urlPattern);
 }
-public String getUrlPattern() { return this.urlPattern; }
+public Set getUrlPatterns() { return this.urlPattern; }
 
 private String defaultContentType = null;
 public void setDefaultContentType(String defaultContentType) {

Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1373618&r1=1373617&r2=1373618&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Aug 15 
20:32:44 2012
@@ -801,7 +801,9 @@ public class WebXml {
 }
 for (JspPropertyGroup jpg : jspPropertyGroups) {
 sb.append("\n");
-appendElement(sb, INDENT6, "url-pattern", jpg.getUrlPattern());
+for (String urlPattern : jpg.getUrlPatterns()) {
+appendElement(sb, INDENT6, "url-pattern", urlPattern);
+}
 appendElement(sb, INDENT6, "el-ignored", jpg.getElIgnored());
 appendElement(sb, INDENT6, "scripting-invalid",
 jpg.getScriptingInvalid());
@@ -1345,12 +1347,16 @@ public class WebXml {
 jspServletName = "jsp";
 }
 if (context.findChild(jspServletName) != null) {
-context.addServletMapping(jspPropertyGroup.getUrlPattern(),
-jspServletName, true);
+for (String urlPattern : jspPropertyGroup.getUrlPatterns()) {
+context.addServletMapping(urlPattern, jspServletName, 
true);
+}
 } else {
-if(log.isDebugEnabled())
-log.debug("Skiping " + jspPropertyGroup.getUrlPattern() +
-" , no servlet " + jspServletName);
+if(log.isDebugEnabled()) {
+for (String urlPattern : 
jspPropertyGroup.getUrlPatterns()) {
+log.debug("Skiping " + urlPattern + " , no servlet " +
+jspServletName

svn commit: r1373621 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/startup/ webapps/docs/

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 20:37:06 2012
New Revision: 1373621

URL: http://svn.apache.org/viewvc?rev=1373621&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53702
 may contain multiple 

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1373618

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1373621&r1=1373620&r2=1373621&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 Wed Aug 15 20:37:06 2012
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.core;
 
 import java.util.Collection;
-import java.util.HashSet;
 
 import javax.servlet.descriptor.JspPropertyGroupDescriptor;
 
@@ -164,13 +162,6 @@ public class ApplicationJspPropertyGroup
 
 @Override
 public Collection getUrlPatterns() {
-Collection result = new HashSet();
-
-if (jspPropertyGroup.getUrlPattern() != null) {
-result.add(jspPropertyGroup.getUrlPattern());
-}
-
-return result;
+return jspPropertyGroup.getUrlPatterns();
 }
-
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1373621&r1=1373620&r2=1373621&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java 
Wed Aug 15 20:37:06 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.catalina.deploy;
 
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -71,11 +72,11 @@ public class JspPropertyGroup {
 }
 public Boolean getTrimWhitespace() { return trimWhitespace; }
 
-private String urlPattern = null;
-public void setUrlPattern(String urlPattern) {
-this.urlPattern = urlPattern;
+private Set urlPattern = new HashSet();
+public void addUrlPattern(String urlPattern) {
+this.urlPattern.add(urlPattern);
 }
-public String getUrlPattern() { return this.urlPattern; }
+public Set getUrlPatterns() { return this.urlPattern; }
 
 private String defaultContentType = null;
 public void setDefaultContentType(String defaultContentType) {

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1373621&r1=1373620&r2=1373621&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Wed Aug 15 
20:37:06 2012
@@ -810,7 +810,9 @@ public class WebXml {
 }
 for (JspPropertyGroup jpg : jspPropertyGroups) {
 sb.append("\n");
-appendElement(sb, INDENT6, "url-pattern", jpg.getUrlPattern());
+for (String urlPattern : jpg.getUrlPatterns()) {
+appendElement(sb, INDENT6, "url-pattern", urlPattern);
+}
 appendElement(sb, INDENT6, "el-ignored", jpg.getElIgnored());
 appendElement(sb, INDENT6, "scripting-invalid",
 jpg.getScriptingInvalid());
@@ -1354,12 +1356,16 @@ public class WebXml {
 jspServletName = "jsp";
 }
 if (context.findChild(jspServletName) != null) {
-context.addServletMapping(jspPropertyGroup.getUrlPattern(),
-jspServletName, true);
+for (String urlPattern : jspPropertyGroup.getUrlPatterns()) {
+context.addServletMapping(urlPattern, jspServletName, 
true);
+}
 } else {
-if(log.isDebugEnabled())
-

svn commit: r1373622 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 20:38:19 2012
New Revision: 1373622

URL: http://svn.apache.org/viewvc?rev=1373622&view=rev
Log:
Always make the final webl.xml file available

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

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=1373622&r1=1373621&r2=1373622&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Aug 15 
20:38:19 2012
@@ -1230,18 +1230,6 @@ public class ContextConfig implements Li
 // Step 9. Apply merged web.xml to Context
 if (ok) {
 webXml.configureContext(context);
-
-// Step 9a. 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();
-sContext.setAttribute(
-   org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
-   mergedWebXml);
-if (context.getLogEffectiveWebXml()) {
-log.info("web.xml:\n" + mergedWebXml);
-}
 }
 } else {
 webXml.merge(defaults);
@@ -1249,6 +1237,18 @@ public class ContextConfig implements Li
 webXml.configureContext(context);
 }
 
+// Step 9a. 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();
+sContext.setAttribute(
+   org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
+   mergedWebXml);
+if (context.getLogEffectiveWebXml()) {
+log.info("web.xml:\n" + mergedWebXml);
+}
+
 // Always need to look for static resources
 // Step 10. Look for static resources packaged in JARs
 if (ok) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1373623 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 20:40:33 2012
New Revision: 1373623

URL: http://svn.apache.org/viewvc?rev=1373623&view=rev
Log:
Always make the final web.xml file available

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1373622

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1373623&r1=1373622&r2=1373623&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Wed Aug 15 20:40:33 2012
@@ -1324,18 +1324,6 @@ public class ContextConfig implements Li
 // Step 9. Apply merged web.xml to Context
 if (ok) {
 webXml.configureContext(context);
-
-// Step 9a. 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();
-sContext.setAttribute(
-   org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
-   mergedWebXml);
-if (context.getLogEffectiveWebXml()) {
-log.info("web.xml:\n" + mergedWebXml);
-}
 }
 } else {
 webXml.merge(defaults);
@@ -1343,6 +1331,18 @@ public class ContextConfig implements Li
 webXml.configureContext(context);
 }
 
+// Step 9a. 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();
+sContext.setAttribute(
+   org.apache.tomcat.util.scan.Constants.MERGED_WEB_XML,
+   mergedWebXml);
+if (context.getLogEffectiveWebXml()) {
+log.info("web.xml:\n" + mergedWebXml);
+}
+
 // Always need to look for static resources
 // Step 10. Look for static resources packaged in JARs
 if (ok) {

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=1373623&r1=1373622&r2=1373623&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 20:40:33 2012
@@ -144,6 +144,10 @@
  elements having multiple
  elements. (markt)
   
+  
+Always make the resulting web.xml available even if metadata-complete 
is
+true. (markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 53702] Only the last url-pattern from jsp-property-group is processed

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53702

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 7.0.x and will be included in 7.0.30 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

[Bug 53713] Performance tuning solution for JspReader

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53713

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO
   Severity|normal  |enhancement

--- Comment #2 from Mark Thomas  ---
Moving to enhancement since there is no bug here.

Please provide a test case that demonstrates the performance improvement.

-- 
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 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

--- Comment #5 from Mark Thomas  ---
I don't think a 43MB download could be classed as a minimal test case.

While it is true that having a complete copy of the entire Tomcat directory
means we have all the config info we might ever need, normally the WAR would
suffice.

-- 
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 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

--- Comment #6 from Mark Thomas  ---
OK. I can reproduce this now. I'm not sure how long it will take to track down
the root cause.

-- 
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] [Commented] (MTOMCAT-173) Direct dependencies are not added to classpath

2012-08-15 Thread *$^¨%`£ 

[ 
https://issues.apache.org/jira/browse/MTOMCAT-173?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13435556#comment-13435556
 ] 

Olivier Lamy (*$^¨%`£) commented on MTOMCAT-173:


That's not a problem as classpath elements (the output directory of your 
dependency from reactors is added to the class path).
Which maven version are you using ? (I have to say that work only with maven 3).

> Direct dependencies are not added to classpath
> --
>
> Key: MTOMCAT-173
> URL: https://issues.apache.org/jira/browse/MTOMCAT-173
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat6, tomcat7
>Affects Versions: 2.0
>Reporter: Arne Franken
>Assignee: Olivier Lamy (*$^¨%`£)
>
> in DefaultClassLoaderEntriesCalculator#calculateClassPathEntries, direct 
> dependencies are not added, the log message says "skip adding artifact " + 
> artifact.getArtifactId() + " as it's in reactors". 
> In my case, it's a jar that is configured as a direct dependency. When the 
> Webapp starts, the Jar is missing from the Classpath and the startup fails.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
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

svn commit: r1373666 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11NioProcessor.java

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 22:45:51 2012
New Revision: 1373666

URL: http://svn.apache.org/viewvc?rev=1373666&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53697
Fix a regression in the fix for BZ 51881 that mean that in some circumstances 
the isComet flag was not reset on the HttpAprProcessor. This caused problems 
when the Processor was re-used for a new connection.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1373666&r1=1373665&r2=1373666&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Aug 15 22:45:51 2012
@@ -1679,6 +1679,7 @@ public abstract class AbstractHttp11Proc
 localName = null;
 remotePort = -1;
 localPort = -1;
+comet = false;
 recycleInternal();
 }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1373666&r1=1373665&r2=1373666&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Aug 
15 22:45:51 2012
@@ -381,7 +381,6 @@ public class Http11NioProcessor extends 
 @Override
 public void recycleInternal() {
 socket = null;
-comet = false;
 sendfileData = null;
 wantOnWritePossible = false;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1373667 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java java/org/apache/coyote/http11/Http11NioProcessor.java webapps/docs/changelog.xml

2012-08-15 Thread markt 
Author: markt
Date: Wed Aug 15 22:56:05 2012
New Revision: 1373667

URL: http://svn.apache.org/viewvc?rev=1373667&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53697
Fix a regression in the fix for BZ 51881 that mean that in some circumstances 
the isComet flag was not reset on the HttpAprProcessor. This caused problems 
when the Processor was re-used for a new connection.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1373666

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1373667&r1=1373666&r2=1373667&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
Wed Aug 15 22:56:05 2012
@@ -1681,6 +1681,7 @@ public abstract class AbstractHttp11Proc
 localName = null;
 remotePort = -1;
 localPort = -1;
+comet = false;
 recycleInternal();
 }
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1373667&r1=1373666&r2=1373667&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
Wed Aug 15 22:56:05 2012
@@ -294,7 +294,6 @@ public class Http11NioProcessor extends 
 @Override
 public void recycleInternal() {
 socket = null;
-comet = false;
 sendfileData = null;
 }
 

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=1373667&r1=1373666&r2=1373667&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 22:56:05 2012
@@ -161,6 +161,14 @@
 Prevent possible NPE when processing Comet requests during Connector
 shutdown. (markt)
   
+  
+53697: Correct a regression in the fix for 51881
+that mean that in some circumstances the comet flag was 
not
+reset on HttpAprProcessor instances. This caused problems
+when the Processor was re-used for a new connection that would trigger 
a
+NullPointerException and could result in a JVM crash.
+(markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #7 from Mark Thomas  ---
Found it. It is a regression in the HTTP APR connector introduced by the fix
for bug 51881. The isComet flag for instances of Http11AprProcessor (which gets
re-used across connections) was not being reset in some circumstances so Tomcat
was attempting to handle a new HTTP request using the Comet processing chain.
Chaos ensued.

This has been fixed in trunk and 7.0.x and will be included in 7.0.30 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

[Bug 53697] java.lang.NullPointerException at org.apache.coyote.http11.Http11AprProcessor.actionInternal(Http11AprProcessor.java:277)

2012-08-15 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=53697

--- Comment #8 from lac...@gmail.com ---
Testing now, but wanted to give you a quick thanks.

-- 
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