svn commit: r919917 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Mar 7 03:35:07 2010 New Revision: 919917 URL: http://svn.apache.org/viewvc?rev=919917&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919917&r1=919916&r2=919917&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 7 03:35:07 2010 @@ -98,3 +98,25 @@ http://svn.apache.org/viewvc?rev=918803&view=rev +1: kkolinko, markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668 + + 1) Fix for jasper.compiler.Parser + Honor isELIgnored and isDeferredSyntaxAllowed when parsing. + Backport of r919851: + http://people.apache.org/~kkolinko/patches/2010-03-07_tc6_bug48668_r919851.patch + +1: kkolinko + -1: + + 2) Fix for jasper.compiler.Validator + Fix jasper.compiler.Validator behaviour with regards to isELIgnored and + isDeferredSyntaxAllowedAsLiteral options. Do not try parsing EL when + isELIgnored = true. + Make jasper.compiler.ELParser aware about isDeferredSyntaxAllowedAsLiteral option. + Make default values of isDeferredSyntaxAllowedAsLiteral and isELIgnored + be determined by servlet spec version in web.xml or by jsp spec version + in TLD file. + Backport of r919914: + http://people.apache.org/~kkolinko/patches/2010-03-07_tc6_bug48668_r919914.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
Author: kkolinko
Date: Sun Mar 7 02:43:12 2010
New Revision: 919914
URL: http://svn.apache.org/viewvc?rev=919914&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Fix remaining issues in BZ48668
The idea behind this change is to make ELParser aware about isDeferredAsLiteral
option.
Before this change ELParser was used to parse an attribute regardless of
isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change we do
not use ELParser when isELIgnored is true and ELParser does not parse '#{' in
expressions when isDeferredSyntaxAllowedAsLiteral is true.
It simplified the code in many places.
Also, servlet specification version from web.xml and JSP specification version
from TLD file are now taken into account when determining the default values
for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As far as I understand
the code, previously only isELIgnored was determined by the servlet
specification version.
TstParser.java, bug48668a.jsp:
I reenabled the tests that now pass with these changes applied.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/webapp/bug48668a.jsp
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=919914&r1=919913&r2=919914&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Sun Mar 7
02:43:12 2010
@@ -152,6 +152,20 @@
JspUtil.booleanValue(
jspProperty.isErrorOnUndeclaredNamespace()));
}
+if (ctxt.getTagInfo() != null) {
+try {
+double libraryVersion = Double.parseDouble(ctxt.getTagInfo()
+.getTagLibrary().getRequiredVersion());
+if (libraryVersion < 2.0) {
+pageInfo.setELIgnored(true);
+}
+if (libraryVersion < 2.1) {
+pageInfo.setDeferredSyntaxAllowedAsLiteral(true);
+}
+} catch (NumberFormatException ex) {
+// ignored
+}
+}
ctxt.checkOutputDir();
String javaFileName = ctxt.getServletJavaFileName();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=919914&r1=919913&r2=919914&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Sun Mar 7
02:43:12 2010
@@ -45,13 +45,16 @@
private boolean escapeBS; // is '\' an escape char in text outside EL?
+private final boolean isDeferredSyntaxAllowedAsLiteral;
+
private static final String reservedWords[] = { "and", "div", "empty",
"eq", "false", "ge", "gt", "instanceof", "le", "lt", "mod", "ne",
"not", "null", "or", "true" };
-public ELParser(String expression) {
+public ELParser(String expression, boolean
isDeferredSyntaxAllowedAsLiteral) {
index = 0;
this.expression = expression;
+this.isDeferredSyntaxAllowedAsLiteral =
isDeferredSyntaxAllowedAsLiteral;
expr = new ELNode.Nodes();
}
@@ -61,10 +64,14 @@
* @param expression
*The input expression string of the form Char* ('${' Char*
*'}')* Char*
+ * @param isDeferredSyntaxAllowedAsLiteral
+ * Are deferred expressions treated as literals?
* @return Parsed EL expression in ELNode.Nodes
*/
-public static ELNode.Nodes parse(String expression) {
-ELParser parser = new ELParser(expression);
+public static ELNode.Nodes parse(String expression,
+boolean isDeferredSyntaxAllowedAsLiteral) {
+ELParser parser = new ELParser(expression,
+isDeferredSyntaxAllowedAsLiteral);
while (parser.hasNextChar()) {
String text = parser.skipUntilEL();
if (text.length() > 0) {
@@ -188,11 +195,13 @@
buf.append('\\');
if (!escapeBS)
prev = '\\';
-} else if (ch == '$' || ch == '#') {
+} else if (ch == '$'
+|| (!isDeferredSyntaxAllowedAsLiteral && ch == '#')) {
Re: Feedback on tomcat memory leak protection
> On 03/03/2010 21:12, Sylvain Laurent wrote: > > > 3) a couple of months ago I had proposed on this very list a kind of memory > > leak protection > for those leaks caused by threads with incorrect CCL. I called this the > ExpendableClassLoader. > Please have a look at my post back then : > http://mail-archives.apache.org/mod_mbox/tomcat-dev/200903.mbox/%3cb1be8ffd-f13f-4b2b-b25a-83f2f855b...@m4x.org%3e > > Since I did not get any feedback about this idea at all, neither positive > > nor negative, > I can only assume that my post got lost in the middle of the other ones. I > still think that > this ExpendableClassLoader would improve the memory leak protection. Actually > it would make > the JreMemoryLeakPreventionListener useless and developers would not have to > think about which > option of the JreMemoryLeakPreventionListener is useful to them. > I suspect the lack of full source code (the Tomcat lists drop > attachments) had something to do with it. The concept sounds promising > and would be better than continually adding to the > JreLeakPreventionListener. Should I try to pursue my investigation and provide a patch ? for TC 6 or 7 ? > > > 4) Not tomcat specific, but it might interest you anyways : > > there's definitely a problem with Sun's server VM, even with the latest > > 6.0_18. Classloaders > are not always collected by the GC and this can lead to an OOME in the perm > gen. I managed > to reproduce this with tomcat 6.0.24 and the petcare.war sample of Spring 3. > When using the > client VM, the WebAppClassLoader is always correctly GCed. When using the > server VM (either > 32 or 64 bits, on Windows or MacOS), the classloader is not collected and > after a couple of > redeployments, the perm gen is full and an OOME is raised. When analyzing the > heap dump, I > can see several instances of WebAppClassLoaders, and eclipse MAT > (www.eclipse.org/mat) shows > that there's no strong reference to them :-((( > That sounds like http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6916498 No, it's actually much more severe. The bug you filed provokes a one time leak: only the first webapp that uses DocumentBuilderFactory.newInstance().newDocumentBuilder() will leak. The bug I see with the server VM is probably closer to http://bugs.sun.com/view_bug.do?bug_id=4957990 which is supposed to be fixed since 6.0u16, but the comment of 2009-12-09 says otherwise. Anyways, I filed a bug report to Sun, it's in review for now... Sylvain - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat build error
Hi, I tried building the 6.0.x tomcat source. From the installation looks like we had to execute "ant download" and then "ant". Executing "ant download" completed fine and said build successful. But executing "ant" after it fails with this error: Any idea if some envt variable is messed up ? sudo ant Buildfile: build.xml build-prepare: [delete] Deleting directory /usr/share/tomcat-trunk/output/build/temp [mkdir] Created dir: /usr/share/tomcat-trunk/output/build/temp compile: [javac] Compiling 1058 source files to /usr/share/tomcat-trunk/output/classes BUILD FAILED java.lang.NoClassDefFoundError: gnu/classpath/Configuration at com.sun.tools.javac.Main.(Main.java:66) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:186) at org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory.doesModernCompilerExist(CompilerAdapterFactory.java:145) at org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory.getCompiler(CompilerAdapterFactory.java:100) at org.apache.tools.ant.taskdefs.Javac.compile(Javac.java:1058) at org.apache.tools.ant.taskdefs.Javac.execute(Javac.java:882) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:288) at sun.reflect.GeneratedMethodAccessor1.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106) at org.apache.tools.ant.Task.perform(Task.java:348) at org.apache.tools.ant.Target.execute(Target.java:357) at org.apache.tools.ant.Target.performTasks(Target.java:385) at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1337) at org.apache.tools.ant.Project.executeTarget(Project.java:1306) at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) at org.apache.tools.ant.Project.executeTargets(Project.java:1189) at org.apache.tools.ant.Main.runBuild(Main.java:758) at org.apache.tools.ant.Main.startAnt(Main.java:217) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:257) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:104) Caused by: java.lang.ClassNotFoundException: gnu.classpath.Configuration at java.net.URLClassLoader$1.run(URLClassLoader.java:217) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:205) at java.lang.ClassLoader.loadClass(ClassLoader.java:323) at java.lang.ClassLoader.loadClass(ClassLoader.java:268) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:336) ... 23 more Total time: 1 second Regards, Bharath
svn commit: r919851 - in /tomcat/trunk: java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestParser.java test/webapp/bug48668a.jsp
Author: kkolinko
Date: Sat Mar 6 21:03:14 2010
New Revision: 919851
URL: http://svn.apache.org/viewvc?rev=919851&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Honor isELIgnored and isDeferredSyntaxAllowed in the Parser
Uncommented the test cases in TestParser/bug48668a.jsp that now are passing.
The ##12,13,16,17 remain commented, because they are still failing.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/webapp/bug48668a.jsp
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=919851&r1=919850&r2=919851&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Sat Mar 6
21:03:14 2010
@@ -1462,9 +1462,11 @@
err.jspError(reader.mark(), "jsp.error.no.scriptlets");
} else if (reader.matches("http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=919851&r1=919850&r2=919851&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sat Mar 6
21:03:14 2010
@@ -78,17 +78,17 @@
assertEcho(result, "32-Hello #{'foo}");
assertEcho(result, "33-Hello #{'foo}");
assertEcho(result, "34-Hello ${'foo}");
-//assertEcho(result, "35-Hello ${'foo}");
+assertEcho(result, "35-Hello ${'foo}");
assertEcho(result, "36-Hello #{'foo}");
-//assertEcho(result, "37-Hello #{'foo}");
+assertEcho(result, "37-Hello #{'foo}");
assertEcho(result, "40-Hello ${'foo}");
-//assertEcho(result, "41-Hello ${'foo}");
-//assertEcho(result, "42-Hello #{'foo}");
-//assertEcho(result, "43-Hello #{'foo}");
+assertEcho(result, "41-Hello ${'foo}");
+assertEcho(result, "42-Hello #{'foo}");
+assertEcho(result, "43-Hello #{'foo}");
assertEcho(result, "50-Hello ${'foo}");
-//assertEcho(result, "51-Hello ${'foo}");
-//assertEcho(result, "52-Hello #{'foo}");
-//assertEcho(result, "53-Hello #{'foo}");
+assertEcho(result, "51-Hello ${'foo}");
+assertEcho(result, "52-Hello #{'foo}");
+assertEcho(result, "53-Hello #{'foo}");
}
public void testBug48668b() throws Exception {
Modified: tomcat/trunk/test/webapp/bug48668a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48668a.jsp?rev=919851&r1=919850&r2=919851&view=diff
==
--- tomcat/trunk/test/webapp/bug48668a.jsp (original)
+++ tomcat/trunk/test/webapp/bug48668a.jsp Sat Mar 6 21:03:14 2010
@@ -42,19 +42,19 @@
32-
33-Hello
34-Hello
${'foo}
-<%--35-Hello ${'foo}--%>
+35-Hello ${'foo}
36-Hello
#{'foo}
-<%--37-Hello #{'foo}--%>
+37-Hello #{'foo}
40-Hello
${'foo}
41-Hello ${'foo}
42-Hello
#{'foo}
-<%--43-Hello #{'foo}--%>
+43-Hello #{'foo}
50-Hello ${'foo}
51-Hello ${'foo}
52-Hello #{'foo}
-<%--53-Hello #{'foo}--%>
+53-Hello #{'foo}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48668] Template text that looks like a deferred expression can be mishandled even if EL is ignored
https://issues.apache.org/bugzilla/show_bug.cgi?id=48668 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #3 from Konstantin Kolinko 2010-03-06 20:51:09 UTC --- Reopening. Additional tests added in r919847. Some of them are failing. This issue is also reproducible in the current 5.5 using /test/webapp/bug48668a.jsp from trunk. (bug48668b.jsp is not applicable to 5.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: r919847 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestParser.java webapp/WEB-INF/tags/bug48668.tagx webapp/bug48668a.jsp
Author: kkolinko
Date: Sat Mar 6 20:46:06 2010
New Revision: 919847
URL: http://svn.apache.org/viewvc?rev=919847&view=rev
Log:
Additional tests for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
The TestCase currently passes:
the parts that do not pass currently are commented-out:
- in bug48668a.jsp: those that prevent JSP from being compiled
- in TestParser.java: also those that provide wrong output.
Added:
tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/webapp/bug48668a.jsp
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=919847&r1=919846&r2=919847&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Sat Mar 6
20:46:06 2010
@@ -58,8 +58,37 @@
ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug48668a.jsp");
String result = res.toString();
+System.out.println(result);
assertEcho(result, "00-Hello world#{foo.bar}");
assertEcho(result, "01-Hello world${foo.bar}");
+assertEcho(result, "10-Hello ${'foo.bar}");
+assertEcho(result, "11-Hello ${'foo.bar}");
+//assertEcho(result, "12-Hello #{'foo.bar}");
+//assertEcho(result, "13-Hello #{'foo.bar}");
+assertEcho(result, "14-Hello ${'foo}");
+assertEcho(result, "15-Hello ${'foo}");
+//assertEcho(result, "16-Hello #{'foo}");
+//assertEcho(result, "17-Hello #{'foo}");
+assertEcho(result, "18-Hello ${'foo.bar}");
+assertEcho(result, "19-Hello ${'foo.bar}");
+assertEcho(result, "20-Hello #{'foo.bar}");
+assertEcho(result, "21-Hello #{'foo.bar}");
+assertEcho(result, "30-Hello ${'foo}");
+assertEcho(result, "31-Hello ${'foo}");
+assertEcho(result, "32-Hello #{'foo}");
+assertEcho(result, "33-Hello #{'foo}");
+assertEcho(result, "34-Hello ${'foo}");
+//assertEcho(result, "35-Hello ${'foo}");
+assertEcho(result, "36-Hello #{'foo}");
+//assertEcho(result, "37-Hello #{'foo}");
+assertEcho(result, "40-Hello ${'foo}");
+//assertEcho(result, "41-Hello ${'foo}");
+//assertEcho(result, "42-Hello #{'foo}");
+//assertEcho(result, "43-Hello #{'foo}");
+assertEcho(result, "50-Hello ${'foo}");
+//assertEcho(result, "51-Hello ${'foo}");
+//assertEcho(result, "52-Hello #{'foo}");
+//assertEcho(result, "53-Hello #{'foo}");
}
public void testBug48668b() throws Exception {
Added: tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx?rev=919847&view=auto
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx (added)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx Sat Mar 6 20:46:06 2010
@@ -0,0 +1,26 @@
+
+
+http://java.sun.com/JSP/Page"; version="2.0">
+
+
+
+
+${expr}${noexpr}
+
+
+
Propchange: tomcat/trunk/test/webapp/WEB-INF/tags/bug48668.tagx
--
svn:eol-style = native
Modified: tomcat/trunk/test/webapp/bug48668a.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48668a.jsp?rev=919847&r1=919846&r2=919847&view=diff
==
--- tomcat/trunk/test/webapp/bug48668a.jsp (original)
+++ tomcat/trunk/test/webapp/bug48668a.jsp Sat Mar 6 20:46:06 2010
@@ -21,6 +21,40 @@
#{foo.bar}
${foo.bar}
+
+10-
+11-Hello
+<%--12---%>
+<%--13-Hello --%>
+
+14-}
+15-Hello }
+<%--16-}--%>
+<%--17-Hello }--%>
+
+18-Hello
${'foo.bar}
+19-Hello ${'foo.bar}
+20-Hello
#{'foo.bar}
+21-Hello #{'foo.bar}
+
+30-
+31-Hello
+32-
+33-Hello
+34-Hello
${'foo}
+<%--35-Hello ${'foo}--%>
+36-Hello
#{'foo}
+<%--37-Hello #{'foo}--%>
+
+40-Hello
${'foo}
+41-Hello ${'foo}
+42-Hello
#{'foo}
+<%--43-Hello #{'foo}--%>
+
+50-Hello ${'foo}
+51-Hello ${'foo}
+52-Hello #{'foo}
+<%--53-Hello #{'foo}--%>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919828 - /tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag
Author: kkolinko
Date: Sat Mar 6 19:36:53 2010
New Revision: 919828
URL: http://svn.apache.org/viewvc?rev=919828&view=rev
Log:
remove extra newline character
Modified:
tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag
Modified: tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag?rev=919828&r1=919827&r2=919828&view=diff
==
--- tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag (original)
+++ tomcat/trunk/test/webapp/WEB-INF/tags/echo.tag Sat Mar 6 19:36:53 2010
@@ -13,7 +13,6 @@
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.
---%>
-<%@ tag %><%@
+--%><%@ tag %><%@
attribute name="echo" type="java.lang.String"%><%@
tag body-content="empty" %>${echo}
\ 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: r919820 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Mar 6 19:14:37 2010 New Revision: 919820 URL: http://svn.apache.org/viewvc?rev=919820&view=rev Log: uppercase Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=919820&r1=919819&r2=919820&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Mar 6 19:14:37 2010 @@ -109,7 +109,7 @@ Encode all property files using ascii escaped UTF-8. Also fixes -deployment problem when using french locale. (jfclere/rjung) +deployment problem when using French locale. (jfclere/rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919805 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: rjung Date: Sat Mar 6 17:52:04 2010 New Revision: 919805 URL: http://svn.apache.org/viewvc?rev=919805&view=rev Log: Update changelog. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=919805&r1=919804&r2=919805&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Mar 6 17:52:04 2010 @@ -105,6 +105,14 @@ + + + +Encode all property files using ascii escaped UTF-8. Also fixes +deployment problem when using french locale. (jfclere/rjung) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48345] Session does time-out shorter than setting in web.xml when PersistentManager is used.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48345 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Konstantin Kolinko 2010-03-06 17:49:24 UTC --- The fix for this issue was applied to 6.0 and is in 6.0.23 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48006] Implement the header X-Powered-By suggested by the servlet specification
https://issues.apache.org/bugzilla/show_bug.cgi?id=48006 Konstantin Kolinko changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #4 from Konstantin Kolinko 2010-03-06 17:35:29 UTC --- Implemented in 6.0 in r896389, is in 6.0.24 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919803 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/LocalStrings_fr.properties webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
Author: rjung
Date: Sat Mar 6 17:22:55 2010
New Revision: 919803
URL: http://svn.apache.org/viewvc?rev=919803&view=rev
Log:
Replace ISO-8859 characters in message strings with
ascii escaped encoding.
Some of those prevent deployment of applications when
using french language.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919803&r1=919802&r2=919803&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 17:22:55 2010
@@ -98,11 +98,3 @@
http://svn.apache.org/viewvc?rev=918803&view=rev
+1: kkolinko, markt
-1:
-
-* Replace UTF-8 characters with the proper \u encoding in the French
translation.
- That prevents deployment of applications when using french language.
- http://people.apache.org/~rjung/patches/french_properties_utf.patch
- +1: jfclere, kkolinko, rjung, markt
- -1:
- rjung: I replaced the inline patch by the above link, because the inline
patch
- wasn't correctly formatted
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=919803&r1=919802&r2=919803&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Sat Mar 6 17:22:55 2010
@@ -67,13 +67,13 @@
standardSession.setAttribute.namenull="setAttribute": le nom de param\u00e8tre
ne peut \u00eatre nul
persistentManager.unloading=Sauvegarde de {0} sessions persistantes
persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde
-persistentManager.deserializeError=Erreur lors de la désérialisation de la
session {0}: {1}
-persistentManager.serializeError=Erreur lors de la sérialisation de la session
{0}: {1}
+persistentManager.deserializeError=Erreur lors de la d\u00e9s\u00e9rialisation
de la session {0}: {1}
+persistentManager.serializeError=Erreur lors de la s\u00e9rialisation de la
session {0}: {1}
persistentManager.swapMaxIdle=Basculement de la session {0} vers le stockage
(Store), en attente pour {1} secondes
persistentManager.backupMaxIdle=Sauvegarde de la session {0} vers le stockage
(Store), en attente pour {1} secondes
persistentManager.backupException=Exception lors de la sauvegarde de la
session {0}: {1}
-persistentManager.tooManyActive=Trop de sessions actives, {0}, à la recherche
de sessions en attente pour basculement vers stockage (swap out)
+persistentManager.tooManyActive=Trop de sessions actives, {0}, \u00e0 la
recherche de sessions en attente pour basculement vers stockage (swap out)
persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de la
session {0}, en attente pour {1} secondes trop de sessions actives
-persistentManager.processSwaps=Recherche de sessions à basculer vers stockage
(swap out), {0} sessions actives en mémoire
-persistentManager.activeSession=La session {0} a été en attente durant {1}
secondes
+persistentManager.processSwaps=Recherche de sessions \u00e0 basculer vers
stockage (swap out), {0} sessions actives en m\u00e9moire
+persistentManager.activeSession=La session {0} a \u00e9t\u00e9 en attente
durant {1} secondes
persistentManager.swapIn=Basculement depuis le stockage (swap in) de la
session {0}
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties?rev=919803&r1=919802&r2=919803&view=diff
==
---
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
Sat Mar 6 17:22:55 2010
@@ -20,34 +20,34 @@
helloworld.title=Salut le Monde!
-requestinfo.title=Exemple d''information sur la requête
-requestinfo.label.method=Méthode:
-requestinfo.label.requesturi=URI de requête:
+requestinfo.title=Exemple d''information sur la requ\u00eate
+requestinfo.label.method=M\u00e9thode:
+requestinfo.label.requesturi=URI de requ\u00eate:
requestinfo.label.protocol=Protocole:
requestinfo.label.pathinfo=Info de chemin:
requestinfo.label.remoteaddr=Adresse distante:
-requestheader.title=Exemple d''information sur les entête de requête
+requestheader.title=Exemple d''information sur les ent\u00eate de requ\u00eate
-requestpa
svn commit: r919802 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/examples/WEB-INF/classes/LocalStrings_es.properties
Author: rjung Date: Sat Mar 6 17:14:28 2010 New Revision: 919802 URL: http://svn.apache.org/viewvc?rev=919802&view=rev Log: Replace ISO-8859 encoded character in spanish message string by ascii encoded UTF-8. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919802&r1=919801&r2=919802&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 17:14:28 2010 @@ -106,9 +106,3 @@ -1: rjung: I replaced the inline patch by the above link, because the inline patch wasn't correctly formatted - -* Replace more UTF-8 characters with the proper \u encoding LocalStrings properties. - I checked all files with a script. There was only one occurence remaining. - http://svn.apache.org/viewvc?rev=919737&view=rev - +1: rjung, kkolinko, markt - -1: Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties?rev=919802&r1=919801&r2=919802&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties Sat Mar 6 17:14:28 2010 @@ -48,6 +48,6 @@ sessions.created=Creado: sessions.lastaccessed=Ultimo Acceso: sessions.data=Lo siguientes datos estan en tu sesion: -sessions.adddata=Añade datos a tu sesion: +sessions.adddata=A\u00f1ade datos a tu sesion: sessions.dataname=Nombre del atributo de sesion: sessions.datavalue=Valor del atributo de sesion: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919801 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/LocalStrings_es.properties java/org/apache/jasper/resources/LocalStrings_fr.properties
Author: rjung
Date: Sat Mar 6 17:12:52 2010
New Revision: 919801
URL: http://svn.apache.org/viewvc?rev=919801&view=rev
Log:
Restore two lost native chars and replace by
correct utf-8 encoding.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919801&r1=919800&r2=919801&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 17:12:52 2010
@@ -112,8 +112,3 @@
http://svn.apache.org/viewvc?rev=919737&view=rev
+1: rjung, kkolinko, markt
-1:
-
-* Restore lost native chars and replace by correct utf-8 encoding.
- http://svn.apache.org/viewvc?rev=919748&view=rev
- +1: rjung, kkolinko, markt
- -1:
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=919801&r1=919800&r2=919801&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 Mar 6 17:12:52 2010
@@ -110,7 +110,7 @@
standardContext.startingLoader = Excepci\u00F3n arrancando Cargador
standardContext.startingManager = Excepci\u00F3n arrancando Gestor
standardContext.startingWrapper = Excepci\u00F3n arrancando Arropador
(Wrapper) para servlet {0}
-standardContext.stoppingContext = Excepci?n parando Context
+standardContext.stoppingContext = Excepci\u00F3n parando Context
standardContext.stoppingLoader = Excepci\u00F3n parando Cargador
standardContext.stoppingManager = Excepci\u00F3n parando Gestor
standardContext.stoppingWrapper = Excepci\u00F3n parando Arropador (Wrapper)
para servlet {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=919801&r1=919800&r2=919801&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Sat Mar 6 17:12:52 2010
@@ -130,7 +130,7 @@
jsp.error.badGetReader=Impossible de cr\u00e9er un lecteur (reader) quand le
flux n''utilse pas des tampons (not buffered)
jsp.warning.unknown.element.in.TLD=Attention: El\u00e9ment inconnu {0} dans le
TLD
jsp.warning.unknown.element.in.tag=Attention: El\u00e9ment inconnu {0} dans le
tag
-jsp.warning.unknown.element.in.tagfile=Attention: El?ment inconnu {0} dans le
tag-file
+jsp.warning.unknown.element.in.tagfile=Attention: El\u00e9ment inconnu {0}
dans le tag-file
jsp.warning.unknown.element.in.attribute=Attention: El\u00e9ment inconnu {0}
dans l''attribute
jsp.error.more.than.one.taglib=plus d''un taglib dans le TLD: {0}
jsp.error.teiclass.instantiation=Impossible de charger ou d''instancier la
classe TagExtraInfo: {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919799 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Mar 6 16:45:28 2010 New Revision: 919799 URL: http://svn.apache.org/viewvc?rev=919799&view=rev Log: Move r919795 changelog entry to the end of the list. Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml 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=919799&r1=919798&r2=919799&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Mar 6 16:45:28 2010 @@ -36,9 +36,6 @@ - -Encode all property files using ascii escaped UTF-8. (rjung) - 37847: Make location and filename of catalina.out configurable in catalina.sh. (fhanik/kkolinko) @@ -79,6 +76,9 @@ Align server.xml installed by the Windows installer with the one bundled in zip/tar.gz archives. (kkolinko) + +Encode all property files using ascii escaped UTF-8. (rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919795 [5/5] - in /tomcat/tc5.5.x/trunk: ./ connectors/coyote/src/java/org/apache/coyote/tomcat4/ connectors/http11/src/java/org/apache/coyote/http11/ connectors/jk/java/org/apache/ajp/to
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/resources/LocalStrings_fr.properties?rev=919795&r1=919794&r2=919795&view=diff
==
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
Sat Mar 6 16:32:04 2010
@@ -19,36 +19,36 @@
# Localized this the Default Locale as is fr_FR
jsp.error.bad.servlet.engine=Version de moteur de servlet incorrecte!
-jsp.error.no.scratch.dir=Le moteur de JSP engine n''est pas configuré avec un
répertoire de travail.\
+jsp.error.no.scratch.dir=Le moteur de JSP engine n''est pas configur\u00e9
avec un r\u00e9pertoire de travail.\
\n Merci d''ajouter \"jsp.initparams=scratchdir=\" \
\n dans le fichier "servlets.properties" de ce contexte.
-jsp.error.bad.scratch.dir=Le paramêtre "scratchDir" que vous avez spécifié:
{0} est inutilisable.
-jsp.message.scratch.dir.is=Le répertoire de travail (scratch dir) pour le
moteur de JSP est: {0}
+jsp.error.bad.scratch.dir=Le param\u00eatre "scratchDir" que vous avez
sp\u00e9cifi\u00e9: {0} est inutilisable.
+jsp.message.scratch.dir.is=Le r\u00e9pertoire de travail (scratch dir) pour le
moteur de JSP est: {0}
jsp.message.parent_class_loader_is=Le chargeur de classe parent (class loader)
est: {0}
-jsp.message.dont.modify.servlets=IMPORTANT: Ne pas modifier les servlets
générées
-jsp.error.not.impl.comments=Erreur interne: Commentaires non implémentés
-jsp.error.not.impl.directives=Erreur interne: Directives non implémentées
-jsp.error.not.impl.declarations=Erreur interne: Declarations non implémentées
-jsp.error.not.impl.expressions=Erreur interne: Expressions non implémentées
-jsp.error.not.impl.scriptlets=Erreur interne: Scriptlets non implémentés
-jsp.error.not.impl.usebean=Erreur interne: useBean non implémenté
-jsp.error.not.impl.getp=Erreur interne: getProperty non implémenté
-jsp.error.not.impl.setp=Erreur interne: setProperty non implémenté
-jsp.error.not.impl.plugin=Erreur interne: plugin non implémenté
-jsp.error.not.impl.forward=Erreur interne: forward non implémenté
-jsp.error.not.impl.include=Erreur interne: include non implémenté
-jsp.error.unavailable=La JSP a été marquée comme non disponible
-jsp.error.usebean.missing.attribute=useBean: l''identificateur d''attribut (id
attribute) est manquant ou mal orthographié
-jsp.error.usebean.missing.type=useBean ({0}): La classe ou le type d''attribut
doit être\
-spécifié:
-jsp.error.usebean.duplicate=useBean: Nom de bean dupliqué: {0}
+jsp.message.dont.modify.servlets=IMPORTANT: Ne pas modifier les servlets
g\u00e9n\u00e9r\u00e9es
+jsp.error.not.impl.comments=Erreur interne: Commentaires non
impl\u00e9ment\u00e9s
+jsp.error.not.impl.directives=Erreur interne: Directives non
impl\u00e9ment\u00e9es
+jsp.error.not.impl.declarations=Erreur interne: Declarations non
impl\u00e9ment\u00e9es
+jsp.error.not.impl.expressions=Erreur interne: Expressions non
impl\u00e9ment\u00e9es
+jsp.error.not.impl.scriptlets=Erreur interne: Scriptlets non
impl\u00e9ment\u00e9s
+jsp.error.not.impl.usebean=Erreur interne: useBean non impl\u00e9ment\u00e9
+jsp.error.not.impl.getp=Erreur interne: getProperty non impl\u00e9ment\u00e9
+jsp.error.not.impl.setp=Erreur interne: setProperty non impl\u00e9ment\u00e9
+jsp.error.not.impl.plugin=Erreur interne: plugin non impl\u00e9ment\u00e9
+jsp.error.not.impl.forward=Erreur interne: forward non impl\u00e9ment\u00e9
+jsp.error.not.impl.include=Erreur interne: include non impl\u00e9ment\u00e9
+jsp.error.unavailable=La JSP a \u00e9t\u00e9 marqu\u00e9e comme non disponible
+jsp.error.usebean.missing.attribute=useBean: l''identificateur d''attribut (id
attribute) est manquant ou mal orthographi\u00e9
+jsp.error.usebean.missing.type=useBean ({0}): La classe ou le type d''attribut
doit \u00eatre\
+sp\u00e9cifi\u00e9:
+jsp.error.usebean.duplicate=useBean: Nom de bean dupliqu\u00e9: {0}
jsp.error.usebean.prohibited.as.session=Impossible d''utiliser comme bean de
session {0} car c''est interdit\
-par la directive jsp définie précédemment:
-jsp.error.usebean.not.both=useBean: Impossible de spécifier à la fois la
classe et l''attribut beanName:
+par la directive jsp d\u00e9finie pr\u00e9c\u00e9demment:
+jsp.error.usebean.not.both=useBean: Impossible de sp\u00e9cifier \u00e0 la
fois la classe et l''attribut beanName:
jsp.error.usebean.bad.type.cast=useBean ({0}): Le type ({1}) n''est pas
assignable depuis la classe ({2})
-jsp.error.classname=Impossible de déterminer le nom de classe d''après le
fichier .class
+jsp.error.classname=Impossible de d\u00e9terminer le nom de classe
d''apr\u00e8s le fichier .class
jsp.warning.bad.type=Attention: mauvais type dans le fichier .class
-jsp
svn commit: r919790 - /tomcat/trunk/build.xml
Author: markt Date: Sat Mar 6 15:52:40 2010 New Revision: 919790 URL: http://svn.apache.org/viewvc?rev=919790&view=rev Log: Shave a few seconds of the rebuild time if the manifests don't need to be updated Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=919790&r1=919789&r2=919790&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sat Mar 6 15:52:40 2010 @@ -362,6 +362,20 @@ + + + + + + + + + + + + + @@ -396,7 +410,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919789 - /tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml
Author: kkolinko Date: Sat Mar 6 15:40:47 2010 New Revision: 919789 URL: http://svn.apache.org/viewvc?rev=919789&view=rev Log: Remove Nio connector reference from TC5.5 ssl-howto.xml It is a followup to r904859 Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml?rev=919789&r1=919788&r2=919789&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/ssl-howto.xml Sat Mar 6 15:40:47 2010 @@ -302,10 +302,6 @@ <-- Define a blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 -->- -<-- Define a non-blocking Java SSL Coyote HTTP/1.1 Connector on port 8443 --> - Alternatively, to specify an APR connector (the APR library must be available) use: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919788 - /tomcat/trunk/res/confinstall/tomcat-users_2.xml
Author: kkolinko Date: Sat Mar 6 15:32:42 2010 New Revision: 919788 URL: http://svn.apache.org/viewvc?rev=919788&view=rev Log: Add comment to the tomcat-users.xml template used by the Tomcat exe installer on Windows. Modified: tomcat/trunk/res/confinstall/tomcat-users_2.xml Modified: tomcat/trunk/res/confinstall/tomcat-users_2.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/tomcat-users_2.xml?rev=919788&r1=919787&r2=919788&view=diff == --- tomcat/trunk/res/confinstall/tomcat-users_2.xml (original) +++ tomcat/trunk/res/confinstall/tomcat-users_2.xml Sat Mar 6 15:32:42 2010 @@ -1,4 +1,9 @@ +
svn commit: r919787 - /tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml
Author: kkolinko Date: Sat Mar 6 15:31:37 2010 New Revision: 919787 URL: http://svn.apache.org/viewvc?rev=919787&view=rev Log: Add comment to the tomcat-users.xml template used by the Tomcat exe installer on Windows. C-T-R Modified: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml Modified: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml?rev=919787&r1=919786&r2=919787&view=diff == --- tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml (original) +++ tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml Sat Mar 6 15:31:37 2010 @@ -1,4 +1,9 @@ +
svn commit: r919786 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Sat Mar 6 15:27:44 2010 New Revision: 919786 URL: http://svn.apache.org/viewvc?rev=919786&view=rev Log: Vote 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=919786&r1=919785&r2=919786&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 15:27:44 2010 @@ -103,5 +103,5 @@ svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java 2) http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory_v2.patch - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919772 - /tomcat/tc5.5.x/trunk/STATUS.txt
2010/3/6 Mark Thomas :
> On 06/03/2010 14:48, kkoli...@apache.org wrote:
>> Author: kkolinko
>> Date: Sat Mar 6 14:48:02 2010
>> New Revision: 919772
>>
>> URL: http://svn.apache.org/viewvc?rev=919772&view=rev
>> Log:
>> proposal
>>
>> 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=919772&r1=919771&r2=919772&view=diff
>> ==
>> --- tomcat/tc5.5.x/trunk/STATUS.txt (original)
>> +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:48:02 2010
>> @@ -90,3 +90,18 @@
>> (it is markt's r915070)
>> +1: kkolinko
>> -1:
>> +
>> +* Remove JSSE13Factory, JSSE13SocketFactory classes,
>> + because
>> + - TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
>> + so these classes are no more needed.
>> + - JSSE13SocketFactory directly references com.sun.net.* classes in its
>> + source code without using reflection, and that causes compilation
>> failure
>> + with my IDE/JRE settings.
>> + 1)
>> + svn delete
>> connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java
>> + svn delete
>> connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
>> + 2)
>> +
>> http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory.patch
>> + +1: kkolinko
>> + -1:
>
> Unless I am missing something, you can also remove the whole of the
> if(factory == null && JdkCompat.isJava14()){...} block in
> JSSEImplementation as well.
>
Yes, you are right, we can remove that.
I updated the patch.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919784 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Mar 6 15:25:46 2010 New Revision: 919784 URL: http://svn.apache.org/viewvc?rev=919784&view=rev Log: Updated the patch 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=919784&r1=919783&r2=919784&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 15:25:46 2010 @@ -102,6 +102,6 @@ svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java 2) - http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory.patch + http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory_v2.patch +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919783 - /tomcat/tc6.0.x/trunk/conf/tomcat-users.xml
Author: kkolinko Date: Sat Mar 6 15:16:47 2010 New Revision: 919783 URL: http://svn.apache.org/viewvc?rev=919783&view=rev Log: Add comments to the tomcat-users.xml file. C-T-R Modified: tomcat/tc6.0.x/trunk/conf/tomcat-users.xml Modified: tomcat/tc6.0.x/trunk/conf/tomcat-users.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/tomcat-users.xml?rev=919783&r1=919782&r2=919783&view=diff == --- tomcat/tc6.0.x/trunk/conf/tomcat-users.xml (original) +++ tomcat/tc6.0.x/trunk/conf/tomcat-users.xml Sat Mar 6 15:16:47 2010 @@ -17,6 +17,16 @@ --> + +
svn commit: r919782 - /tomcat/trunk/conf/tomcat-users.xml
Author: kkolinko Date: Sat Mar 6 15:14:37 2010 New Revision: 919782 URL: http://svn.apache.org/viewvc?rev=919782&view=rev Log: Add comment about the "manager" role (copied from TC 5.5) Modified: tomcat/trunk/conf/tomcat-users.xml Modified: tomcat/trunk/conf/tomcat-users.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xml?rev=919782&r1=919781&r2=919782&view=diff == --- tomcat/trunk/conf/tomcat-users.xml (original) +++ tomcat/trunk/conf/tomcat-users.xml Sat Mar 6 15:14:37 2010 @@ -17,11 +17,15 @@ --> + +-->
svn commit: r919781 - /tomcat/trunk/conf/tomcat-users.xml
Author: kkolinko Date: Sat Mar 6 15:08:58 2010 New Revision: 919781 URL: http://svn.apache.org/viewvc?rev=919781&view=rev Log: Add a comment about comment to tomcat-users.xml Modified: tomcat/trunk/conf/tomcat-users.xml Modified: tomcat/trunk/conf/tomcat-users.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xml?rev=919781&r1=919780&r2=919781&view=diff == --- tomcat/trunk/conf/tomcat-users.xml (original) +++ tomcat/trunk/conf/tomcat-users.xml Sat Mar 6 15:08:58 2010 @@ -17,6 +17,12 @@ --> +
svn commit: r919778 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Sat Mar 6 14:59:02 2010 New Revision: 919778 URL: http://svn.apache.org/viewvc?rev=919778&view=rev Log: Vote 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=919778&r1=919777&r2=919778&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:59:02 2010 @@ -82,13 +82,13 @@ Also fixes 3 lines were native chars had previously been lost and replaced by '?'. http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties-v2.patch - +1: rjung, kkolinko + +1: rjung, kkolinko, markt * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580 Prevent AccessControlException if first access is to a JSP that uses a FunctionMapper https://issues.apache.org/bugzilla/attachment.cgi?id=25094 (it is markt's r915070) - +1: kkolinko + +1: kkolinko, markt -1: * Remove JSSE13Factory, JSSE13SocketFactory classes, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919772 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 06/03/2010 14:48, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Sat Mar 6 14:48:02 2010
> New Revision: 919772
>
> URL: http://svn.apache.org/viewvc?rev=919772&view=rev
> Log:
> proposal
>
> 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=919772&r1=919771&r2=919772&view=diff
> ==
> --- tomcat/tc5.5.x/trunk/STATUS.txt (original)
> +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:48:02 2010
> @@ -90,3 +90,18 @@
>(it is markt's r915070)
>+1: kkolinko
>-1:
> +
> +* Remove JSSE13Factory, JSSE13SocketFactory classes,
> + because
> +- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
> + so these classes are no more needed.
> +- JSSE13SocketFactory directly references com.sun.net.* classes in its
> + source code without using reflection, and that causes compilation
> failure
> + with my IDE/JRE settings.
> + 1)
> +svn delete
> connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java
> +svn delete
> connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
> + 2)
> +
> http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory.patch
> + +1: kkolinko
> + -1:
Unless I am missing something, you can also remove the whole of the
if(factory == null && JdkCompat.isJava14()){...} block in
JSSEImplementation as well.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919774 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Mar 6 14:51:14 2010 New Revision: 919774 URL: http://svn.apache.org/viewvc?rev=919774&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919774&r1=919773&r2=919774&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 14:51:14 2010 @@ -102,7 +102,7 @@ * Replace UTF-8 characters with the proper \u encoding in the French translation. That prevents deployment of applications when using french language. http://people.apache.org/~rjung/patches/french_properties_utf.patch - +1: jfclere, kkolinko, rjung + +1: jfclere, kkolinko, rjung, markt -1: rjung: I replaced the inline patch by the above link, because the inline patch wasn't correctly formatted @@ -110,10 +110,10 @@ * Replace more UTF-8 characters with the proper \u encoding LocalStrings properties. I checked all files with a script. There was only one occurence remaining. http://svn.apache.org/viewvc?rev=919737&view=rev - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: * Restore lost native chars and replace by correct utf-8 encoding. http://svn.apache.org/viewvc?rev=919748&view=rev - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919772 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Mar 6 14:48:02 2010 New Revision: 919772 URL: http://svn.apache.org/viewvc?rev=919772&view=rev Log: proposal 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=919772&r1=919771&r2=919772&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:48:02 2010 @@ -90,3 +90,18 @@ (it is markt's r915070) +1: kkolinko -1: + +* Remove JSSE13Factory, JSSE13SocketFactory classes, + because +- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4, + so these classes are no more needed. +- JSSE13SocketFactory directly references com.sun.net.* classes in its + source code without using reflection, and that causes compilation failure + with my IDE/JRE settings. + 1) +svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java +svn delete connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java + 2) + http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919769 - in /tomcat: tc6.0.x/trunk/webapps/examples/jsp/index.html trunk/webapps/examples/jsp/index.html
Author: kkolinko Date: Sat Mar 6 14:28:21 2010 New Revision: 919769 URL: http://svn.apache.org/viewvc?rev=919769&view=rev Log: trivial: correct a link on an image on the jsp-examples index page Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/index.html tomcat/trunk/webapps/examples/jsp/index.html Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/index.html?rev=919769&r1=919768&r2=919769&view=diff == --- tomcat/tc6.0.x/trunk/webapps/examples/jsp/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/index.html Sat Mar 6 14:28:21 2010 @@ -274,7 +274,7 @@ Include -Execute +Execute Source Modified: tomcat/trunk/webapps/examples/jsp/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/index.html?rev=919769&r1=919768&r2=919769&view=diff == --- tomcat/trunk/webapps/examples/jsp/index.html (original) +++ tomcat/trunk/webapps/examples/jsp/index.html Sat Mar 6 14:28:21 2010 @@ -282,7 +282,7 @@ Include -Execute +Execute Source - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919768 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Mar 6 14:20:45 2010 New Revision: 919768 URL: http://svn.apache.org/viewvc?rev=919768&view=rev Log: proposal 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=919768&r1=919767&r2=919768&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:20:45 2010 @@ -83,3 +83,10 @@ replaced by '?'. http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties-v2.patch +1: rjung, kkolinko + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580 + Prevent AccessControlException if first access is to a JSP that uses a FunctionMapper + https://issues.apache.org/bugzilla/attachment.cgi?id=25094 + (it is markt's r915070) + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48580] 6.0.24: AccessControlException in ProtectedFunctionMapper on first access to certain JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=48580 --- Comment #8 from Konstantin Kolinko 2010-03-06 14:18:14 UTC --- Created an attachment (id=25094) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25094) 2010-03-06_tc55_bug48580.patch -- backport of r915070 TC 5.5 patch for the issue. It is a backport of r915070. -- 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: r919767 - /tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html
Author: kkolinko Date: Sat Mar 6 14:14:44 2010 New Revision: 919767 URL: http://svn.apache.org/viewvc?rev=919767&view=rev Log: trivial: correct a link on an image on the jsp-examples index page Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html Modified: tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html?rev=919767&r1=919766&r2=919767&view=diff == --- tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html (original) +++ tomcat/tc5.5.x/trunk/servletapi/jsr152/examples/index.html Sat Mar 6 14:14:44 2010 @@ -278,7 +278,7 @@ Include -Execute +Execute Source - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919766 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Mar 6 14:03:14 2010 New Revision: 919766 URL: http://svn.apache.org/viewvc?rev=919766&view=rev Log: vote 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=919766&r1=919765&r2=919766&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 14:03:14 2010 @@ -82,4 +82,4 @@ Also fixes 3 lines were native chars had previously been lost and replaced by '?'. http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties-v2.patch - +1: rjung + +1: rjung, kkolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919747 - /tomcat/tc5.5.x/trunk/STATUS.txt
On 06.03.2010 13:09, Konstantin Kolinko wrote: 2010/3/6: Author: rjung Date: Sat Mar 6 11:44:50 2010 New Revision: 919747 URL: http://svn.apache.org/viewvc?rev=919747&view=rev Log: Add proposal. + +* Remove ISO-8859 encoding from all properties files using native2ascii. + Also fixes 3 lines were native chars had previously been lost and + replaced by '?'. + http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties.patch + +1: rjung I wonder what happened with connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties There were no changes at all, as it is all English, but the patch replaces all lines of it. Just checked the file - and it does not have svn:eol-style property set. I think that you can fix the property and remove that file from the patch. Ahh, OK, sorry for the additional noise. Fixed eol-style svn prop, removed the file from the patch (indeed no other changes in it) and updated proposal. Have a nice weekend! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919762 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Sat Mar 6 13:24:46 2010 New Revision: 919762 URL: http://svn.apache.org/viewvc?rev=919762&view=rev Log: Update patch proposal. Thanks to Konstantin for observing one property file with missing eol-style svn property. 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=919762&r1=919761&r2=919762&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 13:24:46 2010 @@ -81,5 +81,5 @@ * Remove ISO-8859 encoding from all properties files using native2ascii. Also fixes 3 lines were native chars had previously been lost and replaced by '?'. - http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties.patch + http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties-v2.patch +1: rjung - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919759 - /tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
Author: rjung Date: Sat Mar 6 13:18:42 2010 New Revision: 919759 URL: http://svn.apache.org/viewvc?rev=919759&view=rev Log: Set missing svn properties. No functional change. Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties (contents, props changed) Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties?rev=919759&r1=919758&r2=919759&view=diff == --- tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties (original) +++ tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties Sat Mar 6 13:18:42 2010 @@ -1,63 +1,63 @@ -# 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. - -# HttpMessages. The values in this file will be used in HTTP headers and as such -# may only contain TEXT as defined by RFC 2616. Since Japanese language messages -# do not meet this requirement, English text is used. -sc.100=Continue -sc.101=Switching Protocols -sc.200=OK -sc.201=Created -sc.202=Accepted -sc.203=Non-Authoritative Information -sc.204=No Content -sc.205=Reset Content -sc.206=Partial Content -sc.207=Multi-Status -sc.300=Multiple Choices -sc.301=Moved Permanently -sc.302=Moved Temporarily -sc.303=See Other -sc.304=Not Modified -sc.305=Use Proxy -sc.307=Temporary Redirect -sc.400=Bad Request -sc.401=Unauthorized -sc.402=Payment Required -sc.403=Forbidden -sc.404=Not Found -sc.405=Method Not Allowed -sc.406=Not Acceptable -sc.407=Proxy Authentication Required -sc.408=Request Timeout -sc.409=Conflict -sc.410=Gone -sc.411=Length Required -sc.412=Precondition Failed -sc.413=Request Entity Too Large -sc.414=Request-URI Too Long -sc.415=Unsupported Media Type -sc.416=Requested Range Not Satisfiable -sc.417=Expectation Failed -sc.422=Unprocessable Entity -sc.423=Locked -sc.424=Failed Dependency -sc.500=Internal Server Error -sc.501=Not Implemented -sc.502=Bad Gateway -sc.503=Service Unavailable -sc.504=Gateway Timeout -sc.505=HTTP Version Not Supported -sc.507=Insufficient Storage +# 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. + +# HttpMessages. The values in this file will be used in HTTP headers and as such +# may only contain TEXT as defined by RFC 2616. Since Japanese language messages +# do not meet this requirement, English text is used. +sc.100=Continue +sc.101=Switching Protocols +sc.200=OK +sc.201=Created +sc.202=Accepted +sc.203=Non-Authoritative Information +sc.204=No Content +sc.205=Reset Content +sc.206=Partial Content +sc.207=Multi-Status +sc.300=Multiple Choices +sc.301=Moved Permanently +sc.302=Moved Temporarily +sc.303=See Other +sc.304=Not Modified +sc.305=Use Proxy +sc.307=Temporary Redirect +sc.400=Bad Request +sc.401=Unauthorized +sc.402=Payment Required +sc.403=Forbidden +sc.404=Not Found +sc.405=Method Not Allowed +sc.406=Not Acceptable +sc.407=Proxy Authentication Required +sc.408=Request Timeout +sc.409=Conflict +sc.410=Gone +sc.411=Length Required +sc.412=Precondition Failed +sc.413=Request Entity Too Large +sc.414=Request-URI Too Long +sc.415=Unsupported Media Type +sc.416=Requested Range Not Satisfiable +sc.417=Expectation Failed +sc.422=Unprocessable Entity +sc.423=Locked +sc.424=Failed Dependency +sc.500=Intern
svn commit: r919756 - in /tomcat/trunk/java/org/apache/catalina: ha/session/ session/
Author: markt
Date: Sat Mar 6 13:03:11 2010
New Revision: 919756
URL: http://svn.apache.org/viewvc?rev=919756&view=rev
Log:
Lifecycle refactoring - Manager
Lifecycle.START event fired too early in a number of cases
Added toString() for use in Lifecycle error messages
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=919756&r1=919755&r2=919756&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Sat Mar
6 13:03:11 2010
@@ -30,6 +30,7 @@
import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.catalina.tribes.tipis.LazyReplicatedMap;
import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -129,7 +130,7 @@
}
public ClusterMessage requestCompleted(String sessionId) {
-if ( !this.started ) return null;
+if (!getState().isAvailable()) return null;
LazyReplicatedMap map = (LazyReplicatedMap)sessions;
map.replicate(sessionId,false);
return null;
@@ -182,21 +183,22 @@
public String getName() {
return this.name;
}
+
+
/**
- * Prepare for the beginning of active use of the public methods of this
- * component. This method should be called after configure(),
- * and before any of the public methods of the component are utilized.
- * Starts the cluster communication channel, this will connect with the
other nodes
- * in the cluster, and request the current session state to be transferred
to this node.
- * @exception IllegalStateException if this component has already been
- * started
+ * Start this component and implement the requirements
+ * of {...@link LifecycleBase#startInternal()}.
+ *
+ * Starts the cluster communication channel, this will connect with the
+ * other nodes in the cluster, and request the current session state to be
+ * transferred to this node.
+ *
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
@Override
-public void start() throws LifecycleException {
-if ( this.started ) return;
-
+protected synchronized void startInternal() throws LifecycleException {
+
try {
cluster.registerManager(this);
CatalinaCluster catclust = cluster;
@@ -207,12 +209,12 @@
getClassLoaders());
map.setChannelSendOptions(mapSendOptions);
this.sessions = map;
-super.start();
-this.started = true;
} catch ( Exception x ) {
log.error("Unable to start BackupManager",x);
throw new LifecycleException("Failed to start BackupManager",x);
}
+
+super.startInternal();
}
public String getMapName() {
@@ -222,33 +224,28 @@
return name;
}
+
/**
- * Gracefully terminate the active use of the public methods of this
- * component. This method should be the last one called on a given
- * instance of this component.
- * This will disconnect the cluster communication channel and stop the
listener thread.
- * @exception IllegalStateException if this component has not been started
+ * Stop this component and implement the requirements
+ * of {...@link LifecycleBase#stopInternal()}.
+ *
+ * This will disconnect the cluster communication channel and stop the
+ * listener thread.
+ *
* @exception LifecycleException if this component detects a fatal error
- * that needs to be reported
+ * that prevents th
svn commit: r919753 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Author: markt
Date: Sat Mar 6 12:42:36 2010
New Revision: 919753
URL: http://svn.apache.org/viewvc?rev=919753&view=rev
Log:
Line length
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=919753&r1=919752&r2=919753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Sat Mar 6
12:42:36 2010
@@ -131,8 +131,8 @@
state.equals(LifecycleState.MUST_STOP)) {
stop();
} else {
-// Shouldn't be necessary but acts as a check that sub-classes are
doing
-// what they are supposed to.
+// Shouldn't be necessary but acts as a check that sub-classes are
+// doing what they are supposed to.
if (!state.equals(LifecycleState.STARTING)) {
invalidTransition(Lifecycle.AFTER_START_EVENT);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919752 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Mar 6 12:12:07 2010 New Revision: 919752 URL: http://svn.apache.org/viewvc?rev=919752&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919752&r1=919751&r2=919752&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 12:12:07 2010 @@ -110,10 +110,10 @@ * Replace more UTF-8 characters with the proper \u encoding LocalStrings properties. I checked all files with a script. There was only one occurence remaining. http://svn.apache.org/viewvc?rev=919737&view=rev - +1: rjung + +1: rjung, kkolinko -1: * Restore lost native chars and replace by correct utf-8 encoding. http://svn.apache.org/viewvc?rev=919748&view=rev - +1: rjung + +1: rjung, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919747 - /tomcat/tc5.5.x/trunk/STATUS.txt
2010/3/6 : > Author: rjung > Date: Sat Mar 6 11:44:50 2010 > New Revision: 919747 > > URL: http://svn.apache.org/viewvc?rev=919747&view=rev > Log: > Add proposal. > > + > +* Remove ISO-8859 encoding from all properties files using native2ascii. > + Also fixes 3 lines were native chars had previously been lost and > + replaced by '?'. > + http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties.patch > + +1: rjung I wonder what happened with connectors/util/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties There were no changes at all, as it is all English, but the patch replaces all lines of it. Just checked the file - and it does not have svn:eol-style property set. I think that you can fix the property and remove that file from the patch. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48867] ISAPI Connector not connecting to Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=48867 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mladen Turk 2010-03-06 12:05:14 UTC --- Bugzilla is not support forum. Please use Tomcat Users list for such types of questions. -- 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: r919750 - in /tomcat/trunk/java/org/apache/catalina/session: JDBCStore.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties StoreBa
Author: markt
Date: Sat Mar 6 12:02:19 2010
New Revision: 919750
URL: http://svn.apache.org/viewvc?rev=919750&view=rev
Log:
Lifecycle refactoring - Store
Added toString() for use in Lifecycle error messages
Modified:
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=919750&r1=919749&r2=919750&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Sat Mar 6
12:02:19 2010
@@ -22,6 +22,8 @@
import org.apache.catalina.Loader;
import org.apache.catalina.Session;
import org.apache.catalina.util.CustomObjectInputStream;
+import org.apache.catalina.util.LifecycleBase;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
@@ -959,24 +961,32 @@
}
/**
- * Called once when this Store is first started.
+ * Start this component and implement the requirements
+ * of {...@link LifecycleBase#startInternal()}.
+ *
+ * @exception LifecycleException if this component detects a fatal error
+ * that prevents this component from being used
*/
@Override
-public void start() throws LifecycleException {
-super.start();
+protected synchronized void startInternal() throws LifecycleException {
// Open connection to the database
this.dbConnection = getConnection();
+
+super.startInternal();
}
/**
- * Gracefully terminate everything associated with our db.
- * Called once when this Store is stopping.
+ * Stop this component and implement the requirements
+ * of {...@link LifecycleBase#stopInternal()}.
*
+ * @exception LifecycleException if this component detects a fatal error
+ * that prevents this component from being used
*/
@Override
-public void stop() throws LifecycleException {
-super.stop();
+protected synchronized void stopInternal() throws LifecycleException {
+
+super.stopInternal();
// Close and release everything associated with our db.
if (dbConnection != null) {
Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=919750&r1=919749&r2=919750&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Sat
Mar 6 12:02:19 2010
@@ -15,14 +15,10 @@
applicationSession.session.ise=invalid session state
applicationSession.value.iae=null value
-fileStore.alreadyStarted=File Store has already been started
-fileStore.notStarted=File Store has not yet been started
fileStore.saving=Saving Session {0} to file {1}
fileStore.loading=Loading Session {0} from file {1}
fileStore.removing=Removing Session {0} at file {1}
-JDBCStore.alreadyStarted=JDBC Store has already been started
JDBCStore.close=Exception closing database connection {0}
-JDBCStore.notStarted=JDBC Store has not yet been started
JDBCStore.saving=Saving Session {0} to database {1}
JDBCStore.loading=Loading Session {0} from database {1}
JDBCStore.removing=Removing Session {0} at database {1}
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=919750&r1=919749&r2=919750&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
Sat Mar 6 12:02:19 2010
@@ -14,14 +14,10 @@
# limitations under the License.
applicationSession.session.ise = estado inv\u00E1lido de sesi\u00F3n
applicationSession.value.iae = valor nulo
-fileStore.alreadyStarted = Ya ha sido arrancado el Almac\u00E9n de Archivos
-fileStore.notStarted = A\u00FAn no se ha arrancado el Almac\u00E9n de Archivos
fileStore.saving = Salvando Sesi\u00F3n {0} en archivo {1}
fileStore.loading = Cargando Sesi\u00F3n {0} desde archivo {1}
fileStore.removing = Quitando Se
svn commit: r919749 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sat Mar 6 11:59:38 2010 New Revision: 919749 URL: http://svn.apache.org/viewvc?rev=919749&view=rev Log: Add proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919749&r1=919748&r2=919749&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 11:59:38 2010 @@ -112,3 +112,8 @@ http://svn.apache.org/viewvc?rev=919737&view=rev +1: rjung -1: + +* Restore lost native chars and replace by correct utf-8 encoding. + http://svn.apache.org/viewvc?rev=919748&view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919748 - in /tomcat/trunk/java/org/apache: catalina/core/LocalStrings_es.properties jasper/resources/LocalStrings_fr.properties
Author: rjung
Date: Sat Mar 6 11:49:56 2010
New Revision: 919748
URL: http://svn.apache.org/viewvc?rev=919748&view=rev
Log:
Fix two message strings where natively encoded chars
had been lost and replaced by '?'.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=919748&r1=919747&r2=919748&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Sat
Mar 6 11:49:56 2010
@@ -110,7 +110,7 @@
standardContext.startingLoader = Excepci\u00F3n arrancando Cargador
standardContext.startingManager = Excepci\u00F3n arrancando Gestor
standardContext.startingWrapper = Excepci\u00F3n arrancando Arropador
(Wrapper) para servlet {0}
-standardContext.stoppingContext = Excepci?n parando Context
+standardContext.stoppingContext = Excepci\u00F3n parando Context
standardContext.stoppingLoader = Excepci\u00F3n parando Cargador
standardContext.stoppingManager = Excepci\u00F3n parando Gestor
standardContext.stoppingWrapper = Excepci\u00F3n parando Arropador (Wrapper)
para servlet {0}
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=919748&r1=919747&r2=919748&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Sat Mar 6 11:49:56 2010
@@ -129,7 +129,7 @@
jsp.error.badtaglib=Impossible d''ouvrir le taglibrary {0} : {1}
jsp.error.badGetReader=Impossible de cr\u00e9er un lecteur (reader) quand le
flux n''utilse pas des tampons (not buffered)
jsp.warning.unknown.element.in.tag=Attention: El\u00e9ment inconnu {0} dans le
tag
-jsp.warning.unknown.element.in.tagfile=Attention: El?ment inconnu {0} dans le
tag-file
+jsp.warning.unknown.element.in.tagfile=Attention: El\u00e9ment inconnu {0}
dans le tag-file
jsp.warning.unknown.element.in.attribute=Attention: El\u00e9ment inconnu {0}
dans l''attribute
jsp.error.more.than.one.taglib=plus d''un taglib dans le TLD: {0}
jsp.error.teiclass.instantiation=Impossible de charger ou d''instancier la
classe TagExtraInfo: {0}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919747 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Sat Mar 6 11:44:50 2010 New Revision: 919747 URL: http://svn.apache.org/viewvc?rev=919747&view=rev Log: Add proposal. 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=919747&r1=919746&r2=919747&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Mar 6 11:44:50 2010 @@ -77,3 +77,9 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=24918 +1: kkolinko, markt -1: + +* Remove ISO-8859 encoding from all properties files using native2ascii. + Also fixes 3 lines were native chars had previously been lost and + replaced by '?'. + http://people.apache.org/~rjung/patches/tc5_5_x-utf-8-properties.patch + +1: rjung - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919746 - in /tomcat: tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml tc6.0.x/trunk/webapps/docs/config/systemprops.xml trunk/webapps/docs/config/systemprops.xml
Author: kkolinko Date: Sat Mar 6 11:41:30 2010 New Revision: 919746 URL: http://svn.apache.org/viewvc?rev=919746&view=rev Log: Correction Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml?rev=919746&r1=919745&r2=919746&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/systemprops.xml Sat Mar 6 11:41:30 2010 @@ -182,7 +182,7 @@ Provides a default value for the jvmRoute attribute of the - Engine element. It does not override the a value + Engine element. It does not override the value configured on the Engine element. Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml?rev=919746&r1=919745&r2=919746&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Sat Mar 6 11:41:30 2010 @@ -315,7 +315,7 @@ Provides a default value for the jvmRoute attribute of the - Engine element. It does not override the a value + Engine element. It does not override the value configured on the Engine element. @@ -375,7 +375,7 @@ not specified, the default value of true will be used. - + If true, the server will exit if an exception happens during the server initialization phase. The default is false. Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=919746&r1=919745&r2=919746&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Sat Mar 6 11:41:30 2010 @@ -409,7 +409,7 @@ Provides a default value for the jvmRoute attribute of the - Engine element. It does not override the a value + Engine element. It does not override the value configured on the Engine element. @@ -455,7 +455,7 @@ not specified, the default value of true will be used. - + If true, the server will exit if an exception happens during the server initialization phase. The default is false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48831] Properly closing JULI FileHandler
https://issues.apache.org/bugzilla/show_bug.cgi?id=48831 Konstantin Kolinko changed: What|Removed |Added Component|Catalina|Catalina Version|trunk |6.0.24 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #5 from Konstantin Kolinko 2010-03-06 11:21:26 UTC --- All issues listed in Comment 3 were fixed in 6.0.x in revision 919742. Will be in 6.0.26 onwards. Changing 'Product' from Tomcat 7 to Tomcat 6. -- 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: r919742 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/Catalina.java java/org/apache/juli/ClassLoaderLogManager.java java/org/apache/juli/FileHandler.java webap
Author: kkolinko Date: Sat Mar 6 11:15:07 2010 New Revision: 919742 URL: http://svn.apache.org/viewvc?rev=919742&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=48831 Improve logging shutdown behaviour. Use Catalina's shutdown hook to shutdown Tomcat and JULI. This enables them to be shutdown in the correct order. Do not shutdown global handlers several times. (BZ 48831) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Mar 6 11:15:07 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918684 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,7
svn commit: r919740 - /tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Author: markt
Date: Sat Mar 6 10:54:38 2010
New Revision: 919740
URL: http://svn.apache.org/viewvc?rev=919740&view=rev
Log:
Lifecycle refactoring - Cluster
Added toString() for use in Lifecycle error messages
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=919740&r1=919739&r2=919740&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Sat Mar
6 10:54:38 2010
@@ -29,10 +29,10 @@
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Manager;
import org.apache.catalina.Valve;
import org.apache.catalina.ha.CatalinaCluster;
@@ -47,7 +47,7 @@
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.catalina.util.LifecycleSupport;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -72,8 +72,8 @@
* @author Peter Rossbach
* @version $Revision$, $Date$
*/
-public class SimpleTcpCluster
-implements CatalinaCluster, Lifecycle, LifecycleListener, IDynamicProperty,
+public class SimpleTcpCluster extends LifecycleBase
+implements CatalinaCluster, LifecycleListener, IDynamicProperty,
MembershipListener, ChannelListener{
public static final Log log = LogFactory.getLog(SimpleTcpCluster.class);
@@ -138,16 +138,6 @@
protected Container container = null;
/**
- * The lifecycle event support for this component.
- */
-protected LifecycleSupport lifecycle = new LifecycleSupport(this);
-
-/**
- * Has this component been started?
- */
-protected boolean started = false;
-
-/**
* The property change support for this component.
*/
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -535,7 +525,7 @@
ClusterManager cmanager = (ClusterManager) manager ;
cmanager.setDistributable(true);
// Notify our interested LifecycleListeners
-lifecycle.fireLifecycleEvent(BEFORE_MANAGERREGISTER_EVENT, manager);
+fireLifecycleEvent(BEFORE_MANAGERREGISTER_EVENT, manager);
String clusterName = getManagerName(cmanager.getName(), manager);
cmanager.setName(clusterName);
cmanager.setCluster(this);
@@ -543,7 +533,7 @@
managers.put(clusterName, cmanager);
// Notify our interested LifecycleListeners
-lifecycle.fireLifecycleEvent(AFTER_MANAGERREGISTER_EVENT, manager);
+fireLifecycleEvent(AFTER_MANAGERREGISTER_EVENT, manager);
}
/**
@@ -555,11 +545,11 @@
if (manager != null && manager instanceof ClusterManager ) {
ClusterManager cmgr = (ClusterManager) manager;
// Notify our interested LifecycleListeners
-
lifecycle.fireLifecycleEvent(BEFORE_MANAGERUNREGISTER_EVENT,manager);
+fireLifecycleEvent(BEFORE_MANAGERUNREGISTER_EVENT,manager);
managers.remove(getManagerName(cmgr.getName(),manager));
cmgr.setCluster(null);
// Notify our interested LifecycleListeners
-lifecycle.fireLifecycleEvent(AFTER_MANAGERUNREGISTER_EVENT,
manager);
+fireLifecycleEvent(AFTER_MANAGERUNREGISTER_EVENT, manager);
}
}
@@ -609,35 +599,6 @@
if ( isHeartbeatBackgroundEnabled() && channel !=null )
channel.heartbeat();
}
-/**
- * Add a lifecycle event listener to this component.
- *
- * @param listener
- *The listener to add
- */
-public void addLifecycleListener(LifecycleListener listener) {
-lifecycle.addLifecycleListener(listener);
-}
-
-/**
- * Get the lifecycle listeners associated with this lifecycle. If this
- * Lifecycle has no listeners registered, a zero-length array is returned.
- */
-public LifecycleListener[] findLifecycleListeners() {
-
-return lifecycle.findLifecycleListeners();
-
-}
-
-/**
- * Remove a lifecycle event listener from this component.
- *
- * @param listener
- *The listener to remove
- */
-public void removeLifecycleListener(LifecycleListener listener) {
-lifecycle.removeLifecycleListener
Re: Message string encoding and TC 5.5.x
On 06/03/2010 10:39, Rainer Jung wrote: > I lost track w.r.t. UTF-8 conversion: is it still OK to use ISO-8859 > encoded message strings in the tc 5.5.x LocalStrings_XX.properties > files? We removed all of them in trunk and TC 6.0.x but there are lots > of them in TC 5.5.x. Any need to change? To be safe, all of the 5.5.x properties files should be run through native2ascii. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Message string encoding and TC 5.5.x
I lost track w.r.t. UTF-8 conversion: is it still OK to use ISO-8859 encoded message strings in the tc 5.5.x LocalStrings_XX.properties files? We removed all of them in trunk and TC 6.0.x but there are lots of them in TC 5.5.x. Any need to change? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919739 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sat Mar 6 10:37:19 2010 New Revision: 919739 URL: http://svn.apache.org/viewvc?rev=919739&view=rev Log: Replace external patch link by backport URL. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919739&r1=919738&r2=919739&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 10:37:19 2010 @@ -130,6 +130,6 @@ * Replace more UTF-8 characters with the proper \u encoding LocalStrings properties. I checked all files with a script. There was only one occurence remaining. - http://people.apache.org/~rjung/patches/spanish_properties_utf.patch + http://svn.apache.org/viewvc?rev=919737&view=rev +1: rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919737 - /tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
Author: rjung Date: Sat Mar 6 10:35:12 2010 New Revision: 919737 URL: http://svn.apache.org/viewvc?rev=919737&view=rev Log: Fix utf-8 encoding in message string properties. Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties?rev=919737&r1=919736&r2=919737&view=diff == --- tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties Sat Mar 6 10:35:12 2010 @@ -48,6 +48,6 @@ sessions.created=Creado: sessions.lastaccessed=Ultimo Acceso: sessions.data=Lo siguientes datos estan en tu sesion: -sessions.adddata=Añade datos a tu sesion: +sessions.adddata=A\u00f1ade datos a tu sesion: sessions.dataname=Nombre del atributo de sesion: sessions.datavalue=Valor del atributo de sesion: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919736 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung
Date: Sat Mar 6 10:31:21 2010
New Revision: 919736
URL: http://svn.apache.org/viewvc?rev=919736&view=rev
Log:
Vote and replace inline patch by link, because the inline patch
wasn't correctly formatted.
Add another property encoding patch.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919736&r1=919735&r2=919736&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 10:31:21 2010
@@ -122,83 +122,14 @@
* Replace UTF-8 characters with the proper \u encoding in the French
translation.
That prevents deployment of applications when using french language.
-+++
-Index: java/org/apache/catalina/session/LocalStrings_fr.properties
-===
java/org/apache/catalina/session/LocalStrings_fr.properties
(revision 919592)
-+++ java/org/apache/catalina/session/LocalStrings_fr.properties
(working copy)
-@@ -67,13 +67,13 @@
- standardSession.setAttribute.namenull="setAttribute": le nom de
param\u00e8tre ne peut \u00eatre nul
- persistentManager.unloading=Sauvegarde de {0} sessions persistantes
- persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde
--persistentManager.deserializeError=Erreur lors de la désérialisation de la
session {0}: {1}
--persistentManager.serializeError=Erreur lors de la sérialisation de la
session {0}: {1}
-+persistentManager.deserializeError=Erreur lors de la
d\u00e9s\u00e9rialisation de la session {0}: {1}
-+persistentManager.serializeError=Erreur lors de la s\u00e9rialisation de la
session {0}: {1}
- persistentManager.swapMaxIdle=Basculement de la session {0} vers le stockage
(Store), en attente pour {1} secondes
- persistentManager.backupMaxIdle=Sauvegarde de la session {0} vers le stockage
(Store), en attente pour {1} secondes
- persistentManager.backupException=Exception lors de la sauvegarde de la
session {0}: {1}
--persistentManager.tooManyActive=Trop de sessions actives, {0}, Ã la
recherche de sessions en attente pour basculement vers stockage (swap out)
-+persistentManager.tooManyActive=Trop de sessions actives, {0}, \u00e0 la
recherche de sessions en attente pour basculement vers stockage (swap out)
- persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de
la session {0}, en attente pour {1} secondes trop de sessions actives
--persistentManager.processSwaps=Recherche de sessions à basculer vers
stockage (swap out), {0} sessions actives en mémoire
--persistentManager.activeSession=La session {0} a été en attente durant {1}
secondes
-+persistentManager.processSwaps=Recherche de sessions \u00e0 basculer vers
stockage (swap out), {0} sessions actives en m\u00e9moire
-+persistentManager.activeSession=La session {0} a \u00e9t\u00e9 en attente
durant {1} secondes
- persistentManager.swapIn=Basculement depuis le stockage (swap in) de la
session {0}
-Index: webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
-===
webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
(revision 919592)
-+++ webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
(working copy)
-@@ -20,34 +20,34 @@
-
- helloworld.title=Salut le Monde!
-
--requestinfo.title=Exemple d''information sur la requête
--requestinfo.label.method=Méthode:
--requestinfo.label.requesturi=URI de requête:
-+requestinfo.title=Exemple d''information sur la requ\u00eate
-+requestinfo.label.method=M\u00e9thode:
-+requestinfo.label.requesturi=URI de requ\u00eate:
- requestinfo.label.protocol=Protocole:
- requestinfo.label.pathinfo=Info de chemin:
- requestinfo.label.remoteaddr=Adresse distante:
-
--requestheader.title=Exemple d''information sur les entête de requête
-+requestheader.title=Exemple d''information sur les ent\u00eate de requ\u00eate
-
--requestparams.title=Exemple de requête avec paramêtres
--requestparams.params-in-req=Paramêtres dans la requête:
--requestparams.no-params=Pas de paramêtre, merci dans saisir quelqu'uns
--requestparams.firstname=Prénom:
-+requestparams.title=Exemple de requ\u00eate avec param\u00eatres
-+requestparams.params-in-req=Param\u00eatres dans la requ\u00eate:
-+requestparams.no-params=Pas de param\u00eatre, merci dans saisir quelqu'uns
-+requestparams.firstname=Pr\u00e9nom:
- requestparams.lastname=Nom:
-
- cookies.title=Exemple d''utilisation de Cookies
- cookies.cookies=Votre navigateur retourne les cookies suivant:
- cookies.no-cookies=Votre navigateur ne retourne aucun cookie
--cookies.make-cookie=Création d''un cookie à retourner à votre navigateur
-+cookies.make-cookie=Cr\u00e9ation d''un cookie \u00e0 retourner \u00e0 votre
navigateur
- cookies.name=Nom:
- cookies.value=Valeur:
--c
svn commit: r919733 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/META-INF/annotations-api.jar.manifest res/META-INF/el-api.jar.manifest res/META-INF/jsp-api.jar.manifest res/META-INF/servlet-api.jar.man
Author: kkolinko Date: Sat Mar 6 10:22:06 2010 New Revision: 919733 URL: http://svn.apache.org/viewvc?rev=919733&view=rev Log: Move source/target JDK versions to the main section of the manifest, because these values belong to the JAR file as the whole, not to some subset of it. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=919733&r1=919732&r2=919733&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Mar 6 10:22:06 2010 @@ -120,12 +120,6 @@ +1: kkolinko, markt, rjung -1: -* Move source/target JDK versions to the main section of the manifest, - because these values belong to the JAR file as the whole, not to some subset of it. - http://svn.apache.org/viewvc?rev=918923&view=rev - +1: kkolinko, rjung, markt - -1: - * Replace UTF-8 characters with the proper \u encoding in the French translation. That prevents deployment of applications when using french language. +++ Modified: tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest?rev=919733&r1=919732&r2=919733&view=diff == --- tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest (original) +++ tomcat/tc6.0.x/trunk/res/META-INF/annotations-api.jar.manifest Sat Mar 6 10:22:06 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/ Specification-Title: Java API for Servlets (Annotations) @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet Implementation-Version: 2...@servlet.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest?rev=919733&r1=919732&r2=919733&view=diff == --- tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest (original) +++ tomcat/tc6.0.x/trunk/res/META-INF/el-api.jar.manifest Sat Mar 6 10:22:06 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/el/ Specification-Title: Expression Language @@ -7,5 +9,3 @@ Implementation-Title: javax.el Implementation-Version: 2...@el.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest?rev=919733&r1=919732&r2=919733&view=diff == --- tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest (original) +++ tomcat/tc6.0.x/trunk/res/META-INF/jsp-api.jar.manifest Sat Mar 6 10:22:06 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/jsp/ Specification-Title: Java API for JavaServer Pages @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet.jsp Implementation-Version: 2...@jsp.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ Modified: tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest?rev=919733&r1=919732&r2=919733&view=diff == --- tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest (original) +++ tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.manifest Sat Mar 6 10:22:06 2010 @@ -1,4 +1,6 @@ Manifest-version: 1.0 +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ Name: javax/servlet/ Specification-Title: Java API for Servlets @@ -7,5 +9,3 @@ Implementation-Title: javax.servlet Implementation-Version: 2...@servlet.revision@ Implementation-Vendor: Apache Software Foundation -X-Compile-Source-JDK: @source.jdk@ -X-Compile-Target-JDK: @target.jdk@ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919730 - /tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
Author: markt
Date: Sat Mar 6 10:02:16 2010
New Revision: 919730
URL: http://svn.apache.org/viewvc?rev=919730&view=rev
Log:
Lifecycle refactoring - Executor
The LifecycleState.STARTING event was being fired too early
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?rev=919730&r1=919729&r2=919730&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java Sat
Mar 6 10:02:16 2010
@@ -22,14 +22,15 @@
import org.apache.catalina.Executor;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.util.LifecycleSupport;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.threads.ResizableExecutor;
import org.apache.tomcat.util.threads.TaskQueue;
import org.apache.tomcat.util.threads.TaskThreadFactory;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
-public class StandardThreadExecutor implements Executor, ResizableExecutor {
+public class StandardThreadExecutor extends LifecycleBase
+implements Executor, ResizableExecutor {
// -- Properties
/**
@@ -77,8 +78,6 @@
*/
protected int maxQueueSize = Integer.MAX_VALUE;
-private LifecycleSupport lifecycle = new LifecycleSupport(this);
-
private TaskQueue taskqueue = null;
// -- Constructors
public StandardThreadExecutor() {
@@ -88,23 +87,40 @@
// -- Public Methods
-public void start() throws LifecycleException {
-lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null);
+
+/**
+ * Start the component and implement the requirements
+ * of {...@link LifecycleBase#startInternal()}.
+ *
+ * @exception LifecycleException if this component detects a fatal error
+ * that prevents this component from being used
+ */
+@Override
+protected void startInternal() throws LifecycleException {
+
taskqueue = new TaskQueue(maxQueueSize);
TaskThreadFactory tf = new
TaskThreadFactory(namePrefix,daemon,getThreadPriority());
-lifecycle.fireLifecycleEvent(START_EVENT, null);
executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), maxIdleTime, TimeUnit.MILLISECONDS,taskqueue, tf);
taskqueue.setParent(executor);
-lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
+
+setState(LifecycleState.STARTING);
}
-
-public void stop() throws LifecycleException{
-lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
-lifecycle.fireLifecycleEvent(STOP_EVENT, null);
+
+
+/**
+ * Stop the component and implement the requirements
+ * of {...@link LifecycleBase#stopInternal()}.
+ *
+ * @exception LifecycleException if this component detects a fatal error
+ * that needs to be reported
+ */
+@Override
+protected void stopInternal() throws LifecycleException {
+
+setState(LifecycleState.STOPPING);
if ( executor != null ) executor.shutdownNow();
executor = null;
taskqueue = null;
-lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
}
public void execute(Runnable command, long timeout, TimeUnit unit) {
@@ -201,34 +217,6 @@
return maxQueueSize;
}
-/**
- * Add a LifecycleEvent listener to this component.
- *
- * @param listener The listener to add
- */
-public void addLifecycleListener(LifecycleListener listener) {
-lifecycle.addLifecycleListener(listener);
-}
-
-
-/**
- * Get the lifecycle listeners associated with this lifecycle. If this
- * Lifecycle has no listeners registered, a zero-length array is returned.
- */
-public LifecycleListener[] findLifecycleListeners() {
-return lifecycle.findLifecycleListeners();
-}
-
-
-/**
- * Remove a LifecycleEvent listener from this component.
- *
- * @param listener The listener to remove
- */
-public void removeLifecycleListener(LifecycleListener listener) {
-lifecycle.removeLifecycleListener(listener);
-}
-
// Statistics from the thread pool
public int getActiveCount() {
return (executor != null) ? executor.getActiveCount() : 0;
@@ -258,13 +246,12 @@
@Override
public boolean resizePool(int corePoolSize, int maximumPoolSize) {
-if (executor == null) {
+if (executor == null)
Re: tagging 6.0.26
On 06/03/2010 06:54, jean-frederic clere wrote: > Hi, > > I plan to tag 6.0.26 on Sunday evening (Neuchatel time) and release on > Monday. > Comments? +1. Do you really mean release on Monday? I'm all for that if you can get the votes quickly enough. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919725 - in /tomcat/trunk/java/org/apache: catalina/tribes/tipis/LazyReplicatedMap.java coyote/ajp/AjpAprProcessor.java coyote/ajp/AjpProcessor.java coyote/http11/Http11AprProcessor.java
Author: markt
Date: Sat Mar 6 09:42:33 2010
New Revision: 919725
URL: http://svn.apache.org/viewvc?rev=919725&view=rev
Log:
Fix some Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=919725&r1=919724&r2=919725&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Sat Mar 6 09:42:33 2010
@@ -92,7 +92,7 @@
* @param initialCapacity int - the size of this map, see HashMap
*/
public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, int initialCapacity, ClassLoader[] cls) {
-super(owner, channel,timeout,mapContextName,initialCapacity,
LazyReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls);
+super(owner, channel,timeout,mapContextName,initialCapacity,
AbstractReplicatedMap.DEFAULT_LOAD_FACTOR, Channel.SEND_OPTIONS_DEFAULT, cls);
}
/**
@@ -102,7 +102,7 @@
* @param mapContextName String - unique name for this map, to allow
multiple maps per channel
*/
public LazyReplicatedMap(MapOwner owner, Channel channel, long
timeout, String mapContextName, ClassLoader[] cls) {
-super(owner, channel,timeout,mapContextName,
LazyReplicatedMap.DEFAULT_INITIAL_CAPACITY,LazyReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT,
cls);
+super(owner, channel,timeout,mapContextName,
AbstractReplicatedMap.DEFAULT_INITIAL_CAPACITY,AbstractReplicatedMap.DEFAULT_LOAD_FACTOR,Channel.SEND_OPTIONS_DEFAULT,
cls);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=919725&r1=919724&r2=919725&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sat Mar 6
09:42:33 2010
@@ -42,6 +42,7 @@
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.res.StringManager;
@@ -572,7 +573,7 @@
log.error(sm.getString("ajpprocessor.certs.fail"), e);
return;
}
-request.setAttribute(AprEndpoint.CERTIFICATE_KEY, jsseCerts);
+request.setAttribute(AbstractEndpoint.CERTIFICATE_KEY,
jsseCerts);
}
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {
@@ -786,19 +787,19 @@
case Constants.SC_A_SSL_CIPHER :
request.scheme().setString("https");
requestHeaderMessage.getBytes(tmpMB);
-request.setAttribute(AprEndpoint.CIPHER_SUITE_KEY,
+request.setAttribute(AbstractEndpoint.CIPHER_SUITE_KEY,
tmpMB.toString());
break;
case Constants.SC_A_SSL_SESSION :
request.scheme().setString("https");
requestHeaderMessage.getBytes(tmpMB);
-request.setAttribute(AprEndpoint.SESSION_ID_KEY,
+request.setAttribute(AbstractEndpoint.SESSION_ID_KEY,
tmpMB.toString());
break;
case Constants.SC_A_SSL_KEY_SIZE :
-request.setAttribute(AprEndpoint.KEY_SIZE_KEY,
+request.setAttribute(AbstractEndpoint.KEY_SIZE_KEY,
new
Integer(requestHeaderMessage.getInt()));
break;
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=919725&r1=919724&r2=919725&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sat Mar 6
09:42:33 2010
@@ -42,6 +42,7 @@
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.
DO NOT REPLY [Bug 48867] ISAPI Connector not connecting to Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=48867 wilmer@gmail.com changed: What|Removed |Added OS/Version|Windows XP |Windows Server 2003 --- Comment #1 from wilmer@gmail.com 2010-03-06 09:37:20 UTC --- More Information: Windows 2003 64 bit IIS 6.0 64 bit mode isapi_redirect.dll (64 bit) IIS 6.0 running on IIS 5 Isolation Mode Compression Enabled Tomcat 5.5 running in 32bit mode [info] ajp_connect_to_endpoint::jk_ajp_common.c (922): Failed opening socket to (127.0.0.1:8209) (errno=-9995) [Sat Mar 06 01:27:12.066 2010] [1380:1292] [error] ajp_send_request::jk_ajp_common.c (1467): (tomcat2) connecting to backend failed. Tomcat is probably not started or is listening on the wrong port (errno=-9995) -- 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: r919724 - in /tomcat/trunk/java/org/apache/catalina/ha/authenticator: ClusterSingleSignOn.java ClusterSingleSignOnListener.java SingleSignOnMessage.java
Author: markt
Date: Sat Mar 6 09:34:08 2010
New Revision: 919724
URL: http://svn.apache.org/viewvc?rev=919724&view=rev
Log:
Tabs to 8 spaces - no functional change
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=919724&r1=919723&r2=919724&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Sat Mar 6 09:34:08 2010
@@ -124,24 +124,24 @@
Cluster cluster = getCluster();
// stop remove cluster binding
if(cluster == null) {
- Container host = getContainer();
- if(host != null && host instanceof Host) {
- cluster = host.getCluster();
- if(cluster != null && cluster instanceof CatalinaCluster) {
- setCluster((CatalinaCluster) cluster);
- getCluster().addClusterListener(clusterSSOListener);
- } else {
- Container engine = host.getParent();
- if(engine != null && engine instanceof Engine) {
- cluster = engine.getCluster();
- if(cluster != null && cluster instanceof
CatalinaCluster) {
- setCluster((CatalinaCluster) cluster);
-
getCluster().addClusterListener(clusterSSOListener);
- }
- } else {
- cluster = null;
- }
- }
+Container host = getContainer();
+if(host != null && host instanceof Host) {
+cluster = host.getCluster();
+if(cluster != null && cluster instanceof CatalinaCluster) {
+setCluster((CatalinaCluster) cluster);
+getCluster().addClusterListener(clusterSSOListener);
+} else {
+Container engine = host.getParent();
+if(engine != null && engine instanceof Engine) {
+cluster = engine.getCluster();
+if(cluster != null && cluster instanceof
CatalinaCluster) {
+setCluster((CatalinaCluster) cluster);
+
getCluster().addClusterListener(clusterSSOListener);
+}
+} else {
+cluster = null;
+}
+}
}
}
if (cluster == null) {
@@ -190,31 +190,31 @@
@Override
protected void associate(String ssoId, Session session) {
- if (cluster != null) {
- messageNumber++;
- SingleSignOnMessage msg =
- new SingleSignOnMessage(cluster.getLocalMember(),
- ssoId, session.getId());
- Manager mgr = session.getManager();
- if ((mgr != null) && (mgr instanceof ClusterManager))
- msg.setContextName(((ClusterManager) mgr).getName());
-
- msg.setAction(SingleSignOnMessage.ADD_SESSION);
-
- cluster.sendClusterDomain(msg);
-
- if (containerLog.isDebugEnabled())
- containerLog.debug("SingleSignOnMessage Send with action "
- + msg.getAction());
- }
+if (cluster != null) {
+messageNumber++;
+SingleSignOnMessage msg =
+new SingleSignOnMessage(cluster.getLocalMember(),
+ssoId, session.getId());
+Manager mgr = session.getManager();
+if ((mgr != null) && (mgr instanceof ClusterManager))
+msg.setContextName(((ClusterManager) mgr).getName());
+
+msg.setAction(SingleSignOnMessage.ADD_SESSION);
+
+cluster.sendClusterDomain(msg);
+
+if (containerLog.isDebugEnabled())
+containerLog.debug("SingleSignOnMessage Send with action "
+ + msg.getAction());
+}
- associateLocal(ssoId, session);
+associateLocal(ssoId, session);
}
protected void associateLocal(String ssoId, Session session) {
- super.associate(ssoId, session);
+super.associate(ssoId, session);
svn commit: r919722 - /tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
Author: markt
Date: Sat Mar 6 09:26:33 2010
New Revision: 919722
URL: http://svn.apache.org/viewvc?rev=919722&view=rev
Log:
Fix some inconsistencies identified during lifecycle refactoring for valves
- don't start a basic valve when adding it to the pipeline if the pipeline is
not started
- if pipeline is started when adding a basic valve, register the basic valve
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=919722&r1=919721&r2=919722&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Sat Mar 6
09:26:33 2010
@@ -326,13 +326,15 @@
if (valve instanceof Contained) {
((Contained) valve).setContainer(this.container);
}
-if (valve instanceof Lifecycle) {
+if (getState().isAvailable() && valve instanceof Lifecycle) {
try {
((Lifecycle) valve).start();
} catch (LifecycleException e) {
log.error("StandardPipeline.setBasic: start", e);
return;
}
+// Register the newly added valve
+registerValve(valve);
}
// Update the pipeline
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48867] New: ISAPI Connector not connecting to Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=48867 Summary: ISAPI Connector not connecting to Tomcat Product: Tomcat Connectors Version: 1.2.27 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: isapi AssignedTo: dev@tomcat.apache.org ReportedBy: wilmer@gmail.com Created an attachment (id=25090) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25090) server.xml, isapi debug logs and worker.properties IIS and 4 Tomcat Instance are all up and running but the connector reports a socket failure. Server.xml Sat Mar 06 01:27:12.394 2010] [1380:1292] [info] ajp_service::jk_ajp_common.c (2407): (tomcat4) sending request to tomcat failed (recoverable), because of error during request sending (attempt=2) [Sat Mar 06 01:27:12.394 2010] [1380:1292] [error] ajp_service::jk_ajp_common.c (2426): (tomcat4) connecting to tomcat failed. [Sat Mar 06 01:27:12.394 2010] [1380:1292] [debug] ajp_reset_endpoint::jk_ajp_common.c (743): (tomcat4) resetting endpoint with sd = 4294967295 (socket shutdown) [Sat Mar 06 01:27:12.394 2010] [1380:1292] [debug] ajp_done::jk_ajp_common.c (2850): recycling connection pool slot=0 for worker tomcat4 [Sat Mar 06 01:27:12.394 2010] [1380:1292] [info] service::jk_lb_worker.c (1347): service failed, worker tomcat4 is in error state [Sat Mar 06 01:27:12.394 2010] [1380:1292] [debug] service::jk_lb_worker.c (1358): recoverable error... will try to recover on other worker [Sat Mar 06 01:27:12.394 2010] [1380:1292] [debug] service::jk_lb_worker.c (1101): retry 1, sleeping for 100 ms before retrying [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] force_recovery::jk_lb_worker.c (577): worker tomcat1 is marked for forced recovery [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] force_recovery::jk_lb_worker.c (577): worker tomcat2 is marked for forced recovery [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] force_recovery::jk_lb_worker.c (577): worker tomcat3 is marked for forced recovery [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] force_recovery::jk_lb_worker.c (577): worker tomcat4 is marked for forced recovery [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1399): Forcing recovery once for 4 workers [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1416): All tomcat instances failed, no more workers left (attempt=0, retry=1) [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1416): All tomcat instances failed, no more workers left (attempt=1, retry=1) [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1416): All tomcat instances failed, no more workers left (attempt=2, retry=1) [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1416): All tomcat instances failed, no more workers left (attempt=3, retry=1) [Sat Mar 06 01:27:12.504 2010] [1380:1292] [info] service::jk_lb_worker.c (1427): All tomcat instances are busy or in error state [Sat Mar 06 01:27:12.504 2010] [1380:1292] [error] service::jk_lb_worker.c (1432): All tomcat instances failed, no more workers left [Sat Mar 06 01:27:12.504 2010] [1380:1292] [error] HttpExtensionProc::jk_isapi_plugin.c (2199): service() failed with http error 503 -- 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
