svn commit: r1057513 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java container/webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Jan 11 08:01:28 2011
New Revision: 1057513
URL: http://svn.apache.org/viewvc?rev=1057513view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
Ensure 304s are not returned when using static files as error pages
Additional patch is not applied yet, is left in STATUS.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1057513r1=1057512r2=1057513view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 11 08:01:28 2011
@@ -77,21 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
- Ensure 304s are not returned when using static files as error pages
- http://people.apache.org/~markt/patches/2011-01-04-bug50413-tc5.patch
- +1: markt, rjung
- +1: kkolinko: There is a minor glitch - see
https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
- but it can be addressed separately, after applying the patch.
- -1:
-
- Additional patch:
- Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
- http://svn.apache.org/viewvc?rev=1056889view=rev
- Serve the error page regardless of Range header in the original request.
- +1: kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
Expose available property of StandardWrapper via JMX
http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc5.patch
@@ -132,3 +117,10 @@ PATCHES PROPOSED TO BACKPORT:
(markt's patch)
+1: kkolinko, rjung
-1:
+
+* Additional patch for bug 50413:
+ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
+ Serve the error page regardless of Range header in the original request.
+ http://svn.apache.org/viewvc?rev=1056889view=rev
+ +1: kkolinko
+ -1:
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=1057513r1=1057512r2=1057513view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Tue Jan 11 08:01:28 2011
@@ -798,6 +798,13 @@ public class DefaultServlet
}
}
+boolean isError = false;
+Integer status =
+(Integer) request.getAttribute(javax.servlet.error.status_code);
+if (status != null) {
+isError = status.intValue() = HttpServletResponse.SC_BAD_REQUEST;
+}
+
// Check if the conditions specified in the optional If headers are
// satisfied.
if (cacheEntry.context == null) {
@@ -805,8 +812,8 @@ public class DefaultServlet
// Checking If headers
boolean included =
(request.getAttribute(Globals.INCLUDE_CONTEXT_PATH_ATTR) !=
null);
-if (!included
- !checkIfHeaders(request, response, cacheEntry.attributes)) {
+if (!included !isError
+!checkIfHeaders(request, response, cacheEntry.attributes))
{
return;
}
@@ -834,21 +841,23 @@ public class DefaultServlet
contentType = text/html;charset=UTF-8;
} else {
-if (useAcceptRanges) {
-// Accept ranges header
-response.setHeader(Accept-Ranges, bytes);
+if (!isError) {
+if (useAcceptRanges) {
+// Accept ranges header
+response.setHeader(Accept-Ranges, bytes);
+}
+
+// Parse range specifier
+ranges = parseRange(request, response, cacheEntry.attributes);
+
+// ETag header
+response.setHeader(ETag, getETag(cacheEntry.attributes));
+
+// Last-Modified header
+response.setHeader(Last-Modified,
+cacheEntry.attributes.getLastModifiedHttp());
}
-// Parse range specifier
-ranges = parseRange(request, response, cacheEntry.attributes);
-
-// ETag header
-response.setHeader(ETag, getETag(cacheEntry.attributes));
-
-// Last-Modified header
-response.setHeader(Last-Modified,
-cacheEntry.attributes.getLastModifiedHttp());
-
// Get content
svn commit: r1057518 - in /tomcat/tc5.5.x/trunk/container/webapps: docs/changelog.xml manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java manager/WEB-INF/classes/org/apache/cat
Author: kkolinko
Date: Tue Jan 11 08:13:05 2011
New Revision: 1057518
URL: http://svn.apache.org/viewvc?rev=1057518view=rev
Log:
Improve filtering
Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1057518r1=1057517r2=1057518view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 11
08:13:05 2011
@@ -106,6 +106,9 @@
update
Improve documentation of database connection factory. (rjung)
/update
+ fix
+Improve filtering of Manager display output. (kkolinko)
+ /fix
/changelog
/subsection
/section
Modified:
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057518r1=1057517r2=1057518view=diff
==
---
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Tue Jan 11 08:13:05 2011
@@ -370,15 +370,16 @@ public final class HTMLManagerServlet ex
}
args = new Object[6];
-args[0] = displayPath;
-args[1] = context.getDisplayName();
-if (args[1] == null) {
+args[0] = RequestUtil.filter(displayPath);
+if (context.getDisplayName() == null) {
args[1] = nbsp;;
+} else {
+args[1] = RequestUtil.filter(context.getDisplayName());
}
args[2] = new Boolean(context.getAvailable());
-args[3] = response.encodeURL
+args[3] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- /html/sessions?path= + displayPath);
+ /html/sessions?path= + displayPath));
if (context.getManager() != null) {
args[4] = new Integer
(context.getManager().getActiveSessions());
@@ -392,21 +393,21 @@ public final class HTMLManagerServlet ex
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
args = new Object[9];
-args[0] = response.encodeURL
+args[0] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- /html/start?path= + displayPath);
+ /html/start?path= + displayPath));
args[1] = appsStart;
-args[2] = response.encodeURL
+args[2] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- /html/stop?path= + displayPath);
+ /html/stop?path= + displayPath));
args[3] = appsStop;
-args[4] = response.encodeURL
+args[4] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- /html/reload?path= + displayPath);
+ /html/reload?path= + displayPath));
args[5] = appsReload;
-args[6] = response.encodeURL
+args[6] = RequestUtil.filter(response.encodeURL
(request.getContextPath() +
- /html/undeploy?path= + displayPath);
+ /html/undeploy?path= + displayPath));
args[7] = appsUndeploy;
args[8] = highlightColor;
Modified:
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java?rev=1057518r1=1057517r2=1057518view=diff
==
---
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
svn commit: r1057531 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml container/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jan 11 09:04:50 2011 New Revision: 1057531 URL: http://svn.apache.org/viewvc?rev=1057531view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960 Expose available property of StandardWrapper via JMX Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1057531r1=1057530r2=1057531view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 11 09:04:50 2011 @@ -77,12 +77,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960 - Expose available property of StandardWrapper via JMX - http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc5.patch - +1: markt, kkolinko, rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460 Avoid leak caused by using a cached exception instance http://svn.apache.org/viewvc?rev=1044987view=rev Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml?rev=1057531r1=1057530r2=1057531view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Tue Jan 11 09:04:50 2011 @@ -621,6 +621,10 @@ group=Wrapper type=org.apache.catalina.core.StandardWrapper +attribute name=available + description=The date and time at which this servlet will become available (in milliseconds since the epoch), or zero if the servlet is available. If this value equals Long.MAX_VALUE, the unavailability of this servlet is considered permanent. + type=long/ + attribute name=engineName description=Fully qualified class name of the managed object type=java.lang.String Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1057531r1=1057530r2=1057531view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 11 09:04:50 2011 @@ -56,6 +56,10 @@ /subsection subsection name=Catalina changelog + add +bug43960/bug: Expose codeavailable/code property of +StandardWrapper via JMX. (markt) + /add fix bug50131/bug: Avoid possible NPE in debug output in PersistentValve. Patch provided by sebb. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43960] Expose StandardWrapper unavailable and/or available properties to JMX
https://issues.apache.org/bugzilla/show_bug.cgi?id=43960 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com 2011-01-11 04:06:13 EST --- Fixed in 5.5 with r1057531 and will be in 5.5.32. -- 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] Move to pre-req Java 1.6 for Locale services?
+1, Java 1.5 is EOL as you say. While Oracle are in the business of supporting the old versions when it gets painful, we're not. Hen On Sun, Jan 2, 2011 at 3:27 PM, Jeremy Boynes jboy...@apache.org wrote: In Java6 support was added for LocaleServiceProviders that extend the Locales supported by the java.text formatters. This causes #46052 as getAvailableLocales() now needs to scan the entire classpath rather than just return the Locales built in to the JRE. It also means we cannot continue to cache the returned set of Locales if the taglib is shared between different applications (for example, in a JavaEE6 environment where the taglibs are supplied by the container) as it will now vary with context ClassLoader. The java.text getInstance() methods work around this by not scanning the classpath if a match is found with one of the built-in providers. We can use this method directly if the context only requires a single Locale (either because we are using application-specified Locales, or because the request only specified a single one, or because multiple ones in the request match the resolution order (e.g. Firefox's en-us,en). However, where a request specifies multiple Locales with different prefixes, we still need to perform the matching ourselves as the JRE will *always* match something (at least the ROOT Locale) but we cannot tell which. If we stick to using the 1.5 level API we will trigger the uncacheable classpath scan on 1.6 level VMs; however, 1.6 provides the ServiceLoader#loadInstalled() API which can be used to determine the locales installed in the JRE and hence avoid the application classpath scan for JRE supplied locales (which are likely to be the most commonly used). As most users are likely to be running on 1.6 and we've not actually released a version needing 1.5 and Sun's 1.5 is generally end-of-lifed, I'd like to propose solving this with the 1.6 APIs and making it a pre-requisite. Any issue with this? Cheers Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43790] concurrent access issue on TagHandlerPool
https://issues.apache.org/bugzilla/show_bug.cgi?id=43790 Praveen Kumar KJVS praveenk...@gmail.com changed: What|Removed |Added CC||praveenk...@gmail.com -- 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 43790] concurrent access issue on TagHandlerPool
https://issues.apache.org/bugzilla/show_bug.cgi?id=43790 Praveen Kumar KJVS praveenk...@gmail.com changed: What|Removed |Added CC|praveenk...@gmail.com | -- 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: [VOTE] Release build 6.0.30
On 01/10/2011 06:18 PM, jean-frederic clere wrote: The candidates binaries are available here: http://people.apache.org/~jfclere/tomcat-6/v6.0.30/ According to the release process, the 6.0.30 build corresponding to the tag TOMCAT_6_0_30 is: [ ] Broken [ ] Alpha [ ] Beta [X] Stable Tested on windows, linux, solaris Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057670 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ classfile/ util/
Author: markt Date: Tue Jan 11 14:52:05 2011 New Revision: 1057670 URL: http://svn.apache.org/viewvc?rev=1057670view=rev Log: Fix formating so Checkstyle header chekc will pass Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1057670r1=1057669r2=1057670view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Tue Jan 11 14:52:05 2011 @@ -12,7 +12,7 @@ * 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. + * limitations under the License. * */ package org.apache.tomcat.util.bcel; Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1057670r1=1057669r2=1057670view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java Tue Jan 11 14:52:05 2011 @@ -12,8 +12,7 @@ * 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. - * + * limitations under the License. */ package org.apache.tomcat.util.bcel.classfile; Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=1057670r1=1057669r2=1057670view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java Tue Jan 11 14:52:05 2011 @@ -12,8 +12,7 @@ * distributed under the License is distributed on an
svn commit: r1057671 - /tomcat/trunk/java/org/apache/tomcat/util/digester/
Author: markt Date: Tue Jan 11 14:52:58 2011 New Revision: 1057671 URL: http://svn.apache.org/viewvc?rev=1057671view=rev Log: $Id:$ does not belong in license header Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java tomcat/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectParamRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java tomcat/trunk/java/org/apache/tomcat/util/digester/PathCallParamRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java?rev=1057671r1=1057670r2=1057671view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java Tue Jan 11 14:52:58 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * 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. Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java?rev=1057671r1=1057670r2=1057671view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java Tue Jan 11 14:52:58 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * 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. Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java?rev=1057671r1=1057670r2=1057671view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java Tue Jan 11 14:52:58 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * 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. Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1057671r1=1057670r2=1057671view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Tue Jan 11 14:52:58 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Licensed to the Apache Software Foundation (ASF) under one or more *
svn commit: r1057672 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/
Author: markt Date: Tue Jan 11 14:54:51 2011 New Revision: 1057672 URL: http://svn.apache.org/viewvc?rev=1057672view=rev Log: Add missing line to license header Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java?rev=1057672r1=1057671r2=1057672view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java Tue Jan 11 14:54:51 2011 @@ -12,6 +12,7 @@ * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.group.interceptors; Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1057672r1=1057671r2=1057672view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java Tue Jan 11 14:54:51 2011 @@ -12,6 +12,7 @@ * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.group.interceptors; Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=1057672r1=1057671r2=1057672view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java Tue Jan 11 14:54:51 2011 @@ -12,6 +12,7 @@ * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.group.interceptors; Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1057672r1=1057671r2=1057672view=diff == --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java Tue Jan 11 14:54:51 2011 @@ -12,6 +12,7 @@ * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.group.interceptors; Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java URL:
svn commit: r1057673 - in /tomcat/trunk/test/org/apache/catalina/tribes/test: channel/TestChannelStartStop.java membership/TestMemberSerialization.java
Author: markt Date: Tue Jan 11 14:55:20 2011 New Revision: 1057673 URL: http://svn.apache.org/viewvc?rev=1057673view=rev Log: Add missing line to license header Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java?rev=1057673r1=1057672r2=1057673view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java Tue Jan 11 14:55:20 2011 @@ -5,13 +5,14 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the License); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.test.channel; Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java?rev=1057673r1=1057672r2=1057673view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java Tue Jan 11 14:55:20 2011 @@ -5,13 +5,14 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the License); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.tribes.test.membership; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057674 - in /tomcat/trunk/java/org/apache/catalina/startup: ConnectorCreateRule.java SetNextNamingRule.java
Author: markt Date: Tue Jan 11 14:56:16 2011 New Revision: 1057674 URL: http://svn.apache.org/viewvc?rev=1057674view=rev Log: $Id:$ does not belong in license header Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=1057674r1=1057673r2=1057674view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java Tue Jan 11 14:56:16 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * 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. Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=1057674r1=1057673r2=1057674view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Tue Jan 11 14:56:16 2011 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057675 - in /tomcat/trunk/java/org/apache/catalina/filters: ExpiresFilter.java RemoteIpFilter.java
Author: markt Date: Tue Jan 11 14:56:39 2011 New Revision: 1057675 URL: http://svn.apache.org/viewvc?rev=1057675view=rev Log: Use standard ASF license header Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1057675r1=1057674r2=1057675view=diff == --- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Tue Jan 11 14:56:39 2011 @@ -1,19 +1,19 @@ /* - * Copyright 2008-2009 the original author or authors. - * - * Licensed 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 + * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.catalina.filters; import java.io.IOException; Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1057675r1=1057674r2=1057675view=diff == --- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue Jan 11 14:56:39 2011 @@ -1,15 +1,18 @@ /* - * Licensed 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 + * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.filters; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057677 - in /tomcat/trunk/java/org/apache: catalina/deploy/ jasper/compiler/ jasper/runtime/ naming/factory/webservices/ tomcat/
Author: markt Date: Tue Jan 11 14:57:17 2011 New Revision: 1057677 URL: http://svn.apache.org/viewvc?rev=1057677view=rev Log: Use standard layout ASF license header Modified: tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java tomcat/trunk/java/org/apache/jasper/compiler/JarScannerFactory.java tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java tomcat/trunk/java/org/apache/tomcat/InstanceManager.java tomcat/trunk/java/org/apache/tomcat/JarScanner.java Modified: tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java?rev=1057677r1=1057676r2=1057677view=diff == --- tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java Tue Jan 11 14:57:17 2011 @@ -1,23 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - - package org.apache.catalina.deploy; import java.util.List; Modified: tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java?rev=1057677r1=1057676r2=1057677view=diff == --- tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java Tue Jan 11 14:57:17 2011 @@ -1,23 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * 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
svn commit: r1057678 - in /tomcat/trunk/test: javax/el/TestCompositeELResolver.java org/apache/catalina/util/TestContextName.java org/apache/el/TesterEnum.java org/apache/tomcat/util/http/mapper/TestM
Author: markt
Date: Tue Jan 11 14:57:47 2011
New Revision: 1057678
URL: http://svn.apache.org/viewvc?rev=1057678view=rev
Log:
Add missing license headers
Modified:
tomcat/trunk/test/javax/el/TestCompositeELResolver.java
tomcat/trunk/test/org/apache/catalina/util/TestContextName.java
tomcat/trunk/test/org/apache/el/TesterEnum.java
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Modified: tomcat/trunk/test/javax/el/TestCompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestCompositeELResolver.java?rev=1057678r1=1057677r2=1057678view=diff
==
--- tomcat/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestCompositeELResolver.java Tue Jan 11 14:57:47
2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package javax.el;
import java.io.File;
Modified: tomcat/trunk/test/org/apache/catalina/util/TestContextName.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestContextName.java?rev=1057678r1=1057677r2=1057678view=diff
==
--- tomcat/trunk/test/org/apache/catalina/util/TestContextName.java (original)
+++ tomcat/trunk/test/org/apache/catalina/util/TestContextName.java Tue Jan 11
14:57:47 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.catalina.util;
import junit.framework.TestCase;
Modified: tomcat/trunk/test/org/apache/el/TesterEnum.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterEnum.java?rev=1057678r1=1057677r2=1057678view=diff
==
--- tomcat/trunk/test/org/apache/el/TesterEnum.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterEnum.java Tue Jan 11 14:57:47 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.el;
public enum TesterEnum {
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1057678r1=1057677r2=1057678view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
Tue Jan 11 14:57:47 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache
svn commit: r1057679 - /tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
Author: markt Date: Tue Jan 11 14:58:02 2011 New Revision: 1057679 URL: http://svn.apache.org/viewvc?rev=1057679view=rev Log: Use standard layout ASF license header Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1057679r1=1057678r2=1057679view=diff == --- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Tue Jan 11 14:58:02 2011 @@ -1,23 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - - package org.apache.catalina.startup; import java.util.Set; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057680 - /tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
Author: markt Date: Tue Jan 11 14:59:32 2011 New Revision: 1057680 URL: http://svn.apache.org/viewvc?rev=1057680view=rev Log: Remove first blank line. REmove $Id:$ Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?rev=1057680r1=1057679r2=1057680view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Tue Jan 11 14:59:32 2011 @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* $Id$ - * - */ - import java.io.IOException; import java.io.PrintWriter; import java.util.ResourceBundle; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057681 - in /tomcat/trunk: build.xml res/checkstyle/checkstyle.xml res/checkstyle/header-al2.txt
Author: markt
Date: Tue Jan 11 15:00:05 2011
New Revision: 1057681
URL: http://svn.apache.org/viewvc?rev=1057681view=rev
Log:
Get checkstyle to check Java files for AL2 headers
Added:
tomcat/trunk/res/checkstyle/header-al2.txt (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/checkstyle.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1057681r1=1057680r2=1057681view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 11 15:00:05 2011
@@ -429,8 +429,13 @@
exclude name=output/**/
exclude name=modules/**/
exclude name=**/*.mdl/
-!-- Exclude auto-generated files with known errors --
-exclude name=java/org/apache/el/parser/ELParser.java /
+!-- Exclude auto-generated files --
+exclude name=java/org/apache/el/parser/ELParser*.java /
+exclude name=java/org/apache/el/parser/JJTELParserState.java /
+exclude name=java/org/apache/el/parser/Node.java /
+exclude name=java/org/apache/el/parser/ParseException.java /
+exclude name=java/org/apache/el/parser/SimpleCharStream.java /
+exclude name=java/org/apache/el/parser/Token*.java /
!-- Exclude these else Gump runs validate on them --
exclude name=**/org/apache/tomcat/dbcp/**/
exclude name=**/tomcat-deps/**/
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1057681r1=1057680r2=1057681view=diff
==
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Tue Jan 11 15:00:05 2011
@@ -1,6 +1,6 @@
?xml version=1.0?
!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+ 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
@@ -23,6 +23,12 @@
!-- 'Standard Checks' in the Checkstyle documentation:
--
!-- http://checkstyle.sourceforge.net/config_coding.html
--
+ !-- Headers --
+ module name=RegexpHeader
+property name=headerFile
value=${basedir}/res/checkstyle/header-al2.txt/
+property name=fileExtensions value=java/
+ /module
+
!-- Whitespace --
module name=FileTabCharacter/
Added: tomcat/trunk/res/checkstyle/header-al2.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/header-al2.txt?rev=1057681view=auto
==
--- tomcat/trunk/res/checkstyle/header-al2.txt (added)
+++ tomcat/trunk/res/checkstyle/header-al2.txt Tue Jan 11 15:00:05 2011
@@ -0,0 +1,16 @@
+^\W*$
+^\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
+^\W*contributor license agreements\. See the NOTICE file distributed with$
+^\W*this work for additional information regarding copyright ownership\.$
+^\W*The ASF licenses this file to You under the Apache License, Version 2\.0$
+^\W*\(the License\); you may not use this file except in compliance with$
+^\W*the License\. You may obtain a copy of the License at$
+^\W*$
+^\W*http://www.apache.org/licenses/LICENSE-2\.0$
+^\W*$
+^\W*Unless required by applicable law or agreed to in writing, software$
+^\W*distributed under the License is distributed on an AS IS BASIS,$
+^\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
+^\W*See the License for the specific language governing permissions and$
+^\W*limitations under the License\.$
+^\W*$
\ No newline at end of file
Propchange: tomcat/trunk/res/checkstyle/header-al2.txt
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057685 - /tomcat/trunk/res/findbugs/filter-false-positives.xml
Author: markt Date: Tue Jan 11 15:11:25 2011 New Revision: 1057685 URL: http://svn.apache.org/viewvc?rev=1057685view=rev Log: Add missing license header Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1057685r1=1057684r2=1057685view=diff == --- tomcat/trunk/res/findbugs/filter-false-positives.xml (original) +++ tomcat/trunk/res/findbugs/filter-false-positives.xml Tue Jan 11 15:11:25 2011 @@ -1,3 +1,19 @@ +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- FindBugsFilter !-- Considered to be false positives -- Match - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057686 - /tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
Author: markt Date: Tue Jan 11 15:13:22 2011 New Revision: 1057686 URL: http://svn.apache.org/viewvc?rev=1057686view=rev Log: Add missing license header Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt?rev=1057686r1=1057685r2=1057686view=diff == --- tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt (original) +++ tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Tue Jan 11 15:13:22 2011 @@ -1,6 +1,21 @@ -Following settings for Helios Service Release 1 + + 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. + + +The following settings are for Helios Service Release 1 W = Warning I = Ignore E = Error - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057693 - in /tomcat/trunk/java/org/apache/catalina: ha/authenticator/mbeans-descriptors.xml ha/deploy/mbeans-descriptors.xml ha/session/mbeans-descriptors.xml ha/tcp/mbeans-descriptors.x
Author: markt Date: Tue Jan 11 15:28:39 2011 New Revision: 1057693 URL: http://svn.apache.org/viewvc?rev=1057693view=rev Log: Use standard layout ASF license header Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml?rev=1057693r1=1057692r2=1057693view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml Tue Jan 11 15:28:39 2011 @@ -6,7 +6,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + 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. Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml?rev=1057693r1=1057692r2=1057693view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml Tue Jan 11 15:28:39 2011 @@ -6,7 +6,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + 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. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1057693r1=1057692r2=1057693view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Tue Jan 11 15:28:39 2011 @@ -6,7 +6,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + 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. Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=1057693r1=1057692r2=1057693view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Tue Jan 11 15:28:39 2011 @@ -6,7 +6,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + 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. Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1057693r1=1057692r2=1057693view=diff
svn commit: r1057694 - in /tomcat/trunk: test/webapp-3.0/ test/webapp-3.0/bug45nnn/ test/webapp-3.0/bug48nnn/ webapps/ROOT/ webapps/examples/jsp/cal/ webapps/examples/jsp/chat/ webapps/examples/jsp/ch
Author: markt Date: Tue Jan 11 15:29:28 2011 New Revision: 1057694 URL: http://svn.apache.org/viewvc?rev=1057694view=rev Log: License should be first thing in file unless file format prohibits it Modified: tomcat/trunk/test/webapp-3.0/bug42565.jsp tomcat/trunk/test/webapp-3.0/bug44994.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015c.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45427.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45451a.jsp tomcat/trunk/test/webapp-3.0/bug45nnn/bug45511.jsp tomcat/trunk/test/webapp-3.0/bug46381.jsp tomcat/trunk/test/webapp-3.0/bug46596.jsp tomcat/trunk/test/webapp-3.0/bug47331.jsp tomcat/trunk/test/webapp-3.0/bug47413.jsp tomcat/trunk/test/webapp-3.0/bug48nnn/bug48112.jsp tomcat/trunk/test/webapp-3.0/bug48nnn/bug48627.jsp tomcat/trunk/test/webapp-3.0/el-method.jsp tomcat/trunk/test/webapp-3.0/el-misc.jsp tomcat/trunk/test/webapp-3.0/script-expr.jsp tomcat/trunk/webapps/ROOT/index.jsp tomcat/trunk/webapps/examples/jsp/cal/cal1.jsp tomcat/trunk/webapps/examples/jsp/cal/cal2.jsp tomcat/trunk/webapps/examples/jsp/chat/index.jsp tomcat/trunk/webapps/examples/jsp/chat/login.jsp tomcat/trunk/webapps/examples/jsp/chat/post.jsp tomcat/trunk/webapps/examples/jsp/checkbox/checkresult.jsp tomcat/trunk/webapps/examples/jsp/colors/colrs.jsp tomcat/trunk/webapps/examples/jsp/dates/date.jsp tomcat/trunk/webapps/examples/jsp/error/err.jsp tomcat/trunk/webapps/examples/jsp/error/errorpge.jsp tomcat/trunk/webapps/examples/jsp/forward/forward.jsp tomcat/trunk/webapps/examples/jsp/forward/one.jsp tomcat/trunk/webapps/examples/jsp/include/include.jsp tomcat/trunk/webapps/examples/jsp/jsptoserv/hello.jsp tomcat/trunk/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp tomcat/trunk/webapps/examples/jsp/plugin/plugin.jsp tomcat/trunk/webapps/examples/jsp/sessions/carts.jsp tomcat/trunk/webapps/examples/jsp/simpletag/foo.jsp tomcat/trunk/webapps/examples/jsp/snp/snoop.jsp Modified: tomcat/trunk/test/webapp-3.0/bug42565.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug42565.jsp?rev=1057694r1=1057693r2=1057694view=diff == --- tomcat/trunk/test/webapp-3.0/bug42565.jsp (original) +++ tomcat/trunk/test/webapp-3.0/bug42565.jsp Tue Jan 11 15:29:28 2011 @@ -1,4 +1,3 @@ -%@ taglib prefix=tags tagdir=/WEB-INF/tags % %-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --% +%@ taglib prefix=tags tagdir=/WEB-INF/tags % html headtitleBug 42565 test case/title/head body Modified: tomcat/trunk/test/webapp-3.0/bug44994.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug44994.jsp?rev=1057694r1=1057693r2=1057694view=diff == --- tomcat/trunk/test/webapp-3.0/bug44994.jsp (original) +++ tomcat/trunk/test/webapp-3.0/bug44994.jsp Tue Jan 11 15:29:28 2011 @@ -1,4 +1,3 @@ -%@ taglib prefix=tags tagdir=/WEB-INF/tags % %-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --% +%@ taglib prefix=tags tagdir=/WEB-INF/tags % html headtitleBug 44994 test case/title/head body Modified: tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp?rev=1057694r1=1057693r2=1057694view=diff == --- tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp (original) +++ tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015a.jsp Tue Jan 11 15:29:28 2011 @@ -1,4 +1,3 @@ -%@ taglib prefix=tags tagdir=/WEB-INF/tags % %-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --% +%@ taglib prefix=tags tagdir=/WEB-INF/tags % html headtitleBug 45015 test case A/title/head body Modified: tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp?rev=1057694r1=1057693r2=1057694view=diff == --- tomcat/trunk/test/webapp-3.0/bug45nnn/bug45015b.jsp (original)
svn commit: r1057695 - in /tomcat/trunk: build.xml res/checkstyle/checkstyle.xml res/checkstyle/header-al2.txt
Author: markt
Date: Tue Jan 11 15:29:58 2011
New Revision: 1057695
URL: http://svn.apache.org/viewvc?rev=1057695view=rev
Log:
Expand checkstyle license checks
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/res/checkstyle/header-al2.txt
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1057695r1=1057694r2=1057695view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 11 15:29:58 2011
@@ -425,10 +425,15 @@
checkstyle config=res/checkstyle/checkstyle.xml
fileset dir=.
patternset refid=text.files /
+include name=**/*.bat/
+include name=**/*.sh/
+exclude name=bin/setenv.*/
exclude name=.*/**/
exclude name=output/**/
exclude name=modules/**/
exclude name=**/*.mdl/
+exclude name=**/*_2.xml/
+exclude name=res/checkstyle/header-al2.txt/
!-- Exclude auto-generated files --
exclude name=java/org/apache/el/parser/ELParser*.java /
exclude name=java/org/apache/el/parser/JJTELParserState.java /
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1057695r1=1057694r2=1057695view=diff
==
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Tue Jan 11 15:29:58 2011
@@ -26,7 +26,8 @@
!-- Headers --
module name=RegexpHeader
property name=headerFile
value=${basedir}/res/checkstyle/header-al2.txt/
-property name=fileExtensions value=java/
+property name=multiLines value=1, 2, 3, 4/
+property name=fileExtensions value=java,xml,jsp,txt,sh,bat/
/module
!-- Whitespace --
Modified: tomcat/trunk/res/checkstyle/header-al2.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/header-al2.txt?rev=1057695r1=1057694r2=1057695view=diff
==
--- tomcat/trunk/res/checkstyle/header-al2.txt (original)
+++ tomcat/trunk/res/checkstyle/header-al2.txt Tue Jan 11 15:29:58 2011
@@ -1,16 +1,19 @@
+^\?xml.*$
+...@echo off$
+^#!
^\W*$
-^\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
-^\W*contributor license agreements\. See the NOTICE file distributed with$
-^\W*this work for additional information regarding copyright ownership\.$
-^\W*The ASF licenses this file to You under the Apache License, Version 2\.0$
-^\W*\(the License\); you may not use this file except in compliance with$
-^\W*the License\. You may obtain a copy of the License at$
-^\W*$
-^\W*http://www.apache.org/licenses/LICENSE-2\.0$
-^\W*$
-^\W*Unless required by applicable law or agreed to in writing, software$
-^\W*distributed under the License is distributed on an AS IS BASIS,$
-^\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
-^\W*See the License for the specific language governing permissions and$
-^\W*limitations under the License\.$
-^\W*$
\ No newline at end of file
+^(rem)?\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
+^(rem)?\W*contributor license agreements\. See the NOTICE file distributed
with$
+^(rem)?\W*this work for additional information regarding copyright ownership\.$
+^(rem)?\W*The ASF licenses this file to You under the Apache License, Version
2\.0$
+^(rem)?\W*\(the License\); you may not use this file except in compliance
with$
+^(rem)?\W*the License\. You may obtain a copy of the License at$
+^(rem)?\W*$
+^(rem)?\W*http://www.apache.org/licenses/LICENSE-2\.0$
+^(rem)?\W*$
+^(rem)?\W*Unless required by applicable law or agreed to in writing, software$
+^(rem)?\W*distributed under the License is distributed on an AS IS BASIS,$
+^(rem)?\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied\.$
+^(rem)?\W*See the License for the specific language governing permissions and$
+^(rem)?\W*limitations under the License\.$
+^(rem)?\W*$
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057699 - /tomcat/trunk/build.xml
Author: markt
Date: Tue Jan 11 15:35:40 2011
New Revision: 1057699
URL: http://svn.apache.org/viewvc?rev=1057699view=rev
Log:
Re-build tomcat-dbcp on release so the manifest picks up the new Tomcat version
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1057699r1=1057698r2=1057699view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan 11 15:35:40 2011
@@ -1633,7 +1633,7 @@ Apache Tomcat ${version} native binaries
/target
target name=release
-
depends=clean,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar
+
depends=clean,clean-depend,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar
description=Create a Tomcat 7 packaged distribution
copy file=KEYS
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.6
On 10/01/2011 22:13, sebb wrote: On 10 January 2011 18:54, Mark Thomas ma...@apache.org wrote: The proposed Apache Tomcat 7.0.6 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.6/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_6/ Some files with no AL headers: res/findbugs/filter-false-positives.xml test/javax/el/TestCompositeELResolver.java test/org/apache/catalina/util/TestContextName.java test/org/apache/el/TesterEnum.java test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java I know RAT/buildbot picks these up but I have added some Checksytle tests for these. Those checks also picked up quite a few inconsistencies / errors which I have also fixed. The Manifest for tomcat-dbcp.jar says: Implementation-Version: 7.0.5 Is that intended? In previous releases (7.0.0, 7.0.2, 7.0.4, 7.0.5) of Tomcat, the dbcp jar manifest had the same version as Tomcat itself. Yep. I didn't clear out my lib dir before building the release. If the binary had changed I'd re-roll it (it hasn't). I've tweaked the build script so the deps always get re-built on release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: DO NOT REPLY [Bug 50333] IllegalArgumentException occurs when setting maxActive to smaller than 1.
roger that Rainer, thank you! On 1/10/2011 1:43 PM, Rainer Jung wrote: Hi Filip, On 10.01.2011 17:41, bugzi...@apache.org wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=50333 Filip Hanikfha...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Filip Hanikfha...@apache.org 2011-01-10 11:41:53 EST --- svn r 1057268 if you write it as r1057268 a regexp that I think Mark added sometime to Bugzilla will detect it and provide a nice link to the viewvc revision entry in the HTML view of the ticket. It does not work when whitespace is between the r and the revision number. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1191 / Virus Database: 1435/3373 - Release Date: 01/11/11 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.6
On 01/10/2011 07:54 PM, Mark Thomas wrote: The proposed 7.0.6 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.6 Alpha [ ] Beta - go ahead and release as 7.0.6 Beta [X] Stable - go ahead and release as 7.0.6 Stable It works flawlessly. Tested on linux, windows, solaris. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057730 - /tomcat/trunk/java/javax/el/CompositeELResolver.java
Author: markt
Date: Tue Jan 11 17:04:13 2011
New Revision: 1057730
URL: http://svn.apache.org/viewvc?rev=1057730view=rev
Log:
Better handling of special case of
javax.servlet.jsp.el.ScopedAttributeELResolver
Modified:
tomcat/trunk/java/javax/el/CompositeELResolver.java
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1057730r1=1057729r2=1057730view=diff
==
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Tue Jan 11 17:04:13 2011
@@ -23,6 +23,18 @@ import java.util.NoSuchElementException;
public class CompositeELResolver extends ELResolver {
+private static final Class? SCOPED_ATTRIBUTE_EL_RESOLVER;
+static {
+Class? clazz = null;
+try {
+clazz =
+
Class.forName(javax.servlet.jsp.el.ScopedAttributeELResolver);
+} catch (ClassNotFoundException e) {
+// Ignore. This is expected if using the EL stand-alone
+}
+SCOPED_ATTRIBUTE_EL_RESOLVER = clazz;
+}
+
private int size;
private ELResolver[] resolvers;
@@ -118,10 +130,12 @@ public class CompositeELResolver extends
for (int i = 0; i sz; i++) {
type = this.resolvers[i].getType(context, base, property);
if (context.isPropertyResolved()) {
-if (resolvers[i].getClass().getName().equals(
-javax.servlet.jsp.el.ScopedAttributeELResolver)) {
-// Special case since this will always return Object.class
-// for type
+if (SCOPED_ATTRIBUTE_EL_RESOLVER != null
+SCOPED_ATTRIBUTE_EL_RESOLVER.isAssignableFrom(
+resolvers[i].getClass())) {
+// Special case since
+// javax.servlet.jsp.el.ScopedAttributeELResolver will
+// always return Object.class for type
Object value =
resolvers[i].getValue(context, base, property);
if (value != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1044708 - /tomcat/trunk/java/javax/el/CompositeELResolver.java
On 11/01/2011 04:14, Konstantin Kolinko wrote: 2010/12/11 ma...@apache.org: The instanceof in the old code works for any class that extends ScopedAttributeELResolver. The new code does not. Grr. Fixed. Thanks for spotting this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50570] New: Allow explicit use of FIPS mode for SSL connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Summary: Allow explicit use of FIPS mode for SSL connectors Product: Tomcat 7 Version: unspecified Platform: PC Status: NEW Severity: enhancement Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: ch...@christopherschultz.net Both OpenSSL and JSSE allow themselves to be put into FIPS mode, and we should allow SSL connectors to request it (and have them fail if FIPS mode can't be set). OpenSSL: http://www.mail-archive.com/openssl-dev@openssl.org/msg20882.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
svn commit: r1057743 - in /tomcat/trunk/modules/jdbc-pool: ./ java/org/apache/tomcat/jdbc/pool/ java/org/apache/tomcat/jdbc/pool/jmx/ test/org/apache/tomcat/jdbc/test/
Author: fhanik
Date: Tue Jan 11 17:28:05 2011
New Revision: 1057743
URL: http://svn.apache.org/viewvc?rev=1057743view=rev
Log:
Mask the password through all the JMX operations
Added:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
(with props)
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java
(with props)
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/sign.sh
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1057743r1=1057742r2=1057743view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Tue Jan 11 17:28:05
2011
@@ -28,7 +28,7 @@
version.major=1
version.minor=0
version.build=9
-version.patch=1
+version.patch=2
version.suffix=
# - Default Base Path for Dependent Packages -
Added:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java?rev=1057743view=auto
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
Tue Jan 11 17:28:05 2011
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.util.Properties;
+
+/**
+ *
+ * @author fhanik
+ *
+ */
+public class PoolUtilities {
+
+public static final String PROP_USER = user;
+
+public static final String PROP_PASSWORD = password;
+
+public static Properties clone(Properties p) {
+Properties c = new Properties();
+c.putAll(p);
+return c;
+}
+
+public static Properties cloneWithoutPassword(Properties p) {
+Properties result = clone(p);
+result.remove(PROP_PASSWORD);
+return result;
+}
+}
Propchange:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
--
svn:eol-style = native
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1057743r1=1057742r2=1057743view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Tue Jan 11 17:28:05 2011
@@ -41,9 +41,9 @@ public class PooledConnection {
*/
private static final Log log = LogFactory.getLog(PooledConnection.class);
-public static final String PROP_USER = user;
+public static final String PROP_USER = PoolUtilities.PROP_USER;
-public static final String PROP_PASSWORD = password;
+public static final String PROP_PASSWORD = PoolUtilities.PROP_PASSWORD;
/**
* Validate when connection is borrowed flag
@@ -61,7 +61,6 @@ public class PooledConnection {
* Validate when connection is initialized flag
*/
public static final int VALIDATE_INIT = 4;
-
/**
* The properties for the connection pool
*/
@@ -260,7 +259,7 @@ public class PooledConnection {
pwd = poolProperties.getPassword();
getAttributes().put(PROP_PASSWORD, pwd);
}
-Properties properties
DO NOT REPLY [Bug 50571] New: Tomcat 7 JDBC connection pool exception enhancement
https://issues.apache.org/bugzilla/show_bug.cgi?id=50571 Summary: Tomcat 7 JDBC connection pool exception enhancement Product: Tomcat Modules Version: unspecified Platform: PC Status: NEW Severity: normal Priority: P2 Component: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: jnorri...@gmail.com Created an attachment (id=26476) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26476) Created against http://svn.apache.org/repos/asf/tomcat/trunk on 20110111 I am working with the new JDBC connection pool in Tomcat 7, and it's great! Nice work. Once enhancement I would like to suggest is more control over the SQLException's that come out of the DataSource. Certain interceptors (eg: ConnectionState) catch SQLException's and log them, thereby preventing the layer above DataSource from being able to detect and handle SQL problems. For example, if a DataSource.getConnection() is created with an invalid database name, the ConnectionState interceptor will catch and log (eg: reset()), leaving the caller with no control over log output or knowing what the specific problem with the DataSource was. I am working on an application where the datasources are more dynamic than the typical statically defined datasources in managed application servers, therefore I want to be able to detect and handle SQLException's that are raised from the ConnectionPool. I have provided a patch that illustrates the type of change I'm talking about. As you can see, this causes SQLExceptions to propagate through several other APIs, but I think this is an improvement. This different exception handling strategy could also be enabled with a property. Thoughts? -- 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 50570] Allow explicit use of FIPS mode for SSL connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added OS/Version||All --- Comment #1 from Christopher Schultz ch...@christopherschultz.net 2011-01-11 12:34:15 EST --- It might make more sense to put this into the AprLifecycleListener, as it appears that FIPS mode for OpenSSL is not done on a per-context basis, but per-process. It would be nice to enable this for JSSE as well, so where would that go? -- 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: r1057755 - /tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java
Author: fhanik Date: Tue Jan 11 17:37:55 2011 New Revision: 1057755 URL: http://svn.apache.org/viewvc?rev=1057755view=rev Log: typo-fix Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java?rev=1057755r1=1057754r2=1057755view=diff == --- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java (original) +++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java Tue Jan 11 17:37:55 2011 @@ -65,7 +65,7 @@ public class JmxPasswordTest extends Def String jmxPassword = mbean.getPassword(); Properties jmxProperties = mbean.getDbProperties(); assertFalse(Passwords should not match., password.equals(jmxPassword)); -assertEquals(Password property should be missing, jmxProperties.containsKey(PoolUtilities.PROP_PASSWORD)); +assertFalse(Password property should be missing, jmxProperties.containsKey(PoolUtilities.PROP_PASSWORD)); } } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057773 - /tomcat/tags/JDBC_POOL_1_0_9_2/
Author: fhanik Date: Tue Jan 11 17:55:57 2011 New Revision: 1057773 URL: http://svn.apache.org/viewvc?rev=1057773view=rev Log: Tag for password fix Added: tomcat/tags/JDBC_POOL_1_0_9_2/ (props changed) - copied from r1057772, tomcat/trunk/modules/jdbc-pool/ Propchange: tomcat/tags/JDBC_POOL_1_0_9_2/ -- --- svn:ignore (added) +++ svn:ignore Tue Jan 11 17:55:57 2011 @@ -0,0 +1,3 @@ +build.properties +includes +output Propchange: tomcat/tags/JDBC_POOL_1_0_9_2/ -- svn:mergeinfo = /tomcat/tc6.0.x/trunk/modules/jdbc-pool:742915 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: ASF test Jira instance now running Tomcat 7.0.6
Mark, On 1/10/2011 1:02 PM, Mark Thomas wrote: Having tagged and built 7.0.6 I have just switched the ASF test Jira instance [1] from 6.0.29 to 7.0.6. A quick smoke test suggests all is OK. Folks will be testing this instance over the next few weeks prior to the migration of the live Jira instance so if there are any issues we should find them soon. Assuming all goes well, post migration the live Jira instance will run 7.0.6 and will continue to run 7.0.latest. If you have a spare 5 minutes try out the test Jira instance. If you find something that is broken, please let the infrastructure team know. I played with it a bit yesterday and all seemed well (except for all the things about JIRA that I don't like). Please tell me Tomcat bug tracking is staying on Bugzilla for the foreseeable future. -chris signature.asc Description: OpenPGP digital signature
Re: ASF test Jira instance now running Tomcat 7.0.6
On 11/01/2011 17:58, Christopher Schultz wrote: Mark, On 1/10/2011 1:02 PM, Mark Thomas wrote: Having tagged and built 7.0.6 I have just switched the ASF test Jira instance [1] from 6.0.29 to 7.0.6. A quick smoke test suggests all is OK. Folks will be testing this instance over the next few weeks prior to the migration of the live Jira instance so if there are any issues we should find them soon. Assuming all goes well, post migration the live Jira instance will run 7.0.6 and will continue to run 7.0.latest. If you have a spare 5 minutes try out the test Jira instance. If you find something that is broken, please let the infrastructure team know. I played with it a bit yesterday and all seemed well (except for all the things about JIRA that I don't like). Please tell me Tomcat bug tracking is staying on Bugzilla for the foreseeable future. :) That will be down to what the committers want to do. I'm in favour of sticking with Bugzilla but if a majority prefer Jira then we'll migrate. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057788 - in /tomcat/trunk/java/org/apache/catalina: Host.java core/StandardHost.java startup/HostConfig.java
Author: markt
Date: Tue Jan 11 18:35:42 2011
New Revision: 1057788
URL: http://svn.apache.org/viewvc?rev=1057788view=rev
Log:
Action review comments
Store deployIgnore as a Pattern in the Host
Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1057788r1=1057787r2=1057788view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Tue Jan 11 18:35:42 2011
@@ -16,6 +16,8 @@
*/
package org.apache.catalina;
+import java.util.regex.Pattern;
+
/**
* A bHost/b is a Container that represents a virtual host in the
@@ -154,6 +156,14 @@ public interface Host extends Container
/**
+ * Return the compiled regular expression that defines the files and
+ * directories in the host's {...@link #appBase} that will be ignored by
the
+ * automatic deployment process.
+ */
+public Pattern getDeployIgnorePattern();
+
+
+/**
* Set the regular expression that defines the files and directories in
* the host's {...@link #appBase} that will be ignored by the automatic
* deployment process.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1057788r1=1057787r2=1057788view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue Jan 11
18:35:42 2011
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;
+import java.util.regex.Pattern;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -173,7 +174,7 @@ public class StandardHost extends Contai
* be ignored by the automatic deployment process (both
* {...@link #deployOnStartup} and {...@link #autoDeploy}).
*/
- private String deployIgnore = null;
+ private Pattern deployIgnore = null;
// - Properties
@@ -515,6 +516,20 @@ public class StandardHost extends Contai
*/
@Override
public String getDeployIgnore() {
+if (deployIgnore == null) {
+return null;
+}
+return this.deployIgnore.toString();
+}
+
+
+/**
+ * Return the compiled regular expression that defines the files and
+ * directories in the host's {...@link #appBase} that will be ignored by
the
+ * automatic deployment process.
+ */
+@Override
+public Pattern getDeployIgnorePattern() {
return this.deployIgnore;
}
@@ -526,11 +541,20 @@ public class StandardHost extends Contai
*/
@Override
public void setDeployIgnore(String deployIgnore) {
-String oldDeployIgnore = this.deployIgnore;
-this.deployIgnore = deployIgnore;
+String oldDeployIgnore;
+if (this.deployIgnore == null) {
+oldDeployIgnore = null;
+} else {
+oldDeployIgnore = this.deployIgnore.toString();
+}
+if (deployIgnore == null) {
+this.deployIgnore = null;
+} else {
+this.deployIgnore = Pattern.compile(deployIgnore);
+}
support.firePropertyChange(deployIgnore,
oldDeployIgnore,
- this.deployIgnore);
+ deployIgnore);
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1057788r1=1057787r2=1057788view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jan 11
18:35:42 2011
@@ -486,12 +486,14 @@ public class HostConfig
return unfilteredAppPaths;
}
-Pattern filter = Pattern.compile(host.getDeployIgnore());
+Pattern filter = host.getDeployIgnorePattern();
ListString filteredList = new ArrayListString();
for (String appPath : unfilteredAppPaths) {
if (filter.matcher(appPath).matches()) {
-log.debug(sm.getString(hostConfig.ignorePath, appPath));
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(hostConfig.ignorePath, appPath));
+
svn commit: r1057797 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jan 11 18:56:07 2011 New Revision: 1057797 URL: http://svn.apache.org/viewvc?rev=1057797view=rev Log: Bring up to date 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=1057797r1=1057796r2=1057797view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 11 18:56:07 2011 @@ -41,6 +41,38 @@ !-- General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Other -- +section name=Tomcat 7.0.7 (markt) + subsection name=Catalina +changelog + update +Improve fix for bug50205/bug to trigger an error earlier if invalid +configuration is used. (markt) + /update +/changelog + /subsection + subsection name=Jasper +changelog + fix +Improve special case handling of +codejavax.servlet.jsp.el.ScopedAttributeELResolver/code in +codejavax.el.CompositeELResolver /code to handle sub-classes. +(markt) + /fix +/changelog + /subsection + subsection name=Other +changelog + add +Extend the Checkstyle tests to check for license headers. (markt) + /add + fix +Modify the build script so a release build always rebuilds the +dependencies to ensure that the correct Tomcat version appears in the +manifest. (markt) + /fix +/changelog + /subsection +/section section name=Tomcat 7.0.6 (markt) subsection name=General changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.6
On 10/01/2011 18:54, Mark Thomas wrote: The proposed 7.0.6 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 7.0.6 Alpha [ ] Beta - go ahead and release as 7.0.6 Beta [X] Stable - go ahead and release as 7.0.6 Stable Windows installer tested with: - 32-bit 1.6.0_22 - 64-bit 1.7.latest-dev tag, .zip, .tar-gz All agree excluding line-endings One file discovered missing svn:eol-style property (trivial issue) Servlet TCK - HTTP BIO + security manager passes - HTTP NIO + security manager passes (except CLIENT-CERT - known issue) - HTTP APR + security manager passes - AJP BIO + security manager passes - AJP APR + security manager passes JSP TCK - HTTP BIO + security manager passes EL TCK - with security manager passes Tomcat 7.0.6 has also been running the ASF test Jira instance for a day now without any reported issues although the load has been very light (~40k requests/day). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1057798 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jan 11 19:01:41 2011 New Revision: 1057798 URL: http://svn.apache.org/viewvc?rev=1057798view=rev Log: Typos 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=1057798r1=1057797r2=1057798view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 11 19:01:41 2011 @@ -180,7 +180,7 @@ Correct handling of versioned web applications in deployer. (markt) /fix fix -Correct removal of codeLifeCycleListenter/codes from +Correct removal of codeLifeCycleListener/codes from codeContainer/codes via JMX. (markt) /fix fix @@ -292,7 +292,7 @@ scoped variables with EL method invocation. (markt) /fix fix -bug50460/bug: Avoid leak caused by using a cached exception +bug50460/bug: Avoid a memory leak caused by using a cached exception instance in codeJspDocumentParser/code and codeProxyDirContext/code. (kkolinko) /fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by prosch
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The PoweredBy page has been changed by prosch.
The comment on this change is: update.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=285rev2=286
--
{{http://www.airsoftpx.com/sites/default/files/tnt_sharpsales_6_logo.jpg}}
[[http://www.airsoftpx.com|Airsoft PX]] is an e-commerce site that sells
[[http://www.airsoftpx.com/store/airsoft-guns|airsoft guns]] such as the
[[http://www.airsoftpx.com/store/airsoft-guns/aeg-automatic-electric-guns/classic-army-m15a4-tactical-carbine|Classic
Army m15a4 carbine]].
=== Alfresco ===
- {{http://www.alfresco.com/assets/images/header/alfresco-logo.gif}}
[[http://www.alfresco.org/download.html|Alfresco]] is an open-source enterprise
content management system.
+ {{http://www.alfresco.com/assets/images/header/alfresco-logo.gif}}
[[http://www.profi-fachuebersetzung.de|Vereidigter Dolmetscher]]
[[http://www.profischnell.com|Übersetzung Deutsch Englisch]]
[[http://www.alfresco.org/download.html|Alfresco]] is an open-source enterprise
content management system.
=== Astradyne Systems ===
{{http://astradyne.co.uk/astradynelogo.png}}
[[http://www.astradyne.co.uk/|Astradyne Systems]] - A front for a crime family?
;)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50571] Tomcat 7 JDBC connection pool exception enhancement
https://issues.apache.org/bugzilla/show_bug.cgi?id=50571 Filip Hanik fha...@apache.org changed: What|Removed |Added Status|NEW |NEEDINFO OS/Version||All --- Comment #1 from Filip Hanik fha...@apache.org 2011-01-11 16:47:08 EST --- hi Jeremy, I'm looking at your patch, and I will take a look at the connection state interceptor. most SQL exceptions, as you say, should percolate through when it makes sense. I wont apply the patch as it is, as I don't understand why most of the methods just change the signature of the method by adding throws SQLException. for example ConnectionPool.abandon doesn't really need to throw a SQLException best Filip -- 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
PoweredBy reverted to revision 285 on Tomcat Wiki
Dear wiki user,
You have subscribed to a wiki page Tomcat Wiki for change notification.
The page PoweredBy has been reverted to revision 285 by ChuckCaldarale.
The comment on this change is: Spam removal.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=286rev2=287
--
{{http://www.airsoftpx.com/sites/default/files/tnt_sharpsales_6_logo.jpg}}
[[http://www.airsoftpx.com|Airsoft PX]] is an e-commerce site that sells
[[http://www.airsoftpx.com/store/airsoft-guns|airsoft guns]] such as the
[[http://www.airsoftpx.com/store/airsoft-guns/aeg-automatic-electric-guns/classic-army-m15a4-tactical-carbine|Classic
Army m15a4 carbine]].
=== Alfresco ===
- {{http://www.alfresco.com/assets/images/header/alfresco-logo.gif}}
[[http://www.profi-fachuebersetzung.de|Vereidigter Dolmetscher]]
[[http://www.profischnell.com|Übersetzung Deutsch Englisch]]
[[http://www.alfresco.org/download.html|Alfresco]] is an open-source enterprise
content management system.
+ {{http://www.alfresco.com/assets/images/header/alfresco-logo.gif}}
[[http://www.alfresco.org/download.html|Alfresco]] is an open-source enterprise
content management system.
=== Astradyne Systems ===
{{http://astradyne.co.uk/astradynelogo.png}}
[[http://www.astradyne.co.uk/|Astradyne Systems]] - A front for a crime family?
;)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50570] Allow explicit use of FIPS mode for SSL connectors
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 --- Comment #2 from Mark Thomas ma...@apache.org 2011-01-11 17:04:30 EST --- Unless its changed since I last looked at it, a FIPS JSSE solution requires a new security provider and all the configuration happens in the JRE. Tomcat configuration does not change. -- 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: [VOTE] Release build 6.0.30
On Tue, Jan 11, 2011 at 6:18 AM, jean-frederic clere jfcl...@gmail.com wrote: The candidates binaries are available here: http://people.apache.org/~jfclere/tomcat-6/v6.0.30/ According to the release process, the 6.0.30 build corresponding to the tag TOMCAT_6_0_30 is: [ ] Broken [ ] Alpha [ ] Beta [x ] Stable Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org Cheers tim - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 15688] full-qualified names instead of imports
https://issues.apache.org/bugzilla/show_bug.cgi?id=15688 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #3 from Mark Thomas ma...@apache.org 2011-01-11 17:51:38 EST --- The spec requires certain packages to be imported. It also reserves the name space used by the local variables. -- 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 15688] full-qualified names instead of imports
https://issues.apache.org/bugzilla/show_bug.cgi?id=15688 Sven sven.koeh...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #4 from Sven sven.koeh...@gmail.com 2011-01-11 18:10:11 EST --- (In reply to comment #3) The spec requires certain packages to be imported. It also reserves the name space used by the local variables. I'm reopening, because your response fails to answer the questions that have been raised: It's obvious, that the spec says that certain packages are to be imported. However, does the spec say, what happens if another import shadows the import of those packages? I guess, nothing in the spec prevents you from using the fully qualified classnames. (I'm not asking your to remove the imports - that would clearly violate the spec.) -- 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 50571] Tomcat 7 JDBC connection pool exception enhancement
https://issues.apache.org/bugzilla/show_bug.cgi?id=50571 --- Comment #2 from Jeremy Norris jnorri...@gmail.com 2011-01-11 18:36:33 EST --- Hello, This initial use-case I was needing was for SQLExceptions originating in ConnectionState.reset() to propagate out of ConnectionPool.getConnection(). The rest of the changes cascaded from this: eg: ConnectionPool.abandon() - ConnectionPool.release() - PooledConnection.setHandler() - JdbcInterceptor.reset(). I suspect there will be more and that most APIs will possibly throw SQLException... 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 50547] The CHANGE_SESSION_ID message that received during cluster session synchronization is dropped.
https://issues.apache.org/bugzilla/show_bug.cgi?id=50547 --- Comment #4 from Keiichi Fujino kfuj...@apache.org 2011-01-12 00:30:16 EST --- Created an attachment (id=26482) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=26482) Patch against tc5.5 Patch against tc5.5 -- 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: r1057992 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kfujino Date: Wed Jan 12 05:44:58 2011 New Revision: 1057992 URL: http://svn.apache.org/viewvc?rev=1057992view=rev Log: BZ50547's patch for TC5.5. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1057992r1=1057991r2=1057992view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Jan 12 05:44:58 2011 @@ -87,6 +87,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547 Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message. http://svn.apache.org/viewvc?view=revisionrevision=1055798 + https://issues.apache.org/bugzilla/attachment.cgi?id=26482 (patch against tc5.5) +1: kfujino -1: rjung: Please provide a patch that applies cleanly to both DeltaManager - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
