svn commit: r1443872 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Author: kfujino
Date: Fri Feb 8 08:24:36 2013
New Revision: 1443872
URL: http://svn.apache.org/r1443872
Log:
Don't use a hard-coded domain name.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1443872&r1=1443871&r2=1443872&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Fri Feb 8 08:24:36 2013
@@ -90,7 +90,7 @@ public class StoreConfigLifecycleListene
MBeanServer mserver = MBeanUtils.createServer();
InputStream descriptor = null;
try {
-ObjectName objectName = new ObjectName("Catalina:type=StoreConfig"
);
+ObjectName objectName = new ObjectName(server.getDomain() +
":type=StoreConfig" );
if (!mserver.isRegistered(objectName)) {
registry.registerComponent(storeConfig, objectName,
"StoreConfig");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54521] DigestAuthenticator: nonceCountValid() fails in case of simultaneous asynchronous requests of the same client
https://issues.apache.org/bugzilla/show_bug.cgi?id=54521 --- Comment #2 from Sven Stieber --- Thank you for fixing this that quick. One additional question: Will this fix be included into the next Tomcat 6 Release, too? -- 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: r1443891 - /tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Author: kfujino Date: Fri Feb 8 08:50:24 2013 New Revision: 1443891 URL: http://svn.apache.org/r1443891 Log: Improve ContextSF description. Remove unused attributes engineName and saveConfig. Add effectiveMajorVersion and effectiveMinorVersion to TransientAttribute. Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1443891&r1=1443890&r2=1443891&view=diff == --- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Fri Feb 8 08:50:24 2013 @@ -69,15 +69,15 @@ displayName distributable domain - engineName name publicId originalDocBase replaceWelcomeFiles - saveConfig sessionTimeout startupTime tldScanTime +effectiveMajorVersion +effectiveMinorVersion
[Bug 54539] New: valve-configuration for DigestAuthenticator overwrites auth-method BASIC in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54539 Bug ID: 54539 Summary: valve-configuration for DigestAuthenticator overwrites auth-method BASIC in web.xml Product: Tomcat 6 Version: 6.0.33 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: sven.stie...@traveltainment.de Classification: Unclassified While switching from DIGEST-Authentication to BASIC we noticed that the setting BASIC has no effect if in the applications context.xml is a configuration for the org.apache.catalina.authenticator.DigestAuthenticator valve: In this case, tomcat still uses DIGEST-Authentication. Is this behavior intended or is this a bug? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1443872 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
On Fri, 2013-02-08 at 08:24 +, kfuj...@apache.org wrote: > Author: kfujino > Date: Fri Feb 8 08:24:36 2013 > New Revision: 1443872 > > URL: http://svn.apache.org/r1443872 > Log: > Don't use a hard-coded domain name. Actually, I'm not sure this is a good plan. This was most certainly hardcoded on purpose, so that the mbean is always available at a known location, and from where it could handle the full container (with multiple servers/domains ?). Don't know exactly what Peter had in mind though. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1443872 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
2013/2/8 Remy Maucherat : > On Fri, 2013-02-08 at 08:24 +, kfuj...@apache.org wrote: >> Author: kfujino >> Date: Fri Feb 8 08:24:36 2013 >> New Revision: 1443872 >> >> URL: http://svn.apache.org/r1443872 >> Log: >> Don't use a hard-coded domain name. > > Actually, I'm not sure this is a good plan. This was most certainly > hardcoded on purpose, so that the mbean is always available at a known > location, and from where it could handle the full container (with > multiple servers/domains ?). Don't know exactly what Peter had in mind > though. > OK. I will revert it. -- Keiichi.Fujino - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443905 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Author: kfujino
Date: Fri Feb 8 09:48:55 2013
New Revision: 1443905
URL: http://svn.apache.org/r1443905
Log:
revert r1443872.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1443905&r1=1443904&r2=1443905&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Fri Feb 8 09:48:55 2013
@@ -90,7 +90,7 @@ public class StoreConfigLifecycleListene
MBeanServer mserver = MBeanUtils.createServer();
InputStream descriptor = null;
try {
-ObjectName objectName = new ObjectName(server.getDomain() +
":type=StoreConfig" );
+ObjectName objectName = new ObjectName("Catalina:type=StoreConfig"
);
if (!mserver.isRegistered(objectName)) {
registry.registerComponent(storeConfig, objectName,
"StoreConfig");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443919 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS
Author: mturk Date: Fri Feb 8 10:17:39 2013 New Revision: 1443919 URL: http://svn.apache.org/r1443919 Log: Update VERSIONS with openssl-1.0.1d patch note Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1443919&r1=1443918&r2=1443919&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Fri Feb 8 10:17:39 2013 @@ -2,3 +2,5 @@ Use the following version of the librari - APR 1.4.6, http://apr.apache.org - OpenSSL 1.0.1d, http://www.openssl.org + Aplied patch for openssl.org #2974 + http://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=32cc247 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443921 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_27/
Author: mturk Date: Fri Feb 8 10:19:25 2013 New Revision: 1443921 URL: http://svn.apache.org/r1443921 Log: Tag 1.1.27 Added: tomcat/native/tags/TOMCAT_NATIVE_1_1_27/ (props changed) - copied from r1443919, tomcat/native/branches/1.1.x/ Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_27/ -- --- svn:ignore (added) +++ svn:ignore Fri Feb 8 10:19:25 2013 @@ -0,0 +1 @@ +dist Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_27/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 8 10:19:25 2013 @@ -0,0 +1,3 @@ +/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581 +/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769 +/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1443991 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS
Author: kkolinko Date: Fri Feb 8 12:49:06 2013 New Revision: 1443991 URL: http://svn.apache.org/r1443991 Log: Correct openssl issue number and typo Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1443991&r1=1443990&r2=1443991&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Fri Feb 8 12:49:06 2013 @@ -2,5 +2,5 @@ Use the following version of the librari - APR 1.4.6, http://apr.apache.org - OpenSSL 1.0.1d, http://www.openssl.org - Aplied patch for openssl.org #2974 + Applied patch for openssl.org issue #2975 http://git.openssl.org/gitweb/?p=openssl.git;a=patch;h=32cc247 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.1.27
Version 1.1.27 is bug fixing release. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 48 hours. The Apache Tomcat Native 1.1.27 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/native/1.1.27 [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_27 Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-204) ClassNotFoundException: org.apache.catalina.util.StringManager
[ https://issues.apache.org/jira/browse/MTOMCAT-204?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13574496#comment-13574496 ] Alain Perreault commented on MTOMCAT-204: - I don't used Maven. The issue is in tomcat logs. > ClassNotFoundException: org.apache.catalina.util.StringManager > -- > > Key: MTOMCAT-204 > URL: https://issues.apache.org/jira/browse/MTOMCAT-204 > Project: Apache Tomcat Maven Plugin > Issue Type: Question > Components: tomcat7 > Environment: Microsoft Windows XP Professionnel Version 2002 Sertvice > Pack 3 >Reporter: Alain Perreault >Assignee: Olivier Lamy (*$^¨%`£) > > During deployment I get this exeption > org.apache.catalina.core.ContainerBase addChildInternalOrg.apache.cata > GRAVE: ContainerBase addChild: start: > org.apache.catalinaLifecycleException: Failed to start component > [StandardEngine[Catalina].StandardHost[localhost].StandardContext[/MyServer]] > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java 154) > ... > Caused by: java.lang.NoClassDefFoundError: > Lorg/apache/catalina/util/StringManager; > at java.lang.Class.getDeclaredFieldFields0(Native Method) > at java.lang.Class.privateGetDeclaredFields (Unknown Source) > at java.lang.Class.getDeclaredFields (Unknown Source) > at org.apache.catalina.util.Introspection.getDeclaredFields > (Introspection.java:106) > ... > Caused by: java.lang.ClassNotFoundException: > org.apache.catalina.util.StringManager > I used apache-tomcat-7.0.35-windows-x86 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-204) ClassNotFoundException: org.apache.catalina.util.StringManager
[ https://issues.apache.org/jira/browse/MTOMCAT-204?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-204. -- Resolution: Not A Problem in such case use bugzilla for tomcat core issues: https://issues.apache.org/bugzilla/ > ClassNotFoundException: org.apache.catalina.util.StringManager > -- > > Key: MTOMCAT-204 > URL: https://issues.apache.org/jira/browse/MTOMCAT-204 > Project: Apache Tomcat Maven Plugin > Issue Type: Question > Components: tomcat7 > Environment: Microsoft Windows XP Professionnel Version 2002 Sertvice > Pack 3 >Reporter: Alain Perreault >Assignee: Olivier Lamy (*$^¨%`£) > > During deployment I get this exeption > org.apache.catalina.core.ContainerBase addChildInternalOrg.apache.cata > GRAVE: ContainerBase addChild: start: > org.apache.catalinaLifecycleException: Failed to start component > [StandardEngine[Catalina].StandardHost[localhost].StandardContext[/MyServer]] > at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java 154) > ... > Caused by: java.lang.NoClassDefFoundError: > Lorg/apache/catalina/util/StringManager; > at java.lang.Class.getDeclaredFieldFields0(Native Method) > at java.lang.Class.privateGetDeclaredFields (Unknown Source) > at java.lang.Class.getDeclaredFields (Unknown Source) > at org.apache.catalina.util.Introspection.getDeclaredFields > (Introspection.java:106) > ... > Caused by: java.lang.ClassNotFoundException: > org.apache.catalina.util.StringManager > I used apache-tomcat-7.0.35-windows-x86 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-189) additionalClassesDirs parameter handling expanded to include run and run-war goals
[ https://issues.apache.org/jira/browse/MTOMCAT-189?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-189. -- Resolution: Not A Problem Fix Version/s: (was: 2.1) Assignee: Olivier Lamy (*$^¨%`£) > additionalClassesDirs parameter handling expanded to include run and run-war > goals > -- > > Key: MTOMCAT-189 > URL: https://issues.apache.org/jira/browse/MTOMCAT-189 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement >Affects Versions: 2.1 >Reporter: Nick Lloyd >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Minor > Attachments: tomcat-run_runWar.patch > > > I contributed the original patch to add the functionality to add additional > directories to the classpath for the run goal. This patch expands on that, > adding the functionality to both run and run-war goals in the tomcat6 and > tomcat7 plugin artifacts. > Please review and incorporate as you see fit. My organization is using this > internally. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1443891 - /tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
2013/2/8 : > Author: kfujino > Date: Fri Feb 8 08:50:24 2013 > New Revision: 1443891 > > URL: http://svn.apache.org/r1443891 > Log: > Improve ContextSF description. > Remove unused attributes engineName and saveConfig. > Add effectiveMajorVersion and effectiveMinorVersion to TransientAttribute. > > Modified: > tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml > At the top of this registry file the following is written: Though I do not know whether this "version" attribute matters. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1443891 - /tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
On Fri, 2013-02-08 at 21:19 +0400, Konstantin Kolinko wrote: > 2013/2/8 : > > Author: kfujino > > Date: Fri Feb 8 08:50:24 2013 > > New Revision: 1443891 > > > > URL: http://svn.apache.org/r1443891 > > Log: > > Improve ContextSF description. > > Remove unused attributes engineName and saveConfig. > > Add effectiveMajorVersion and effectiveMinorVersion to TransientAttribute. > > > > Modified: > > tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml > > > > At the top of this registry file the following is written: > > > > Though I do not know whether this "version" attribute matters. I think its main use is, when storeconfig is an external component, to know which Tomcat version it supports. I'll verify it and drop it if possible. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54539] valve-configuration for DigestAuthenticator overwrites auth-method BASIC in web.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=54539 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Konstantin Kolinko --- Yes, it is intended behaviour. >From Tomcat point of view, all that does is that it configures an Authenticator. You already have one configured. The logic is in org.apache.catalina.startup.ContextConfig.authenticatorConfig() Suggestions for improving the documentation are welcome. -- 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: r1444289 - in /tomcat/tc6.0.x/branches/tomcat6-testing: ./ STATUS.txt java/org/apache/tomcat/util/buf/B2CConverter.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Feb 8 23:54:41 2013
New Revision: 1444289
URL: http://svn.apache.org/r1444289
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54248
Need to reset the decoder when the B2C converter is recycled to ensure BOMs
are correctly handled for those encodings that require them.
Backport of r1430083 from 7.0.x
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
--
Merged /tomcat/trunk:r1430079
Merged /tomcat/tc7.0.x/trunk:r1430083
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt?rev=1444289&r1=1444288&r2=1444289&view=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/STATUS.txt Fri Feb 8 23:54:41 2013
@@ -90,13 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, schultz
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54248
- Need to reset the decoder when the B2C converter is recycled to ensure BOMs
- are correctly handled for those encodings that require them.
- http://svn.apache.org/viewvc?rev=1430083&view=rev
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54382
Avoid NPE with an empty SSI directive
http://svn.apache.org/viewvc?view=revision&revision=1430553
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1444289&r1=1444288&r2=1444289&view=diff
==
---
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/tomcat/util/buf/B2CConverter.java
Fri Feb 8 23:54:41 2013
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -75,6 +76,7 @@ public class B2CConverter {
private IntermediateInputStream iis;
private ReadConvertor conv;
+private CharsetDecoder decoder;
private String encoding;
protected B2CConverter() {
@@ -95,6 +97,7 @@ public class B2CConverter {
*/
public void recycle() {
conv.recycle();
+decoder.reset();
}
static final int BUFFER_SIZE=8192;
@@ -149,12 +152,11 @@ public class B2CConverter {
}
-public void reset()
-throws IOException
-{
-// destroy the reader/iis
-iis=new IntermediateInputStream();
-conv=new ReadConvertor( iis, getCharset(encoding) );
+public void reset() throws IOException {
+// Re-create the reader and iis
+iis = new IntermediateInputStream();
+decoder = getCharset(encoding).newDecoder();
+conv = new ReadConvertor(iis, decoder);
}
private final int debug=0;
@@ -232,9 +234,8 @@ final class ReadConvertor extends Input
/** Create a converter.
*/
-public ReadConvertor( IntermediateInputStream in, Charset charset )
-{
-super( in, charset );
+public ReadConvertor(IntermediateInputStream in, CharsetDecoder decoder) {
+super(in, decoder);
}
/** Overriden - will do nothing but reset internal state.
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml?rev=1444289&r1=1444288&r2=1444289&view=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
(original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml Fri Feb
8 23:54:41 2013
@@ -75,6 +75,15 @@
+
+
+
+54248: Ensure that byte order marks are swallowed when using
+a Reader to read a request body with a BOM for those encodings that
+require byte order marks. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1444290 - in /tomcat/tc6.0.x/branches/tomcat6-testing/test/org/apache/tomcat/util/buf: ./ TestB2CConverter.java
Author: kkolinko Date: Fri Feb 8 23:56:27 2013 New Revision: 1444290 URL: http://svn.apache.org/r1444290 Log: Followup - testcase part of the following: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54248 Need to reset the decoder when the B2C converter is recycled to ensure BOMs are correctly handled for those encodings that require them. Backport of r1430083 from 7.0.x Added: tomcat/tc6.0.x/branches/tomcat6-testing/test/org/apache/tomcat/util/buf/ tomcat/tc6.0.x/branches/tomcat6-testing/test/org/apache/tomcat/util/buf/TestB2CConverter.java - copied unchanged from r1441961, tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1444292 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/buf/B2CConverter.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Feb 8 23:59:22 2013
New Revision: 1444292
URL: http://svn.apache.org/r1444292
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54248
Need to reset the decoder when the B2C converter is recycled to ensure BOMs
are correctly handled for those encodings that require them.
Merging r1444289 from tomcat6-testing branch.
It is backport of r1430083 from 7.0.x
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/tc6.0.x/branches/tomcat6-testing:r1444289
Merged /tomcat/trunk:r1430079
Merged /tomcat/tc7.0.x/trunk:r1430083
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1444292&r1=1444291&r2=1444292&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 8 23:59:22 2013
@@ -90,13 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, schultz
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54248
- Need to reset the decoder when the B2C converter is recycled to ensure BOMs
- are correctly handled for those encodings that require them.
- http://svn.apache.org/viewvc?rev=1430083&view=rev
- +1: markt, kkolinko, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54382
Avoid NPE with an empty SSI directive
http://svn.apache.org/viewvc?view=revision&revision=1430553
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1444292&r1=1444291&r2=1444292&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri
Feb 8 23:59:22 2013
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -75,6 +76,7 @@ public class B2CConverter {
private IntermediateInputStream iis;
private ReadConvertor conv;
+private CharsetDecoder decoder;
private String encoding;
protected B2CConverter() {
@@ -95,6 +97,7 @@ public class B2CConverter {
*/
public void recycle() {
conv.recycle();
+decoder.reset();
}
static final int BUFFER_SIZE=8192;
@@ -149,12 +152,11 @@ public class B2CConverter {
}
-public void reset()
-throws IOException
-{
-// destroy the reader/iis
-iis=new IntermediateInputStream();
-conv=new ReadConvertor( iis, getCharset(encoding) );
+public void reset() throws IOException {
+// Re-create the reader and iis
+iis = new IntermediateInputStream();
+decoder = getCharset(encoding).newDecoder();
+conv = new ReadConvertor(iis, decoder);
}
private final int debug=0;
@@ -232,9 +234,8 @@ final class ReadConvertor extends Input
/** Create a converter.
*/
-public ReadConvertor( IntermediateInputStream in, Charset charset )
-{
-super( in, charset );
+public ReadConvertor(IntermediateInputStream in, CharsetDecoder decoder) {
+super(in, decoder);
}
/** Overriden - will do nothing but reset internal state.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1444292&r1=1444291&r2=1444292&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Feb 8 23:59:22 2013
@@ -75,6 +75,15 @@
+
+
+
+54248: Ensure that byte order marks are swallowed when using
+a Reader to read a request body with a BOM for those encodings that
+require byte order marks. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1444293 - in /tomcat/tc6.0.x/branches/tomcat6-testing: ./ BRANCH-README.txt
Author: kkolinko Date: Sat Feb 9 00:04:48 2013 New Revision: 1444293 URL: http://svn.apache.org/r1444293 Log: Record-only merge of r1417826,1444292 from 6.0.x/trunk Those are revisions that have been merged from this branch to trunk. Thus all those changes are already present in this branch and cannot be merged back. Updated BRANCH-README.txt Modified: tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed) tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/ -- Merged /tomcat/tc6.0.x/trunk:r1417826,1444292 Modified: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt?rev=1444293&r1=1444292&r2=1444293&view=diff == --- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt (original) +++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Sat Feb 9 00:04:48 2013 @@ -5,7 +5,9 @@ merges from tc6.0.x/trunk. Created: 2012-11-12 from r1408230 Last catch-up merge: 2013-02-04 (r1442376), merged up to r1442373 - (skipping r1417826) + +Revisions in 6.0.x/trunk that are merges from this branch: +r1417826,1444292 TODO: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54248] Retrieving content that contains a BOM via request.getReader() issue
https://issues.apache.org/bugzilla/show_bug.cgi?id=54248 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Konstantin Kolinko --- Fixed in 6.0 with r1444292 and will be in 6.0.37 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1444296 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/LocalStrings_es.properties webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Feb 9 00:21:02 2013
New Revision: 1444296
URL: http://svn.apache.org/r1444296
Log:
CTR: non-English resource file
Fix Spanish translation
s/recycling/reloading/
It is merge of r1438415 from tc7.0.x/trunk
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1438411
Merged /tomcat/tc7.0.x/trunk:r1438415
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1444296&r1=1444295&r2=1444296&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Sat Feb 9 00:21:02 2013
@@ -99,7 +99,7 @@ standardContext.notStarted = A\u00fan no
standardContext.notWrapper = El Hijo de un Contexto debe de ser un Arropador
(Wrapper)
standardContext.parameter.duplicate = Duplicado par\u00e1metro de
inicializaci\u00f3n de contexto {0}
standardContext.parameter.required = Es necesario poner nombre de
par\u00e1metro y valor de par\u00e1metro
-standardContext.reloadingCompleted = Se ha completado la Regarga de este
Contexto
+standardContext.reloadingCompleted = Se ha completado la recarga de este
Contexto
standardContext.reloadingFailed = Fall\u00f3 la recarga de este Contexto
debido a errores previos
standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}]
standardContext.resourcesStart = Error arrancando Recursos est\u00e1ticos
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1444296&r1=1444295&r2=1444296&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Feb 9 00:21:02 2013
@@ -73,6 +73,10 @@
or the servlet is a SingleThreadModel one, and of filter instances
if their destroy() method fails with an Error. (kkolinko)
+
+54483: Correct one of the Spanish translations. Based on a
+suggestion from adinamita. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54483] error in translation
https://issues.apache.org/bugzilla/show_bug.cgi?id=54483 --- Comment #3 from Konstantin Kolinko --- Fixed in 6.0 as well by r1444296 and will be in 6.0.37. -- 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: r1444299 - in /tomcat/tc6.0.x/branches/tomcat6-testing: ./ BRANCH-README.txt java/org/apache/catalina/core/LocalStrings_es.properties webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Feb 9 00:28:04 2013
New Revision: 1444299
URL: http://svn.apache.org/r1444299
Log:
Catch-up merge from 6.0.x/trunk.
Merged all up to r1444297
(+= r1442374-1444291,1444293-1444297 )
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
--
Merged /tomcat/trunk:r1438411
Merged /tomcat/tc7.0.x/trunk:r1438415
Merged /tomcat/tc6.0.x/trunk:r1442374-1444291,1444293-1444297
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt?rev=1444299&r1=1444298&r2=1444299&view=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Sat Feb 9
00:28:04 2013
@@ -4,7 +4,7 @@ It is maintained as a reintegrate-able b
merges from tc6.0.x/trunk.
Created: 2012-11-12 from r1408230
-Last catch-up merge: 2013-02-04 (r1442376), merged up to r1442373
+Last catch-up merge: 2013-02-09, merged up to r1444297
Revisions in 6.0.x/trunk that are merges from this branch:
r1417826,1444292
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1444299&r1=1444298&r2=1444299&view=diff
==
---
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
Sat Feb 9 00:28:04 2013
@@ -99,7 +99,7 @@ standardContext.notStarted = A\u00fan no
standardContext.notWrapper = El Hijo de un Contexto debe de ser un Arropador
(Wrapper)
standardContext.parameter.duplicate = Duplicado par\u00e1metro de
inicializaci\u00f3n de contexto {0}
standardContext.parameter.required = Es necesario poner nombre de
par\u00e1metro y valor de par\u00e1metro
-standardContext.reloadingCompleted = Se ha completado la Regarga de este
Contexto
+standardContext.reloadingCompleted = Se ha completado la recarga de este
Contexto
standardContext.reloadingFailed = Fall\u00f3 la recarga de este Contexto
debido a errores previos
standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}]
standardContext.resourcesStart = Error arrancando Recursos est\u00e1ticos
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml?rev=1444299&r1=1444298&r2=1444299&view=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
(original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml Sat Feb
9 00:28:04 2013
@@ -73,6 +73,10 @@
or the servlet is a SingleThreadModel one, and of filter instances
if their destroy() method fails with an Error. (kkolinko)
+
+54483: Correct one of the Spanish translations. Based on a
+suggestion from adinamita. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1444300 [2/2] - in /tomcat/trunk/java/org/apache: catalina/ catalina/storeconfig/ tomcat/jni/
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1444300&r1=1444299&r2=1444300&view=diff == --- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Sat Feb 9 00:46:07 2013 @@ -17,144 +17,144 @@ --> - domain +domain - domain +domain - available - configFile - configured - displayName - distributable - domain - name - publicId - originalDocBase - replaceWelcomeFiles - sessionTimeout - startupTime - tldScanTime +available +configFile +configured +displayName +distributable +domain +name +publicId +originalDocBase +replaceWelcomeFiles +sessionTimeout +startupTime +tldScanTime effectiveMajorVersion -effectiveMinorVersion +effectiveMinorVersion - URIEncoding - maxProcessor - minProcessor +URIEncoding +maxProcessor + minProcessor - - entropy - distributable +entropy +distributable entropy - distributable +distributable @@ -162,24 +162,24 @@ realmPath org.apache.catalina.mbeans.ServerLifecycleListener org.apache.catalina.core.NamingContextListener @@ -193,66 +193,66 @@ - org.apache.catalina.authenticator.BasicAuthenticator - org.apache.catalina.authenticator.DigestAuthenticator - org.apache.catalina.authenticator.FormAuthenticator - org.apache.catalina.authenticator.NonLoginAuthenticator - org.apache.catalina.authenticator.SSLAuthenticator - org.apache.catalina.core.StandardContextValve - org.apache.catalina.core.StandardEngineValve - org.apache.catalina.core.StandardHostValve - org.apache.catalina.valves.CertificatesValve - org.apache.catalina.valves.ErrorReportValve - org.apache.catalina.valves.RequestListenerValve +tag="Valve" +standard="false" +default="false" +tagClass="org.apache.catalina.Valve" +storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"> + org.apache.catalina.authenticator.BasicAuthenticator + org.apache.catalina.authenticator.DigestAuthenticator + org.apache.catalina.authenticator.FormAuthenticator + org.apache.catalina.authenticator.NonLoginAuthenticator + org.apache.catalina.authenticator.SSLAuthenticator + org.apache.catalina.core.StandardContextValve + org.apache.catalina.core.StandardEngineValve + org.apache.catalina.core.StandardHostValve + org.apache.catalina.valves.CertificatesValve + org.apache.catalina.valves.ErrorReportValve + org.apache.catalina.valves.RequestListenerValve org.apache.catalina.ha.session.JvmRouteBinderValve org.apache.catalina.ha.tcp.ReplicationValve - + allowLinking cachingAllowed @@ -267,7 +267,7 @@ id="org.apache.catalina.WebResourceSet.[PreResources]" tag="PreResources" standard="false" -default="false" +default="false" tagClass="org.apache.catalina.WebResourceSet" storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"> @@ -275,7 +275,7 @@ id="org.apache.catalina.WebResourceSet.[JarResources]" tag="JarResources" standard="false" -default="false" +default="false" tagClass="org.apache.catalina.WebResourceSet" storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"> @@ -283,111 +283,111 @@ id="org.apache.catalina.WebResourceSet.[PostResources]" tag="PostResources" standard="false" -default="false" +default="false" tagClass="org.apache.catalina.WebResourceSet" storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase"> - +
svn commit: r1444301 - /tomcat/trunk/java/org/apache/catalina/storeconfig/
Author: kkolinko
Date: Sat Feb 9 00:52:59 2013
New Revision: 1444301
URL: http://svn.apache.org/r1444301
Log:
Add missing @Override annotations
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/RealmSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java?rev=1444301&r1=1444300&r2=1444301&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
Sat Feb 9 00:52:59 2013
@@ -47,6 +47,7 @@ public class CatalinaClusterSF extends S
* @exception Exception
*if an exception occurs while storing
*/
+@Override
public void storeChilds(PrintWriter aWriter, int indent, Object aCluster,
StoreDescription parentDesc) throws Exception {
if (aCluster instanceof CatalinaCluster) {
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java?rev=1444301&r1=1444300&r2=1444301&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java Sat Feb 9
00:52:59 2013
@@ -45,6 +45,7 @@ public class ChannelSF extends StoreFact
* @exception Exception
*if an exception occurs while storing
*/
+@Override
public void storeChilds(PrintWriter aWriter, int indent, Object aChannel,
StoreDescription parentDesc) throws Exception {
if (aChannel instanceof Channel) {
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java?rev=1444301&r1=1444300&r2=1444301&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java Sat Feb
9 00:52:59 2013
@@ -36,6 +36,7 @@ public class ConnectorSF extends StoreFa
* @param aConnector
* @throws Exception
*/
+@Override
public void storeChilds(PrintWriter aWriter, int indent, Object aConnector,
StoreDescription parentDesc) throws Exception {
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1444301&r1=1444300&r2=1444301&view=diff
==
---
tom
svn commit: r1444303 - /tomcat/trunk/java/org/apache/catalina/storeconfig/
Author: kkolinko
Date: Sat Feb 9 00:58:08 2013
New Revision: 1444303
URL: http://svn.apache.org/r1444303
Log:
Remove unnecessary casts
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java Sat Feb
9 00:58:08 2013
@@ -19,7 +19,6 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
@@ -43,11 +42,8 @@ public class ConnectorSF extends StoreFa
if (aConnector instanceof Connector) {
Connector connector = (Connector) aConnector;
// Store nested elements
-if (connector instanceof Lifecycle) {
-LifecycleListener listeners[] = ((Lifecycle) connector)
-.findLifecycleListeners();
-storeElementArray(aWriter, indent, listeners);
-}
+LifecycleListener listeners[] = connector.findLifecycleListeners();
+storeElementArray(aWriter, indent, listeners);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Sat Feb 9 00:58:08 2013
@@ -93,7 +93,7 @@ public class ConnectorStoreAppender exte
Iterator propertyIterator = propertyKeys.iterator();
while (propertyIterator.hasNext()) {
String key = propertyIterator.next();
-Object value = (Object) IntrospectionUtils.getProperty(bean, key);
+Object value = IntrospectionUtils.getProperty(bean, key);
if (desc.isTransientAttribute(key)) {
continue; // Skip the specified exceptions
@@ -172,7 +172,7 @@ public class ConnectorStoreAppender exte
}
String key = descriptors[i].getName();
if (replacements.get(key) != null) {
-key = (String) replacements.get(key);
+key = replacements.get(key);
}
if (!propertyKeys.contains(key)) {
propertyKeys.add(key);
@@ -243,7 +243,7 @@ public class ConnectorStoreAppender exte
Object value) {
String repl = name;
if (replacements.get(name) != null) {
-repl = (String) replacements.get(name);
+repl = replacements.get(name);
}
super.printValue(writer, indent, repl, value);
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1444303&r1=1444302&r2=1444303&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Sat Feb 9 00:58:08 2013
@@ -30,7 +30,6 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
@@ -151,7 +150,7 @@ public class StandardContextSF extends S
* @throws Exception
*/
protected void storeWithBackup(StandardContext aContext) throws Exception {
-StoreFileMover mover = getConfigFileWriter((Context) aContext);
+StoreFileMover mover =
svn commit: r1444305 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Author: kkolinko
Date: Sat Feb 9 01:00:04 2013
New Revision: 1444305
URL: http://svn.apache.org/r1444305
Log:
Remove unnecessary cast
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1444305&r1=1444304&r2=1444305&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Sat Feb 9 01:00:04 2013
@@ -313,7 +313,7 @@ public class StandardContextSF extends S
protected File configBase(Context context) {
File file = new File(System.getProperty("catalina.base"), "conf");
-Container host = (Host) context.getParent();
+Container host = context.getParent();
if ((host != null) && (host instanceof Host)) {
Container engine = host.getParent();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Checkstyle errors in storeconfig in trunk
2013/2/8 Konstantin Kolinko : > Hi! > > FYI, there are a lot of checkstyle errors in o.a.c.storeconfig package, > > a) tabs in server-registry.xml > b) a lot of trailing whitespace Fixed. Further notices: 1. In a lot of places the code uses name "childs" instead of "children". E.g. childs="true" in server-registry.xml E.g. storeChilds(..) method in StoreFactoryBase class 2. Javadoc for StoreLoader documents XML format for a registry file. What I see there is not what I see in server-registry.xml file in the storeconfig package. E.g. documented , actual 3. Checkstyle now shows a number (27) of "disallowed import" warnings. Those are imports from "o.a.catalina.tribes" and "o.a.catalina.ha". I think it just means that this component depends on those, and Checkstyle rules needs adjustment here. Best regards, Konstantin Kolinko - 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 vaksoy
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 vaksoy:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=453&rev2=454
=== Fluency ===
[[http://fluency.knownspace.org|Fluency]] is a dynamic user interface builder
that uses Tomcat for its
[[http://fluency.knownspace.org/developer/internal/tomcat.html|infrastructure]].
+ === Frankfurt IT Service ===
+
{{http://www.inuvativ.de/images/frankfurt-it-service.png}}[[http://www.frankfurt-it-service.de|Frankfurt
IT-Service]] offers on site support & IT services.
+
=== GetAhead.com ===
[[http://getahead.ltd.uk/home|GetAhead.ltd.uk]] - A web development
consultancy.
@@ -303, +306 @@
{{http://www.pcgesund.de/_content/about/img/screens/logo_small.png}}
http://www.pcgesund.de - PC Gesund is the leading remote support computer
helpdesk in Germany.
=== PC Service Langen ===
- [[http://www.pc-service-langen.de |IT-Service Frankfurt]] - Workstation,
Server and Websolutions in Frankfurt
+ [[http://www.pc-service-langen.de|IT-Service Frankfurt]] - Workstation,
Server and Websolutions in Frankfurt
=== Popcorn Monsters ===
{{http://popcornmonsters.com/images/logo_1.jpg}}
[[http://PopcornMonsters.com|PopcornMonsters.com]] - A free movie information
portal that averages 100,000 unique visitors a month.
@@ -394, +397 @@
=== XWiki ===
[[http://www.xwiki.org/xwiki/bin/view/Main/WebHome|XWiki]] is an open-source
Java wiki system.
-
<>
@@ -424, +426 @@
[[http://www.bodhost.com/|BODHost]] - Proud to be Apache Tomcat Hosting
Provider
=== DailyRazor ===
- {{http://www.dailyrazor.com/mb/images/logo_sample.gif}}
- [[http://www.dailyrazor.com/java-jsp-hosting/|DailyRazor]] is the leading
provider of Tomcat and Java hosting solutions with fantastic support for MySQL
and PostgreSQL database. Tomcat 5, 6, and 7 all supported. All plans feature
Private JDK on a Private JVM.
+ {{http://www.dailyrazor.com/mb/images/logo_sample.gif}}
[[http://www.dailyrazor.com/java-jsp-hosting/|DailyRazor]] is the leading
provider of Tomcat and Java hosting solutions with fantastic support for MySQL
and PostgreSQL database. Tomcat 5, 6, and 7 all supported. All plans feature
Private JDK on a Private JVM.
=== DreamShared ===
{{http://www.dreamshared.com/site/images/v2/logo_no_bg.png}}
[[http://www.dreamshared.com/|DreamShared]] uses Tomcat to help people design
and host unique, stylish, custom business websites and wedding websites.
@@ -561, +562 @@
{{http://zaidsoft.net/images/logo.jpg}} http://www.zaidsoft.net Zaidsoft
offers JSP hosting using Tomcat. All of [[http://www.zaidsoft.com|Zaidsoft]]
web based software applications including
[[http://www.zaidsoft.com/iMLM/mlm_software.html|Zaidsoft iMLM]] are powered by
Tomcat as JSP/Servlet container.
<>
+
== Surveys and Other Evidence of Usage ==
=== JBoss Infrastructure Survey ===
{{http://www.jboss.com/themes/jbosstheme/img/logo.gif}}
[[http://www.jboss.com/pdf/JBossAS-EnterpriseInfrastructure.pdf|A survey]] of
infrastructure tools, adoption, mindshare, and more from JBoss finds Tomcat
again among the leading products.
@@ -571, +573 @@
=== TheServerSide.com ===
{{http://www.theserverside.com/skin/images/header_logotype.gif}}
[[http://www.theserverside.com/tss?service=direct/0/NewsThread/threadViewer.markNoisy.link&sp=l28395&sp=l136428|Tomcat
is among the market leaders]] in this survey by
[[http://www.theserverside.com|TheServerSide.com]].
+ === Frankfurt IT Service ===
+
+
<>
+
+
== More Stuff ==
* A
[[http://developers.slashdot.org/article.pl?sid=02/08/19/2042235&tid=108|SlashDot]]
discussion about using Tomcat in production.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
