svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
Author: mturk
Date: Tue Aug 24 07:02:44 2010
New Revision: 988409
URL: http://svn.apache.org/viewvc?rev=988409&view=rev
Log:
Make 1.4.x mandatory at build time as well
Modified:
tomcat/native/trunk/native/build/tcnative.m4
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988409&r1=988408&r2=988409&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 07:02:44 2010
@@ -33,8 +33,8 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0101003"; then
-AC_MSG_ERROR(You need APR version 1.3.3 or newer installed.)
+ if test "${decimal_apr_version}" -lt "0104002"; then
+AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or newer
installed.)
fi
APR_BUILD_DIR="`$apr_config --installbuilddir`"
@@ -58,7 +58,7 @@ dnl TCN_JDK
dnl
dnl Detection of JDK location and Java Platform (1.2, 1.3, 1.4, 1.5, 1.6)
dnl result goes in JAVA_HOME / JAVA_PLATFORM (2 -> 1.2 and higher)
-dnl
+dnl
dnl --
AC_DEFUN(
[TCN_FIND_JDK],
@@ -81,13 +81,13 @@ AC_DEFUN(
# This stuff works if the command line parameter --with-java-home was
# specified, so it takes priority rightfully.
-
+
tempval=${withval}
if test ! -d "${tempval}" ; then
AC_MSG_ERROR(Not a directory: ${tempval})
fi
-
+
JAVA_HOME=${tempval}
AC_MSG_RESULT(${JAVA_HOME})
],
@@ -208,7 +208,7 @@ AC_DEFUN(
JAVA_OS = ${tempval}
],
- [
+ [
AC_MSG_CHECKING(os_type directory)
JAVA_OS=NONE
if test -f ${JAVA_HOME}/${JAVA_INC}/jni_md.h; then
@@ -261,7 +261,7 @@ AC_DEFUN(
])
dnl TCN_HELP_STRING(LHS, RHS)
-dnl Autoconf 2.50 can not handle substr correctly. It does have
+dnl Autoconf 2.50 can not handle substr correctly. It does have
dnl AC_HELP_STRING, so let's try to call it if we can.
dnl Note: this define must be on one line so that it can be properly returned
dnl as the help string.
@@ -351,7 +351,7 @@ case "$use_openssl" in
saved_libs="$LIBS"
CFLAGS="$CFLAGS $TCN_OPENSSL_INC"
LIBS="$LIBS $TCN_OPENSSL_LIBS"
-
+
AC_ARG_ENABLE(openssl-version-check,
[AC_HELP_STRING([--enable-openssl-version-check],
[Check OpenSSL Version @<:@default=yes@:>@])])
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 08/24/2010 09:02 AM, mt...@apache.org wrote: > Author: mturk > Date: Tue Aug 24 07:02:44 2010 > New Revision: 988409 > > URL: http://svn.apache.org/viewvc?rev=988409&view=rev > Log: > Make 1.4.x mandatory at build time as well The 1.3.x apr_pool_pre_cleanup_register doesn't work? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On Tue, 2010-08-24 at 07:02 +, mt...@apache.org wrote: > Author: mturk > Date: Tue Aug 24 07:02:44 2010 > New Revision: 988409 > > URL: http://svn.apache.org/viewvc?rev=988409&view=rev > Log: > Make 1.4.x mandatory at build time as well This requirement is not possible, even F13 is still at 1.3.9. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988422 - /tomcat/trunk/java/org/apache/catalina/Host.java
Author: markt Date: Tue Aug 24 08:00:55 2010 New Revision: 988422 URL: http://svn.apache.org/viewvc?rev=988422&view=rev Log: Remove methods already defined by Container Modified: tomcat/trunk/java/org/apache/catalina/Host.java Modified: tomcat/trunk/java/org/apache/catalina/Host.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=988422&r1=988421&r2=988422&view=diff == --- tomcat/trunk/java/org/apache/catalina/Host.java (original) +++ tomcat/trunk/java/org/apache/catalina/Host.java Tue Aug 24 08:00:55 2010 @@ -148,24 +148,6 @@ public interface Host extends Container public void setDeployOnStartup(boolean deployOnStartup); -/** - * Return the canonical, fully qualified, name of the virtual host - * this Container represents. - */ -public String getName(); - - -/** - * Set the canonical, fully qualified, name of the virtual host - * this Container represents. - * - * @param name Virtual host name - * - * @exception IllegalArgumentException if name is null - */ -public void setName(String name); - - // - Public Methods - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988428 - in /tomcat/native/trunk/native: build/tcnative.m4 configure.in
Author: mturk
Date: Tue Aug 24 08:11:26 2010
New Revision: 988428
URL: http://svn.apache.org/viewvc?rev=988428&view=rev
Log:
Check if APR API feature is actually supported
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/configure.in
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988428&r1=988427&r2=988428&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 08:11:26 2010
@@ -400,3 +400,20 @@ then
APR_ADDTO(CFLAGS, [-DHAVE_OPENSSL])
fi
])
+
+dnl
+dnl TCN_FIND_APR_FEATURE: figure out if APR feature is suipported
+dnl
+AC_DEFUN(TCN_FIND_APR_FEATURE,[
+ saved_cflags="$CFLAGS"
+ saved_libs="$LIBS"
+ CFLAGS="$CFLAGS $APR_INCLUDES"
+ LIBS="$LIBS -lapr-1"
+ chk_result=0
+ AC_CHECK_LIB(apr-1, $1,[chk_result=1])
+ CFLAGS="$saved_cflags"
+ LIBS="$saved_libs"
+ if test "$chk_result" != "0"; then
+APR_ADDTO(CFLAGS, [-DHAVE_$2])
+ fi
+])
Modified: tomcat/native/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=988428&r1=988427&r2=988428&view=diff
==
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Tue Aug 24 08:11:26 2010
@@ -140,7 +140,7 @@ dnl
use_openssl=true;
-AC_ARG_ENABLE(openssl,
+AC_ARG_ENABLE(openssl,
[AS_HELP_STRING([--disable-openssl],[avoid using OpenSSL toolkit])],
[
case "${enableval}" in
@@ -213,6 +213,9 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
+TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
+
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
AC_SUBST(TCNATIVE_INCLUDES)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988296 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/listeners.xml
On 23.08.2010 22:35, ma...@apache.org wrote:
Author: markt
Date: Mon Aug 23 20:35:03 2010
New Revision: 988296
URL: http://svn.apache.org/viewvc?rev=988296&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49669
Another Java class triggering a memory leak. This time
javax.security.auth.Policy
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/config/listeners.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=988296&r1=988295&r2=988296&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Mon Aug 23 20:35:03 2010
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.security.Policy;
import javax.imageio.ImageIO;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -93,6 +94,20 @@ public class JreMemoryLeakPreventionList
this.keepAliveProtection = keepAliveProtection;
}
+ /**
+ * Protect against the memory leak caused when the first call to
+ *javax.security.auth.Policy is triggered by a web
+ * application. This first call populate a static variable with a
reference
+ * to the context class loader. Defaults totrue.
+ */
+ private boolean securityPolicyProtection = true;
+ public boolean iSsecurityPolicyProtection() {
iSsec... -> isSec... ?
Have a nice day
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988429 - /tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt
Date: Tue Aug 24 08:19:25 2010
New Revision: 988429
URL: http://svn.apache.org/viewvc?rev=988429&view=rev
Log:
Fix typo
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=988429&r1=988428&r2=988429&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Tue Aug 24 08:19:25 2010
@@ -101,7 +101,7 @@ public class JreMemoryLeakPreventionList
* to the context class loader. Defaults to true.
*/
private boolean securityPolicyProtection = true;
- public boolean iSsecurityPolicyProtection() {
+ public boolean isSecurityPolicyProtection() {
return securityPolicyProtection;
}
public void setSecurityPolicyProtection(boolean securityPolicyProtection)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 08/24/2010 09:09 AM, jean-frederic clere wrote: On 08/24/2010 09:02 AM, mt...@apache.org wrote: Author: mturk Date: Tue Aug 24 07:02:44 2010 New Revision: 988409 URL: http://svn.apache.org/viewvc?rev=988409&view=rev Log: Make 1.4.x mandatory at build time as well The 1.3.x apr_pool_pre_cleanup_register doesn't work? This is for trunk (tcnative 1.2.x) Branch 1.1.x will have apr-1.3.x dependency with those functions backported after found stable. Pool pre cleanup is easily backportable and is already part of RHEL-5 apr-1.2.7, so I added extra check for that as part of configure. 1.4.x will be used since it has apr_pollset_wakeup API but only for 1.2.x branch (since this extends Java API) All this was explained and put for comments for quite some time (March) BTW, even you participated in discussion, and think we reached consensus on that :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On Tue, 2010-08-24 at 10:23 +0200, Mladen Turk wrote: > This is for trunk (tcnative 1.2.x) > Branch 1.1.x will have apr-1.3.x dependency with those > functions backported after found stable. > Pool pre cleanup is easily backportable and is > already part of RHEL-5 apr-1.2.7, so I added extra > check for that as part of configure. > > 1.4.x will be used since it has apr_pollset_wakeup API > but only for 1.2.x branch (since this extends Java API) > > All this was explained and put for comments > for quite some time (March) > BTW, even you participated in discussion, and think > we reached consensus on that :) I don't remember, but I guess I changed my mind then. Real world usage difficulties mean it is very hard to require something newer than APR 1.3. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 08/24/2010 10:48 AM, Remy Maucherat wrote: > On Tue, 2010-08-24 at 10:23 +0200, Mladen Turk wrote: >> This is for trunk (tcnative 1.2.x) >> Branch 1.1.x will have apr-1.3.x dependency with those >> functions backported after found stable. >> Pool pre cleanup is easily backportable and is >> already part of RHEL-5 apr-1.2.7, so I added extra >> check for that as part of configure. >> >> 1.4.x will be used since it has apr_pollset_wakeup API >> but only for 1.2.x branch (since this extends Java API) >> >> All this was explained and put for comments >> for quite some time (March) >> BTW, even you participated in discussion, and think >> we reached consensus on that :) > > I don't remember, but I guess I changed my mind then. Real world usage > difficulties mean it is very hard to require something newer than APR > 1.3. It seems you need 1.4.x for apr_pollset_wakeup() but why do we need apr_pollset_wakeup()? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 08/24/2010 10:48 AM, Remy Maucherat wrote: I don't remember, but I guess I changed my mind then. Real world usage difficulties mean it is very hard to require something newer than APR 1.3. Agreed, and that's why we have trunk and 1.1.x branch. We didn't have a single trunk release, and it'll probably pass quite some time until we'll have one, and it'll probably be Tomcat7 targeted only, since it would require changing (extending) the Java API as well and rewriting the connectors to use the pollset wakeup instead interval poll in separate thread(s). So the trunk is just like it should be: a development branch. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988448 - in /tomcat/trunk: java/org/apache/catalina/filters/CsrfPreventionFilter.java test/org/apache/catalina/filters/TestCsrfPreventionFilter.java webapps/docs/changelog.xml
Author: markt
Date: Tue Aug 24 09:30:11 2010
New Revision: 988448
URL: http://svn.apache.org/viewvc?rev=988448&view=rev
Log:
Correctly handle anchors in URLs with the CSRF prevention filter.
Added:
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=988448&r1=988447&r2=988448&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Tue
Aug 24 09:30:11 2010
@@ -128,6 +128,7 @@ public class CsrfPreventionFilter extend
}
}
+@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
@@ -215,7 +216,7 @@ public class CsrfPreventionFilter extend
return buffer.toString();
}
-private static class CsrfResponseWrapper
+protected static class CsrfResponseWrapper
extends HttpServletResponseWrapper {
private String nonce;
@@ -248,7 +249,7 @@ public class CsrfPreventionFilter extend
}
/**
- * Return the specified URL with the nonce added to the query string
+ * Return the specified URL with the nonce added to the query string.
*
* @param url URL to be modified
* @param nonce The nonce to add
@@ -261,18 +262,17 @@ public class CsrfPreventionFilter extend
String path = url;
String query = "";
String anchor = "";
-int question = url.indexOf('?');
-if (question >= 0) {
-path = url.substring(0, question);
-query = url.substring(question);
-}
int pound = path.indexOf('#');
if (pound >= 0) {
anchor = path.substring(pound);
path = path.substring(0, pound);
}
+int question = path.indexOf('?');
+if (question >= 0) {
+query = path.substring(question);
+path = path.substring(0, question);
+}
StringBuilder sb = new StringBuilder(path);
-sb.append(anchor);
if (query.length() >0) {
sb.append(query);
sb.append('&');
@@ -282,6 +282,7 @@ public class CsrfPreventionFilter extend
sb.append(Constants.CSRF_NONCE_REQUEST_PARAM);
sb.append('=');
sb.append(nonce);
+sb.append(anchor);
return (sb.toString());
}
}
Added:
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=988448&view=auto
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
Tue Aug 24 09:30:11 2010
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.filters;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.core.DummyResponse;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestCsrfPreventionFilter extends TomcatBaseTest {
+
+private static final String RESULT_NONCE =
+Constants.CSRF_NONCE_SESSION_ATTR_NAME + "=TESTNONCE";
+
+private final HttpServletResponse wrapper =
+new CsrfPreventionFilter.CsrfResponseWrapper(
+new NonEncodingResponse(), "TESTNONCE");
+
+public void testAddNonceNoQueryNoAnchor() throws Exception {
+assertEquals("/test?" + RESULT_NONCE
svn commit: r988456 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/ src/share/org/apache/catalina/cluster/mcast/ src/share/org/apache/catalina/cluster/membership/
Author: rjung
Date: Tue Aug 24 09:54:26 2010
New Revision: 988456
URL: http://svn.apache.org/viewvc?rev=988456&view=rev
Log:
BZ 48417: Update French translations. Patch provided by
Andre Warnier.
Backport of r896378/896391 (TC 6).
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_fr.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/LocalStrings_fr.properties
(with props)
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/LocalStrings_fr.properties
(with props)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988456&r1=988455&r2=988456&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 09:54:26 2010
@@ -32,6 +32,10 @@
+48417: Update French translations. Patch provided by André
+Warnier. Port from Tomcat 6.0. (rjung)
+
+
Address can not be transient in ClusterMessageBase. It is needed
during initial session data transfer. (rjung)
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties?rev=988456&view=auto
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
(added)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
Tue Aug 24 09:54:26 2010
@@ -0,0 +1,16 @@
+# 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.
+
+cluster.mbean.register.already=MBean {0} d\u00e9j\u00e0 enregistr\u00e9!
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
--
svn:eol-style = native
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/LocalStrings_fr.properties
--
svn:keywords = Author Date Id Revision
Added:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_fr.properties?rev=988456&view=auto
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_fr.properties
(added)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/LocalStrings_fr.properties
Tue Aug 24 09:54:26 2010
@@ -0,0 +1,16 @@
+# 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.
+
+cluster.mbean.register.already=MBean {0} d\u00e9j\u00e0 enregistr\u00e9!
Propchange:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/
[g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Java Servlet 3.0, Java Server Pages 2.2 & Expression Languag... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins 17 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-24082010.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24082010-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24082010-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24082010.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool -Dcommons-dbcp.home=/srv/gump/public/wor kspace/apache-commons/dbcp -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/dist/checkstyle-24082010/checkstyle-all-24082010.jar -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-24082010.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/packages/junit3.8.1/junit.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv /gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore. jar:/srv/gump/public/workspace/tomcat-t
svn commit: r988459 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/coyote/http11/filters/ test/org/apache/coyote/http11/ webapps/docs/
Author: markt
Date: Tue Aug 24 10:02:14 2010
New Revision: 988459
URL: http://svn.apache.org/viewvc?rev=988459&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48738
Workaround a couple of long standing JDK bugs to enable GZIP compressed output
streams to be flushed. Based on a patch provided by Jiong Wang.
Added:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(with props)
tomcat/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
(with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=988459&r1=988458&r2=988459&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Tue
Aug 24 10:02:14 2010
@@ -23,6 +23,7 @@ import java.security.PrivilegedAction;
import org.apache.coyote.ActionCode;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.coyote.http11.filters.GzipOutputFilter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -103,6 +104,12 @@ public abstract class AbstractOutputBuff
*/
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+
+/**
+ * Logger.
+ */
+protected static org.apache.juli.logging.Log log
+=
org.apache.juli.logging.LogFactory.getLog(AbstractOutputBuffer.class);
// - Properties
@@ -221,6 +228,19 @@ public abstract class AbstractOutputBuff
response.action(ActionCode.ACTION_COMMIT, null);
}
+
+// go through the filters and if there is gzip filter
+// invoke it to flush
+for (int i = 0; i <= lastActiveFilter; i++) {
+if (activeFilters[i] instanceof GzipOutputFilter) {
+if (log.isDebugEnabled()) {
+log.debug("Flushing the gzip filter at position " + i +
+" of the filter chain...");
+}
+((GzipOutputFilter) activeFilters[i]).flush();
+break;
+}
+}
}
/**
Added:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=988459&view=auto
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(added)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Tue Aug 24 10:02:14 2010
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.coyote.http11.filters;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.Deflater;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * Extension of {...@link GZIPOutputStream} to workaround for a couple of long
+ * standing JDK bugs
+ * (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4255743";>Bug
+ * 4255743 and
+ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4813885";>Bug
+ * 4813885) so the GZIP'd output can be flushed.
+ */
+public class FlushableGZIPOutputStream extends GZIPOutputStream {
+public FlushableGZIPOutputStream(OutputStream os) throws IOException {
+super(os);
+}
+
+private static final byte[] EMPTYBYTEARRAY = new byte[0];
+private boolean hasData = false;
+
+/**
+ * Here we make sure we have received data, so that the header has been for
+ * sure written to the output stream alread
DO NOT REPLY [Bug 48738] [PATCH]Allow GzipOutputFilter to send partial result when flushBuffer() is called
https://issues.apache.org/bugzilla/show_bug.cgi?id=48738 --- Comment #2 from Mark Thomas 2010-08-24 06:09:31 EDT --- The patch (with some slight modifications) has been applied to trunk and will be included in 7.0.3 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
Re: [g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
2010/8/24 Bill Barker : > > Full details are available at: > > http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html > > /srv/gump/public/workspace/tomcat-trunk/build.xml:1016: Some tests completed > with an Error. See /srv/gump/public/workspace/tomcat-trunk/output/build/logs > for details. > The error shows up in this file [1]: TEST-org.apache.catalina.authenticator.TestFormAuthenticator.NIO.txt but at the same time the following run was successful [2]: TEST-org.apache.catalina.authenticator.TestFormAuthenticator.BIO.txt [1] http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.authenticator.TestFormAuthenticator.NIO.txt.html [2] http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_file/TEST-org.apache.catalina.authenticator.TestFormAuthenticator.BIO.txt.html Testsuite: org.apache.catalina.authenticator.TestFormAuthenticator Tests run: 5, Failures: 0, Errors: 3, Time elapsed: 216.974 sec (...) java.lang.NullPointerException at org.apache.catalina.startup.SimpleHttpClient.isResponse200(SimpleHttpClient.java:202) at org.apache.catalina.authenticator.TestFormAuthenticator.doTest(TestFormAuthenticator.java:59) at org.apache.catalina.authenticator.TestFormAuthenticator.testGet(TestFormAuthenticator.java:30) 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: r988466 - /tomcat/trunk/checkstyle.xml
Author: markt Date: Tue Aug 24 10:19:04 2010 New Revision: 988466 URL: http://svn.apache.org/viewvc?rev=988466&view=rev Log: Notes on a couple more checks Modified: tomcat/trunk/checkstyle.xml Modified: tomcat/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=988466&r1=988465&r2=988466&view=diff == --- tomcat/trunk/checkstyle.xml (original) +++ tomcat/trunk/checkstyle.xml Tue Aug 24 10:19:04 2010 @@ -46,6 +46,14 @@ --> + + + +
svn commit: r988473 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/deploy/ src/share/org/apache/catalina/cluster/io/ src/share/org/apache/catalina/cluster/mcast/ s
Author: rjung
Date: Tue Aug 24 10:45:03 2010
New Revision: 988473
URL: http://svn.apache.org/viewvc?rev=988473&view=rev
Log:
Loggers should be final.
Similar to r834226 in trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastServiceImpl.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderLifecycleListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/FastAsyncSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationThread.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/FastQueue.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988473&r1=988472&r2=988473&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 10:45:03 2010
@@ -32,6 +32,9 @@
+Loggers should be final. (rjung)
+
+
48417: Update French translations. Patch provided by André
Warnier. Port from Tomcat 6.0. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=988473&r1=988472&r2=988473&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Tue Aug 24 10:45:03 2010
@@ -59,7 +59,7 @@ import org.apache.tomcat.util.modeler.Re
*/
public class FarmWarDeployer implements ClusterDeployer, FileChangeListener {
/*--Static Variables*/
-public static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
+public static final org.apache.juli.logging.Log log
Re: svn commit: r988459 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/coyote/http11/filters/ test/org/apache/coyote/http11/ webapps/docs/
log is protected (instead of private) is intentional? -Tim On 8/24/2010 6:02 AM, ma...@apache.org wrote: + +/** + * Logger. + */ +protected static org.apache.juli.logging.Log log += org.apache.juli.logging.LogFactory.getLog(AbstractOutputBuffer.class); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988459 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/coyote/http11/filters/ test/org/apache/coyote/http11/ webapps/docs/
On 24/08/2010 11:46, Tim Funk wrote: > log is protected (instead of private) is intentional? Nope. Thanks. Mark > > -Tim > > On 8/24/2010 6:02 AM, ma...@apache.org wrote: >> + >> +/** >> + * Logger. >> + */ >> +protected static org.apache.juli.logging.Log log >> += >> org.apache.juli.logging.LogFactory.getLog(AbstractOutputBuffer.class); > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988474 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
Author: markt Date: Tue Aug 24 10:49:33 2010 New Revision: 988474 URL: http://svn.apache.org/viewvc?rev=988474&view=rev Log: Fix logger visibility Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=988474&r1=988473&r2=988474&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Tue Aug 24 10:49:33 2010 @@ -108,7 +108,7 @@ public abstract class AbstractOutputBuff /** * Logger. */ -protected static org.apache.juli.logging.Log log +private static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(AbstractOutputBuffer.class); // - Properties - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988479 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Author: rjung
Date: Tue Aug 24 10:56:19 2010
New Revision: 988479
URL: http://svn.apache.org/viewvc?rev=988479&view=rev
Log:
Remove empty implementations of methods no longer existing
in the Cluster interface.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988479&r1=988478&r2=988479&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 10:56:19 2010
@@ -32,6 +32,10 @@
+Remove empty implementations of methods no longer existing
+in the Cluster interface. (rjung)
+
+
Loggers should be final. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?rev=988479&r1=988478&r2=988479&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Tue Aug 24 10:56:19 2010
@@ -538,7 +538,6 @@ public class SimpleTcpCluster implements
* @param name
*Context Name of this manager
* @see org.apache.catalina.Cluster#createManager(java.lang.String)
- * @see #addManager(String, Manager)
* @see DeltaManager#start()
*/
public synchronized Manager createManager(String name) {
@@ -571,8 +570,6 @@ public class SimpleTcpCluster implements
/**
* remove an application form cluster replication bus
- *
- * @see
org.apache.catalina.cluster.CatalinaCluster#removeManager(java.lang.String,Manager)
*/
public void removeManager(Manager manager) {
if (manager != null && manager instanceof ClusterManager ) {
@@ -1369,25 +1366,4 @@ public class SimpleTcpCluster implements
public String getProtocol() {
return null;
}
-
-/**
- * @see org.apache.catalina.Cluster#startContext(java.lang.String)
- */
-public void startContext(String contextPath) throws IOException {
-
-}
-
-/**
- * @see org.apache.catalina.Cluster#installContext(java.lang.String,
java.net.URL)
- */
-public void installContext(String contextPath, URL war) {
-
-}
-
-/**
- * @see org.apache.catalina.Cluster#stop(java.lang.String)
- */
-public void stop(String contextPath) throws IOException {
-
-}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988481 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/mcast/ src/share/org/apache/catalina/cluster/membership/ src/share/org/apache/catalina/cluster/s
Author: rjung Date: Tue Aug 24 11:03:07 2010 New Revision: 988481 URL: http://svn.apache.org/viewvc?rev=988481&view=rev Log: StringManagers should be static final. Similar to r834229 and r834233 in trunk. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaRequest.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/DataSender.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/IDataSenderFactory.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988481&r1=988480&r2=988481&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 11:03:07 2010 @@ -36,7 +36,7 @@ in the Cluster interface. (rjung) -Loggers should be final. (rjung) +Loggers should be final. StringManagers should be static final. (rjung) 48417: Update French translations. Patch provided by André Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java?rev=988481&r1=988480&r2=988481&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastService.java Tue Aug 24 11:03:07 2010 @@ -55,7 +55,7 @@ public class McastService implements Mem /** * The string manager for this package. */ -protected StringManager sm = StringManager.getManager(Constants.Package); +protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The descriptive information about this implementation. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java?rev=988481&r1=988480&r2=988481&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastService.java Tue Aug 24 11:03:07 2010 @@ -54,7 +54,7 @@ public class McastService implements Mem /** * The string manager for this package. */ -protected StringManager sm = StringManager.getManager(Constants.Package); +protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The descriptive information about this implementation. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java?rev=988481&r1=988480&r2=988481&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java (original) +++ tomcat/sandbox/tomcat-oa
DO NOT REPLY [Bug 49814] New: Error 2: The system cannot find the file specified!
https://issues.apache.org/bugzilla/show_bug.cgi?id=49814 Summary: Error 2: The system cannot find the file specified! Product: Tomcat 5 Version: 5.0.28 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: Unknown AssignedTo: dev@tomcat.apache.org ReportedBy: dkrov...@mail.ru Hello! When I try to start the service "Apache Tomcat" the system shows me this type of error "Couldn't start apache tomcat on local computer. Error 2: The system cannot fund the file specified". I tried to restart the server, but nothing was fixed. I still cannot start this service. Please help me in with this problem. -- 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: r988488 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/deploy/ src/share/org/apache/catalina/cluster/session/ src/share/org/apache/catalina/cluster/uti
Author: rjung
Date: Tue Aug 24 11:29:06 2010
New Revision: 988488
URL: http://svn.apache.org/viewvc?rev=988488&view=rev
Log:
Reduce loger visibility.
Similar to r882017/r883204 in trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/util/SmartQueue.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988488&r1=988487&r2=988488&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 11:29:06 2010
@@ -36,7 +36,8 @@
in the Cluster interface. (rjung)
-Loggers should be final. StringManagers should be static final. (rjung)
+Loggers should be final and mostly private.
+StringManagers should be static final. (rjung)
48417: Update French translations. Patch provided by André
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java?rev=988488&r1=988487&r2=988488&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Tue Aug 24 11:29:06 2010
@@ -59,7 +59,7 @@ import org.apache.tomcat.util.modeler.Re
*/
public class FarmWarDeployer implements ClusterDeployer, FileChangeListener {
/*--Static Variables*/
-public static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
+private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(FarmWarDeployer.class);
/**
* The descriptive information about this implementation.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java?rev=988488&r1=988487&r2=988488&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
Tue Aug 24 11:29:06 2010
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.Atomi
*/
public class FileMessageFactory {
/*--Static Variables*/
-public static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
+private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(FileMessageFactory.class);
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java?rev=988488&r1=988487&r2=988488&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Tue Aug 24 11:29:06 2010
@@ -38,7 +38,7 @@ import java.util.Iterator;
public class WarWatcher {
/*--Static Variables*/
-public static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
+private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
.getLog(WarWatcher.class);
/*--Instance Variables--*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterListener.java
URL:
http://svn.apache.org/viewvc/
DO NOT REPLY [Bug 49814] Error 2: The system cannot find the file specified!
https://issues.apache.org/bugzilla/show_bug.cgi?id=49814 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Rainer Jung 2010-08-24 07:34:51 EDT --- Bugzilla is not a support forum. Please use the users mailing list. To subscribe, send mail to users-subscr...@tomcat.apache.org If the discussion there reveals, that there is a real bug, you can reopen this issue. -- 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: r988503 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java
Author: rjung
Date: Tue Aug 24 12:21:01 2010
New Revision: 988503
URL: http://svn.apache.org/viewvc?rev=988503&view=rev
Log:
Remove unneeded cast and make ReplicationValve volatile
in the DeltaManager.
Backport of r937325 and r939130 from trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988503&r1=988502&r2=988503&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 12:21:01 2010
@@ -32,6 +32,10 @@
+Remove unneeded cast and make ReplicationValve volatile
+in the DeltaManager. (rjung)
+
+
Remove empty implementations of methods no longer existing
in the Cluster interface. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=988503&r1=988502&r2=988503&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue Aug 24 12:21:01 2010
@@ -101,7 +101,7 @@ public class DeltaManager extends Cluste
/**
* cached replication valve cluster container!
*/
-private ReplicationValve replicationValve = null ;
+private volatile ReplicationValve replicationValve = null ;
/**
* The lifecycle event support for this component.
@@ -1074,9 +1074,9 @@ public class DeltaManager extends Cluste
protected void registerSessionAtReplicationValve(DeltaSession session) {
if(replicationValve == null) {
if(container instanceof StandardContext &&
((StandardContext)container).getCrossContext()) {
-Cluster cluster = getCluster() ;
-if(cluster != null && cluster instanceof CatalinaCluster) {
-Valve[] valves = ((CatalinaCluster)cluster).getValves();
+CatalinaCluster cluster = getCluster() ;
+if(cluster != null) {
+Valve[] valves = cluster.getValves();
if(valves != null && valves.length > 0) {
for(int i=0; replicationValve == null && i <
valves.length ; i++ ){
if(valves[i] instanceof ReplicationValve)
replicationValve = (ReplicationValve)valves[i] ;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988509 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/ src/share/org/apache/catalina/cluster/mcast/ src/share/org/apache/catalina/cluster/membership/
Author: rjung
Date: Tue Aug 24 12:33:56 2010
New Revision: 988509
URL: http://svn.apache.org/viewvc?rev=988509&view=rev
Log:
Add serialVersionUID to the serializable classes.
Parts of this are backported from r946103 (trunk).
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988509&r1=988508&r2=988509&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 12:33:56 2010
@@ -32,6 +32,9 @@
+Add serialVersionUID to the serializable classes. (rjung)
+
+
Remove unneeded cast and make ReplicationValve volatile
in the DeltaManager. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java?rev=988509&r1=988508&r2=988509&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/ClusterMessageBase.java
Tue Aug 24 12:33:56 2010
@@ -32,6 +32,8 @@ import org.apache.catalina.cluster.Membe
*/
public class ClusterMessageBase implements ClusterMessage {
+private static final long serialVersionUID = 1L;
+
protected Member address = null;
private String uniqueId = null;
private long timestamp = 0;
@@ -39,6 +41,7 @@ public class ClusterMessageBase implemen
private int compress = ClusterMessage.FLAG_DEFAULT ;
public ClusterMessageBase() {
+// NO-OP
}
/**
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java?rev=988509&r1=988508&r2=988509&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mcast/McastMember.java
Tue Aug 24 12:33:56 2010
@@ -31,6 +31,8 @@ import org.apache.catalina.cluster.io.XB
*/
public class McastMember implements Member, java.io.Serializable {
+private static final long serialVersionUID = 1L;
+
/**
* Digits, used for "superfast" de-serialization of an
* IP address
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java?rev=988509&r1=988508&r2=988509&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/membership/McastMember.java
Tue Aug 24 12:33:56 2010
@@ -31,6 +31,8 @@ import org.apache.catalina.cluster.io.XB
*/
public class McastMember implements Member, java.io.Serializable {
+private static final long serialVersionUID = 1L;
+
/**
* When a member leaves the cluster, the payload of the memberDisappeared
member
* will be the following bytes. This indicates a normal admin shutdown,
and not a crash
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988518 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml
Author: rjung Date: Tue Aug 24 13:03:04 2010 New Revision: 988518 URL: http://svn.apache.org/viewvc?rev=988518&view=rev Log: Add MBean for FarmWarDeployer. Port of r948258 from trunk. Added: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml (with props) Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988518&r1=988517&r2=988518&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:03:04 2010 @@ -32,6 +32,9 @@ +Add MBean for FarmWarDeployer. Port from trunk. (rjung) + + Add serialVersionUID to the serializable classes. (rjung) Added: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml?rev=988518&view=auto == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml (added) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml Tue Aug 24 13:03:04 2010 @@ -0,0 +1,52 @@ + + +http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> + + + + + + + + + Propchange: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml -- svn:eol-style = native Propchange: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/mbeans-descriptors.xml -- svn:keywords = Author Date Id Revision - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988520 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java
Author: rjung Date: Tue Aug 24 13:08:11 2010 New Revision: 988520 URL: http://svn.apache.org/viewvc?rev=988520&view=rev Log: Fix package name in info property. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988520&r1=988519&r2=988520&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:08:11 2010 @@ -32,6 +32,9 @@ +Fix package name in info property. (rjung) + + Add MBean for FarmWarDeployer. Port from trunk. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java?rev=988520&r1=988519&r2=988520&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ClusterSessionListener.java Tue Aug 24 13:08:11 2010 @@ -38,7 +38,7 @@ public class ClusterSessionListener exte /** * The descriptive information about this implementation. */ -protected static final String info = "org.apache.catalina.session.ClusterSessionListener/1.1"; +protected static final String info = "org.apache.catalina.cluster.session.ClusterSessionListener/1.1"; //--Constructor- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988528 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml src/share/org/apache/catalina/cluster/tcp/mbeans-des
Author: rjung Date: Tue Aug 24 13:21:02 2010 New Revision: 988528 URL: http://svn.apache.org/viewvc?rev=988528&view=rev Log: Remove unwanted line breaks from MBean descriptors. Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988528&r1=988527&r2=988528&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:21:02 2010 @@ -32,6 +32,9 @@ +Remove unwanted line breaks from MBean descriptors. (rjung) + + Fix package name in info property. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml?rev=988528&r1=988527&r2=988528&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml Tue Aug 24 13:21:02 2010 @@ -109,8 +109,7 @@ writeable="false"/> @@ -407,7 +405,7 @@ Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=988528&r1=988527&r2=988528&view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Tue Aug 24 13:21:02 2010 @@ -110,13 +110,11 @@ type="org.apache.catalina.cluster.tcp.SimpleTcpReplicationManager"> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988532 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Author: rjung
Date: Tue Aug 24 13:23:46 2010
New Revision: 988532
URL: http://svn.apache.org/viewvc?rev=988532&view=rev
Log:
BZ 49127: Don't swallow exceptions unnecessarily in
SimpleTcpReplicationManager.startInternal().
Backport of r964216 from trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988532&r1=988531&r2=988532&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:23:46 2010
@@ -32,6 +32,10 @@
+49127: Don't swallow exceptions unnecessarily in
+SimpleTcpReplicationManager.startInternal(). (rjung)
+
+
Remove unwanted line breaks from MBean descriptors. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=988532&r1=988531&r2=988532&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Tue Aug 24 13:23:46 2010
@@ -481,7 +481,7 @@ implements ClusterManager
do {
try {
Thread.sleep(100);
-}catch ( Exception sleep) {}
+} catch (InterruptedException sleep) { /* Ignore */ }
reqNow = System.currentTimeMillis();
isTimeout=((reqNow-reqStart)>(1000*60));
} while ( (!isStateTransferred()) && (!isTimeout));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
Author: mturk
Date: Tue Aug 24 13:33:18 2010
New Revision: 988537
URL: http://svn.apache.org/viewvc?rev=988537&view=rev
Log:
Allow using vedor APR that have lower then required version but required API
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/src/jnilib.c
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18 2010
@@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0104002"; then
-AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or newer
installed.)
+ if test "${decimal_apr_version}" -lt "0102000"; then
+AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or newer
installed.)
+ fi
+ if test "${decimal_apr_version}" -lt "0104000"; then
+AC_MSG_NOTICE(APR $sapr_version detected.)
fi
APR_BUILD_DIR="`$apr_config --installbuilddir`"
Modified: tomcat/native/trunk/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/src/jnilib.c (original)
+++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
@@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1400) {
+#if defined(HAVE_POOL_PRE_CLEANUP) && defined(HAVE_POLLSET_WAKEUP)
+/* Althugh not 1.4.x, APR has required functionality.
+ * Note that this is compile time definition, and we
+ * presume the required API's are present in the custom APR.
+ */
+#else
tcn_Throw(env, "Unupported APR version (%s)",
apr_version_string());
return JNI_ERR;
+#endif
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 12686] Unable to increase maxThreads in Coyote JK 2 connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=12686 --- Comment #2 from Federico White 2010-08-24 09:47:47 EDT --- Hello, Which release fixes this issue? I'm facing the same here. -- 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 12686] Unable to increase maxThreads in Coyote JK 2 connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=12686 --- Comment #3 from Chuck Caldarale 2010-08-24 09:53:29 EDT --- (In reply to comment #2) > Which release fixes this issue? I'm facing the same here. You resurrected a bug report that's been closed for nearly eight years concerning two products that haven't been supported for a long, long time. You might want to consider upgrading... -- 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: r988545 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java
Author: rjung
Date: Tue Aug 24 13:59:27 2010
New Revision: 988545
URL: http://svn.apache.org/viewvc?rev=988545&view=rev
Log:
Add Null check when CHANGE_SESSION_ID message received.
Backport of r982877 from trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988545&r1=988544&r2=988545&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:59:27 2010
@@ -32,6 +32,9 @@
+Add Null check when CHANGE_SESSION_ID message received. (rjung)
+
+
49127: Don't swallow exceptions unnecessarily in
SimpleTcpReplicationManager.startInternal(). (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=988545&r1=988544&r2=988545&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue Aug 24 13:59:27 2010
@@ -1716,13 +1716,15 @@ public class DeltaManager extends Cluste
protected void handleCHANGE_SESSION_ID(SessionMessage msg,Member sender)
throws IOException {
counterReceive_EVT_CHANGE_SESSION_ID++;
DeltaSession session = (DeltaSession) findSession(msg.getSessionID());
-String newSessionID = deserializeSessionId(msg.getSession());
-session.setPrimarySession(false);
-if(notifySessionListenersOnReplication) {
-session.setId(newSessionID);
-} else {
-session.setIdInternal(newSessionID);
-add(session);
+if (session != null) {
+String newSessionID = deserializeSessionId(msg.getSession());
+session.setPrimarySession(false);
+if(notifySessionListenersOnReplication) {
+session.setId(newSessionID);
+} else {
+session.setIdInternal(newSessionID);
+add(session);
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On 08/24/2010 03:33 PM, mt...@apache.org wrote:
> Author: mturk
> Date: Tue Aug 24 13:33:18 2010
> New Revision: 988537
>
> URL: http://svn.apache.org/viewvc?rev=988537&view=rev
> Log:
> Allow using vedor APR that have lower then required version but required API
>
> Modified:
> tomcat/native/trunk/native/build/tcnative.m4
> tomcat/native/trunk/native/src/jnilib.c
>
> Modified: tomcat/native/trunk/native/build/tcnative.m4
> URL:
> http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
> ==
> --- tomcat/native/trunk/native/build/tcnative.m4 (original)
> +++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18 2010
> @@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
>sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
>tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
>decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
> - if test "${decimal_apr_version}" -lt "0104002"; then
> -AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or newer
> installed.)
> + if test "${decimal_apr_version}" -lt "0102000"; then
> +AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or newer
> installed.)
> + fi
> + if test "${decimal_apr_version}" -lt "0104000"; then
> +AC_MSG_NOTICE(APR $sapr_version detected.)
>fi
>
>APR_BUILD_DIR="`$apr_config --installbuilddir`"
>
> Modified: tomcat/native/trunk/native/src/jnilib.c
> URL:
> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
> ==
> --- tomcat/native/trunk/native/src/jnilib.c (original)
> +++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
> @@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
> apr_version(&apv);
> apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
> if (apvn < 1400) {
> +#if defined(HAVE_POOL_PRE_CLEANUP) && defined(HAVE_POLLSET_WAKEUP)
But apr_pollset_wakeup() is not used even in trunk, so why?
Why not only HAVE_POLLSET_WAKEUP?
Cheers
Jean-Frederic
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49816] New: Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 Summary: Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status" Product: Tomcat 5 Version: 5.5.0 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: critical Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: whi...@avaya.com I have an issue where my Tomcat server is going down quite often with the following message: Aug 19, 2010 12:03:21 PM org.apache.tomcat.util.threads.ThreadPool logFull SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status Aug 20, 2010 4:47:20 PM org.apache.coyote.http11.Http11Protocol pause INFO: Pausing Coyote HTTP/1.1 on http-9602 Aug 20, 2010 4:47:21 PM org.apache.catalina.core.StandardService stop INFO: Stopping service website Aug 20, 2010 4:47:21 PM org.apache.coyote.http11.Http11Protocol destroy INFO: Stopping Coyote HTTP/1.1 on http-9602 The curious thing is My MaxTrheads settings are set to 100 instead 200 as the snippet says, so I wonder from where Apache is taking this "200" I suppose this might be a hardcoded message but I need you to confirm that apache is reading my xml or not. Server.website.xml Please let me know whether you have information about this issue and if there's any workaround/hotfix/release where I could get this working. Thanks in advance. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On 08/24/2010 04:07 PM, jean-frederic clere wrote:
> On 08/24/2010 03:33 PM, mt...@apache.org wrote:
>> Author: mturk
>> Date: Tue Aug 24 13:33:18 2010
>> New Revision: 988537
>>
>> URL: http://svn.apache.org/viewvc?rev=988537&view=rev
>> Log:
>> Allow using vedor APR that have lower then required version but required API
>>
>> Modified:
>> tomcat/native/trunk/native/build/tcnative.m4
>> tomcat/native/trunk/native/src/jnilib.c
>>
>> Modified: tomcat/native/trunk/native/build/tcnative.m4
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
>> ==
>> --- tomcat/native/trunk/native/build/tcnative.m4 (original)
>> +++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18 2010
>> @@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
>>sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
>>tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
>>decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
>> - if test "${decimal_apr_version}" -lt "0104002"; then
>> -AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or newer
>> installed.)
>> + if test "${decimal_apr_version}" -lt "0102000"; then
>> +AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or newer
>> installed.)
>> + fi
>> + if test "${decimal_apr_version}" -lt "0104000"; then
>> +AC_MSG_NOTICE(APR $sapr_version detected.)
>>fi
>>
>>APR_BUILD_DIR="`$apr_config --installbuilddir`"
>>
>> Modified: tomcat/native/trunk/native/src/jnilib.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
>> ==
>> --- tomcat/native/trunk/native/src/jnilib.c (original)
>> +++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
>> @@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
>> apr_version(&apv);
>> apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
>> if (apvn < 1400) {
>> +#if defined(HAVE_POOL_PRE_CLEANUP) && defined(HAVE_POLLSET_WAKEUP)
>
> But apr_pollset_wakeup() is not used even in trunk, so why?
> Why not only HAVE_POLLSET_WAKEUP?
Oops I meant: Why not only:
#if defined(HAVE_POOL_PRE_CLEANUP)
Cheers
Jean-Frederic
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49816] Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-08-24 10:16:16 EDT --- Bugzilla is not a support forum. Use the users mailing list. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988562 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ test/ test/src/share/org/apache/catalina/cluster/session/ test/src/share/org/apache/catalina/cluster/tcp/
Author: rjung
Date: Tue Aug 24 14:29:12 2010
New Revision: 988562
URL: http://svn.apache.org/viewvc?rev=988562&view=rev
Log:
Fix broken unit tests.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988562&r1=988561&r2=988562&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 14:29:12 2010
@@ -32,6 +32,9 @@
+Fix broken unit tests. (rjung)
+
+
Add Null check when CHANGE_SESSION_ID message received. (rjung)
Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=988562&r1=988561&r2=988562&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Tue Aug 24 14:29:12 2010
@@ -39,6 +39,7 @@
+
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java?rev=988562&r1=988561&r2=988562&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaManagerTest.java
Tue Aug 24 14:29:12 2010
@@ -39,6 +39,7 @@ public class DeltaManagerTest extends Te
public void testCreateSession() {
MockDeltaManager manager = new MockDeltaManager() ;
+manager.setContainer(new StandardContext());
Session session = manager.createSession(null,false);
assertNotNull(session.getId());
assertEquals(32, session.getId().length());
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java?rev=988562&r1=988561&r2=988562&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/session/DeltaSessionTest.java
Tue Aug 24 14:29:12 2010
@@ -20,6 +20,7 @@ package org.apache.catalina.cluster.sess
import junit.framework.TestCase;
import org.apache.catalina.Manager;
+import org.apache.catalina.core.StandardContext;
/**
* @author Peter Rossbach
@@ -30,6 +31,7 @@ public class DeltaSessionTest extends Te
public void testPrimarySessionisValid() {
DeltaManager manager = new DeltaManager() { public DeltaSession
getNewDeltaSession() { return new MockSession(this) ; } } ;
+manager.setContainer(new StandardContext());
manager.setMaxInactiveInterval(1);
MockSession session =
(MockSession)manager.createSession("hello",false);
assertTrue(session.isPrimarySession());
@@ -50,6 +52,7 @@ public class DeltaSessionTest extends Te
public void testBackupSessionisValid() {
DeltaManager manager = new DeltaManager() { public DeltaSession
getNewDeltaSession() { return new MockSession(this) ; } } ;
+manager.setContainer(new StandardContext());
manager.setMaxInactiveInterval(1);
MockSession session =
(MockSession)manager.createSession("hello",false);
session.setPrimarySession(false);
Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java?rev=988562&r1=988561&r2=988562&view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java
(original)
+++
tom
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On 08/24/2010 04:07 PM, jean-frederic clere wrote:
On 08/24/2010 03:33 PM, mt...@apache.org wrote:
Author: mturk
Date: Tue Aug 24 13:33:18 2010
New Revision: 988537
URL: http://svn.apache.org/viewvc?rev=988537&view=rev
Log:
Allow using vedor APR that have lower then required version but required API
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/src/jnilib.c
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18 2010
@@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0104002"; then
-AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or newer
installed.)
+ if test "${decimal_apr_version}" -lt "0102000"; then
+AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or newer
installed.)
+ fi
+ if test "${decimal_apr_version}" -lt "0104000"; then
+AC_MSG_NOTICE(APR $sapr_version detected.)
fi
APR_BUILD_DIR="`$apr_config --installbuilddir`"
Modified: tomcat/native/trunk/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/src/jnilib.c (original)
+++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
@@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn< 1400) {
+#if defined(HAVE_POOL_PRE_CLEANUP)&& defined(HAVE_POLLSET_WAKEUP)
But apr_pollset_wakeup() is not used even in trunk, so why?
Work in progress ...
Will be used in new Poll.interrupt API so we can remove all
that clumsy pollTime/maintainTime logic for adding new sockets
to the pollset.
It should lower the accept latency, remove the need for
socket add queue and remove unnecessary thread context switches.
Why not only HAVE_POLLSET_WAKEUP?
1.1.x branch will only check for HAVE_POOL_PRE_CLEANUP
while trunk will have WAKEUP check as well.
This is only for edge case where APR detected is lover
then required, while the vendor might still backport
the required functionality.
Regards
--
^TM
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49817] New: Apache service random outage
https://issues.apache.org/bugzilla/show_bug.cgi?id=49817 Summary: Apache service random outage Product: Tomcat 5 Version: 5.5.0 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: blocker Priority: P2 Component: Servlet & JSP API AssignedTo: dev@tomcat.apache.org ReportedBy: whi...@avaya.com Aug 19, 2010 12:03:21 PM org.apache.tomcat.util.threads.ThreadPool logFull SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status Aug 20, 2010 4:47:20 PM org.apache.coyote.http11.Http11Protocol pause INFO: Pausing Coyote HTTP/1.1 on http-9602 Aug 20, 2010 4:47:21 PM org.apache.catalina.core.StandardService stop INFO: Stopping service website Aug 20, 2010 4:47:21 PM org.apache.coyote.http11.Http11Protocol destroy INFO: Stopping Coyote HTTP/1.1 on http-9602 My MaxTrheads settings are set to 100 instead 200. -- 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 49817] Apache service random outage
https://issues.apache.org/bugzilla/show_bug.cgi?id=49817 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas 2010-08-24 10:39:27 EDT --- *** This bug has been marked as a duplicate of bug 49816 *** -- 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 49816] Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 --- Comment #2 from Mark Thomas 2010-08-24 10:39:28 EDT --- *** Bug 49817 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [g...@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
On 24/08/2010 11:13, Konstantin Kolinko wrote: > Testsuite: org.apache.catalina.authenticator.TestFormAuthenticator > Tests run: 5, Failures: 0, Errors: 3, Time elapsed: 216.974 sec > > (...) > > java.lang.NullPointerException > at > org.apache.catalina.startup.SimpleHttpClient.isResponse200(SimpleHttpClient.java:202) > at > org.apache.catalina.authenticator.TestFormAuthenticator.doTest(TestFormAuthenticator.java:59) > at > org.apache.catalina.authenticator.TestFormAuthenticator.testGet(TestFormAuthenticator.java:30) I think I have got to the bottom of this. The new tests appear to have stumbled over a bug in the NIO connector. I have a fix but want to do some more testing before I commit it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49816] Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 --- Comment #3 from Federico White 2010-08-24 10:47:50 EDT --- I understand "this is not a support" forum but I'm reporting a bug and providing all the snipets i've got from the product. Please i need a resolution for this. Regards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On Tue, 2010-08-24 at 16:30 +0200, Mladen Turk wrote: > Work in progress ... > Will be used in new Poll.interrupt API so we can remove all > that clumsy pollTime/maintainTime logic for adding new sockets > to the pollset. > It should lower the accept latency, remove the need for > socket add queue and remove unnecessary thread context switches. What is the usefulness of constantly interrupting polling ? Surely this will have a cost too. Right now, while polling is in progress, sockets are queued, and will be added all at once, which presumably will limit the amount of thread interactions that would require syncing (and only adding to the queue is synced, which could actually be optimized away by using some sort of concurrent structure, but unfortunately this is not so easy to write). Also, maintain does timeouts, which are not done by polling, I don't see how this can be dropped. So I don't understand how this can perform better, but feel free to experiment ;) Maybe on Windows it would yield something (without any accept filter/defer/whatever, it will suffer from the ms-scale latency, which is normally not a real world issue, but if it wasn't there it would be nicer), at the expense of the decent platforms. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49816] Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 --- Comment #4 from Federico White 2010-08-24 10:48:03 EDT --- I understand "this is not a support" forum but I'm reporting a bug and providing all the snipets i've got from the product. Please i need a resolution for this. Regards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On 08/24/2010 04:30 PM, Mladen Turk wrote:
> On 08/24/2010 04:07 PM, jean-frederic clere wrote:
>> On 08/24/2010 03:33 PM, mt...@apache.org wrote:
>>> Author: mturk
>>> Date: Tue Aug 24 13:33:18 2010
>>> New Revision: 988537
>>>
>>> URL: http://svn.apache.org/viewvc?rev=988537&view=rev
>>> Log:
>>> Allow using vedor APR that have lower then required version but
>>> required API
>>>
>>> Modified:
>>> tomcat/native/trunk/native/build/tcnative.m4
>>> tomcat/native/trunk/native/src/jnilib.c
>>>
>>> Modified: tomcat/native/trunk/native/build/tcnative.m4
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
>>>
>>> ==
>>>
>>> --- tomcat/native/trunk/native/build/tcnative.m4 (original)
>>> +++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18
>>> 2010
>>> @@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
>>> sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
>>> tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
>>> decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
>>> - if test "${decimal_apr_version}" -lt "0104002"; then
>>> -AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or
>>> newer installed.)
>>> + if test "${decimal_apr_version}" -lt "0102000"; then
>>> +AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or
>>> newer installed.)
>>> + fi
>>> + if test "${decimal_apr_version}" -lt "0104000"; then
>>> +AC_MSG_NOTICE(APR $sapr_version detected.)
>>> fi
>>>
>>> APR_BUILD_DIR="`$apr_config --installbuilddir`"
>>>
>>> Modified: tomcat/native/trunk/native/src/jnilib.c
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
>>>
>>> ==
>>>
>>> --- tomcat/native/trunk/native/src/jnilib.c (original)
>>> +++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
>>> @@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
>>> apr_version(&apv);
>>> apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
>>> if (apvn< 1400) {
>>> +#if defined(HAVE_POOL_PRE_CLEANUP)&& defined(HAVE_POLLSET_WAKEUP)
>>
>> But apr_pollset_wakeup() is not used even in trunk, so why?
>
> Work in progress ...
> Will be used in new Poll.interrupt API so we can remove all
> that clumsy pollTime/maintainTime logic for adding new sockets
> to the pollset.
> It should lower the accept latency, remove the need for
> socket add queue and remove unnecessary thread context switches.
Well the accept is done in a different thread anyway. Additionally with
defer accept we won't see any changes accept latency.
Cheers
Jean-Frederic
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49816] Tomcat service goin down randomly with the following message "SEVERE: All threads (200) are currently busy, waiting. Increase maxThreads (200) or check the servlet status"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49816 --- Comment #5 from Tim Funk 2010-08-24 10:57:57 EDT --- see http://wiki.apache.org/tomcat/FAQ/Bugs#USERLIST -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On Tue, 2010-08-24 at 16:56 +0200, jean-frederic clere wrote: > Well the accept is done in a different thread anyway. Additionally with > defer accept we won't see any changes accept latency. Indeed, no change. But Windows is different enough that it would need significantly different code to be completely optimal. But I don't care at all about Windows as long as things remains good enough (as I think it is right now), since without defer accept it will always be inferior anyway. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988537 - in /tomcat/native/trunk/native: build/tcnative.m4 src/jnilib.c
On 08/24/2010 04:56 PM, jean-frederic clere wrote:
On 08/24/2010 04:30 PM, Mladen Turk wrote:
On 08/24/2010 04:07 PM, jean-frederic clere wrote:
On 08/24/2010 03:33 PM, mt...@apache.org wrote:
Author: mturk
Date: Tue Aug 24 13:33:18 2010
New Revision: 988537
URL: http://svn.apache.org/viewvc?rev=988537&view=rev
Log:
Allow using vedor APR that have lower then required version but
required API
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/native/src/jnilib.c
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Tue Aug 24 13:33:18
2010
@@ -33,8 +33,11 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0104002"; then
-AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.2 or
newer installed.)
+ if test "${decimal_apr_version}" -lt "0102000"; then
+AC_MSG_ERROR(Found APR $sapr_version. You need version 1.2 or
newer installed.)
+ fi
+ if test "${decimal_apr_version}" -lt "0104000"; then
+AC_MSG_NOTICE(APR $sapr_version detected.)
fi
APR_BUILD_DIR="`$apr_config --installbuilddir`"
Modified: tomcat/native/trunk/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=988537&r1=988536&r2=988537&view=diff
==
--- tomcat/native/trunk/native/src/jnilib.c (original)
+++ tomcat/native/trunk/native/src/jnilib.c Tue Aug 24 13:33:18 2010
@@ -65,9 +65,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn< 1400) {
+#if defined(HAVE_POOL_PRE_CLEANUP)&& defined(HAVE_POLLSET_WAKEUP)
But apr_pollset_wakeup() is not used even in trunk, so why?
Work in progress ...
Will be used in new Poll.interrupt API so we can remove all
that clumsy pollTime/maintainTime logic for adding new sockets
to the pollset.
It should lower the accept latency, remove the need for
socket add queue and remove unnecessary thread context switches.
Well the accept is done in a different thread anyway. Additionally with
defer accept we won't see any changes accept latency.
Right, I didn't mean accept since we never put freshly
accepted sockets in the poll anyhow.
I meant adding accepted sockets for the first time after
the request was handled and marked for keepalive.
Currently we do a probe read cause the pollTime latency is
too high for directly using the pollset.
Also once when added to the queue the pollTime determines the
new request latency cause during the time when we add the
socket to the pollset we are presuming no new data will
arrive during the pollTime.
Whether this operation
socket->nonblock, read, socket->block, add to poll queue
is slower or faster then a apr_pollset_wakeup call is
IMO worth experimenting.
If it proves to have none or very low impact we just won't
use it.
Regards
--
^TM
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 8/24/2010 3:48 AM, Remy Maucherat wrote: > > I don't remember, but I guess I changed my mind then. Real world usage > difficulties mean it is very hard to require something newer than APR > 1.3. Nonsense, httpd 2.4 (now in beta as 2.3.6) requires APR. Forward looking releases, e.g. those in trunk, would be well served using the released apr 1.4 if they require new features in socket i/o handling. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r988409 - /tomcat/native/trunk/native/build/tcnative.m4
On 24.08.2010 17:58, William A. Rowe Jr. wrote: On 8/24/2010 3:48 AM, Remy Maucherat wrote: I don't remember, but I guess I changed my mind then. Real world usage difficulties mean it is very hard to require something newer than APR 1.3. Nonsense, httpd 2.4 (now in beta as 2.3.6) requires APR. Clarification: Bill wanted to say "APR 1.4". Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988645 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml
Author: markt
Date: Tue Aug 24 18:12:51 2010
New Revision: 988645
URL: http://svn.apache.org/viewvc?rev=988645&view=rev
Log:
Fix some edge cases in the NIO connector when handling requests that are not
received all at the same time and the socket needs to be returned to the poller.
This should fix the current Gump failures in the NIO tests.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=988645&r1=988644&r2=988645&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Aug
24 18:12:51 2010
@@ -308,13 +308,18 @@ public class Http11NioProcessor extends
socket.getIOChannel().socket().setSoTimeout((int)soTimeout);
}
if (!inputBuffer.parseRequestLine(keptAlive)) {
-//no data available yet, since we might have read part
-//of the request line, we can't recycle the processor
+// Haven't finished reading the request so keep the socket
+// open
openSocket = true;
-recycle = false;
+// Check to see if we have read any of the request line yet
if (inputBuffer.getParsingRequestLinePhase()<2) {
-//keep alive timeout here
+// No data read, OK to recycle the processor
+// Continue to use keep alive timeout
if (keepAliveTimeout>0)
ka.setTimeout(keepAliveTimeout);
+} else {
+// Started to read request line. Need to keep processor
+// associated with socket
+recycle = false;
}
break;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=988645&r1=988644&r2=988645&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Aug
24 18:12:51 2010
@@ -365,10 +365,8 @@ public class Http11NioProtocol extends A
SocketState state = processor.process(socket);
if (state == SocketState.LONG) {
-// Associate the connection with the processor. The next
request
-// processed by this thread will use either a new or a
recycled
-// processor.
-//if (log.isDebugEnabled()) log.debug("Not recycling
["+processor+"]
Comet="+((NioEndpoint.KeyAttachment)socket.getAttachment(false)).getComet());
+// In the middle of processing a request/response. Keep the
+// socket associated with the processor.
connections.put(socket, processor);
if (processor.comet) {
@@ -378,11 +376,15 @@ public class Http11NioProtocol extends A
NioEndpoint.KeyAttachment att =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
att.setAsync(true);
} else {
-//we should not hold on to the processor objects
-release(socket);
socket.getPoller().add(socket);
}
+} else if (state == SocketState.OPEN){
+// In keep-alive but between requests. OK to recycle
+// processor. Continue to poll for the next request.
+socket.getPoller().add(socket);
+recycledProcessors.offer(processor);
} else {
+// Connection closed. OK to recycle the processor.
recycledProcessors.offer(processor);
}
return state;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=988645&r1=988644&r2=988645&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 24 18:12:51 2010
@@ -92,6 +92,11 @@
Follow up to 48545. Make JSSE connectors more tolera
DO NOT REPLY [Bug 48738] [PATCH]Allow GzipOutputFilter to send partial result when flushBuffer() is called
https://issues.apache.org/bugzilla/show_bug.cgi?id=48738 Mark Thomas changed: What|Removed |Added Attachment #24979|0 |1 is obsolete|| --- Comment #3 from Mark Thomas 2010-08-24 14:59:52 EDT --- Created an attachment (id=25932) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25932) Port of TC7 patch for Tomact 6 I'll propose this patch for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988700 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Aug 24 20:09:12 2010 New Revision: 988700 URL: http://svn.apache.org/viewvc?rev=988700&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=988700&r1=988699&r2=988700&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 24 20:09:12 2010 @@ -176,3 +176,9 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2010-08-23-offline-extras-tc6.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48738 + Add flush support for gzip'd output + https://issues.apache.org/bugzilla/attachment.cgi?id=25932 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49667] JdbcLeakPrevention class can register unregistered JCBC Driver
https://issues.apache.org/bugzilla/show_bug.cgi?id=49667 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #2 from Mark Thomas 2010-08-24 16:51:04 EDT --- I don't see this error with the latest 7.0.x code. Please test with 7.0.2 and if you still see the issue please provide sample web applications and the exact steps to reproduce from a clean 7.0.2 install. -- 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: r988729 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Tue Aug 24 21:08:34 2010
New Revision: 988729
URL: http://svn.apache.org/viewvc?rev=988729&view=rev
Log:
Fix memory leak on context stop
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=988729&r1=988728&r2=988729&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Aug 24
21:08:34 2010
@@ -58,6 +58,7 @@ import org.apache.catalina.Globals;
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.Pipeline;
import org.apache.catalina.Valve;
@@ -299,6 +300,7 @@ public class ContextConfig
*
* @param event The lifecycle event that has occurred
*/
+@Override
public void lifecycleEvent(LifecycleEvent event) {
// Identify the context we are associated with
@@ -929,6 +931,12 @@ public class ContextConfig
Container[] children = context.findChildren();
for (i = 0; i < children.length; i++) {
context.removeChild(children[i]);
+try {
+children[i].destroy();
+} catch (LifecycleException e) {
+log.warn(sm.getString("contentConfig.destroyChildFailed",
+children[1].getName(), context.getName()), e);
+}
}
// Removing application parameters
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=988729&r1=988728&r2=988729&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Aug 24 21:08:34 2010
@@ -35,6 +35,7 @@ contextConfig.defaultError=Error process
contextConfig.defaultMissing=No global web.xml found
contextConfig.defaultPosition=Occurred at line {0} column {1}
contextConfig.destroy=ContextConfig: Destroying
+contentConfig.destroyChildFailed=Failed to destroy child [{0}] of context [{1}]
contextConfig.fileUrl=Unable to create a File object from the URL [{0}]
contextConfig.fixDocBase=Exception fixing docBase for context [{0}]
contextConfig.init=ContextConfig: Initializing
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=988729&r1=988728&r2=988729&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 24 21:08:34 2010
@@ -84,6 +84,11 @@
CSRF prevention filter did not correctly handle URLs that used anchors.
(markt)
+
+Fix memory leak on web application stopped caused by failed to
+de-register the web application's Servlets with the MBean server.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49745] Element Minimization and Empty Element Content
https://issues.apache.org/bugzilla/show_bug.cgi?id=49745 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-08-24 17:43:10 EDT --- This behaviour is required by the JSP specification. -- 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: r988735 - /tomcat/trunk/java/org/apache/tomcat/util/collections/
Author: markt Date: Tue Aug 24 21:45:46 2010 New Revision: 988735 URL: http://svn.apache.org/viewvc?rev=988735&view=rev Log: Remove empty package Removed: tomcat/trunk/java/org/apache/tomcat/util/collections/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49778] Inconsistent synchronization in SimplePool.java
https://issues.apache.org/bugzilla/show_bug.cgi?id=49778 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #6 from Mark Thomas 2010-08-24 17:47:52 EDT --- The class is deprecated an is not used anywhere. Note: It has been removed in Tomcat 7 -- 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: r988738 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Aug 24 21:57:27 2010 New Revision: 988738 URL: http://svn.apache.org/viewvc?rev=988738&view=rev Log: Another CRSF 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=988738&r1=988737&r2=988738&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 24 21:57:27 2010 @@ -117,6 +117,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=962872&view=rev http://svn.apache.org/viewvc?rev=962881&view=rev http://svn.apache.org/viewvc?rev=962900&view=rev + http://svn.apache.org/viewvc?rev=988448&view=rev +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a restored build of tomcat-6-trunk on ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/81 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: forced: by IRC user on channel #asftest: testing java Build Source Stamp: HEAD Blamelist: Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988817 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Author: mturk
Date: Wed Aug 25 05:51:33 2010
New Revision: 988817
URL: http://svn.apache.org/viewvc?rev=988817&view=rev
Log:
Simplify APR version requirement checks by calculating compound versions and
doing a simple compare
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=988817&r1=988816&r2=988817&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed
Aug 25 05:51:33 2010
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.res.String
/**
* Implementation of LifecycleListener that will init and
* and destroy APR.
- *
+ *
* @author Remy Maucherat
* @author Filip Hanik
* @version $Id$
@@ -83,7 +83,7 @@ public class AprLifecycleListener
}
return aprAvailable;
}
-
+
public AprLifecycleListener() {
instanceCreated = true;
}
@@ -141,11 +141,15 @@ public class AprLifecycleListener
int major = 0;
int minor = 0;
int patch = 0;
+int apver = 0;
+int rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
+int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_RECOMMENDED_PV;
+
if (aprInitialized) {
-return;
+return;
}
aprInitialized = true;
-
+
try {
String methodName = "initialize";
Class paramTypes[] = new Class[1];
@@ -158,14 +162,13 @@ public class AprLifecycleListener
major = clazz.getField("TCN_MAJOR_VERSION").getInt(null);
minor = clazz.getField("TCN_MINOR_VERSION").getInt(null);
patch = clazz.getField("TCN_PATCH_VERSION").getInt(null);
+apver = major * 1000 + minor * 100 + patch;
} catch (Throwable t) {
log.info(sm.getString("aprListener.aprInit",
System.getProperty("java.library.path")));
return;
}
-if ((major != TCN_REQUIRED_MAJOR) ||
-(minor < TCN_REQUIRED_MINOR) ||
-(minor == TCN_REQUIRED_MINOR && patch < TCN_REQUIRED_PATCH)) {
+if (apver < rqver) {
log.error(sm.getString("aprListener.tcnInvalid", major + "."
+ minor + "." + patch,
TCN_REQUIRED_MAJOR + "." +
@@ -173,15 +176,14 @@ public class AprLifecycleListener
TCN_REQUIRED_PATCH));
try {
// Terminate the APR in case the version
-// is below required.
+// is below required.
terminateAPR();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
return;
}
-if (minor < TCN_RECOMMENDED_MINOR ||
-(minor == TCN_RECOMMENDED_MINOR && patch <
TCN_RECOMMENDED_PV)) {
+if (apver < rcver) {
log.info(sm.getString("aprListener.tcnVersion", major + "."
+ minor + "." + patch,
TCN_REQUIRED_MAJOR + "." +
@@ -195,7 +197,7 @@ public class AprLifecycleListener
// Log APR flags
log.info(sm.getString("aprListener.flags",
Boolean.valueOf(Library.APR_HAVE_IPV6),
-Boolean.valueOf(Library.APR_HAS_SENDFILE),
+Boolean.valueOf(Library.APR_HAS_SENDFILE),
Boolean.valueOf(Library.APR_HAS_SO_ACCEPTFILTER),
Boolean.valueOf(Library.APR_HAS_RANDOM)));
aprAvailable = true;
@@ -223,13 +225,13 @@ public class AprLifecycleListener
Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
Method method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
-
+
methodName = "initialize";
paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
method = clazz.getMethod(methodName, paramTypes);
method.invoke(null, paramValues);
-
+
sslAvailable = true;
}
@@ -248,5 +250,5 @@ public class AprLifecycleListener
public void setSSLRandomSeed(String SSLRandomSeed) {
AprLifecycleListener.SSLRandomSeed = SSLRandomSeed;
}
-
+
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988821 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Wed Aug 25 06:10:55 2010 New Revision: 988821 URL: http://svn.apache.org/viewvc?rev=988821&view=rev Log: Propose a backport 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=988821&r1=988820&r2=988821&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 25 06:10:55 2010 @@ -183,3 +183,9 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=25932 +1: markt -1: + +* Backport r988817 from trunk which allows using tomcat-native + 1.2.x versions. + http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprver.patch + +1: mturk + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988822 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk
Date: Wed Aug 25 06:11:47 2010
New Revision: 988822
URL: http://svn.apache.org/viewvc?rev=988822&view=rev
Log:
Remove trailing spaces from the file
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=988822&r1=988821&r2=988822&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 25 06:11:47 2010
@@ -38,7 +38,7 @@ PATCHES PROPOSED TO BACKPORT:
+1: jfclere
-1: fhanik - easier to pass in the root path (lib/bin) to the macro instead
of hacking around it
if we remove the SCP auto feature, then there should be
something to replace it with
- (http://ant.apache.org/manual/OptionalTasks/scp.html)
+ (http://ant.apache.org/manual/OptionalTasks/scp.html)
+1: kkolinko: +1 for the updated patch (maven.patch.100711)
I still think that it is not so good to remove the old code of
,
because it ignores ${maven.repo.url} parameter provided by
deploy-snapshot,
@@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=936825
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936825.patch
+1: rjung
- -1:
+ -1:
-0: kkolinko: The patch itself is OK, but I think having a synonym will
cause confusion. I'd prefer not to invent a new name, but mention the
one that we already have when documenting virtualClasspath.
@@ -104,7 +104,7 @@ PATCHES PROPOSED TO BACKPORT:
This is a backport of: r950587, r950809, r951018, r951093, r951447,
r951892, r952295
+1: markt
- -1:
+ -1:
* Backport the CSRF prevention filter to Tomcat 6 and configure the Manager and
@@ -119,14 +119,14 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=962900&view=rev
http://svn.apache.org/viewvc?rev=988448&view=rev
+1: markt
- -1:
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49217
Ensure EL identifiers conform to the Java Language Specification with an
option to disable this check.
https://issues.apache.org/bugzilla/attachment.cgi?id=25727
+1: markt
- -1:
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49555
Correctly handle tag libraries that use functions defined in static inner
@@ -135,7 +135,7 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=963106&view=rev
http://svn.apache.org/viewvc?rev=966863&view=rev
+1: markt
- -1:
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49521
http://people.apache.org/~kkolinko/patches/2010-07-17_tc6_bug49521.patch
@@ -152,37 +152,37 @@ PATCHES PROPOSED TO BACKPORT:
using SSL. Patch provided by Sampo Savolainen.
http://svn.apache.org/viewvc?rev=966692&view=rev
+1: markt, kfujino
- -1:
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49674
Upgrade to Commons Daemon 1.0.3
http://svn.apache.org/viewvc?rev=981815&view=rev
+1: markt, kfujino
- -1:
+ -1:
* Add Null check when CHANGE_SESSION_ID message received.
http://svn.apache.org/viewvc?rev=982877&view=rev
+1: kfujino
- -1:
+ -1:
* Switch to using ecj.jar directly (smaller download, simpler build, same
result)
http://people.apache.org/~markt/patches/2010-08-23-ecj-tc6.patch
http://svn.apache.org/viewvc?rev=987896&view=rev
+1: markt
- -1:
+ -1:
* Allow off-line building of the extras packages. Also saves downloading deps
every build
http://people.apache.org/~markt/patches/2010-08-23-offline-extras-tc6.patch
+1: markt
- -1:
+ -1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48738
Add flush support for gzip'd output
https://issues.apache.org/bugzilla/attachment.cgi?id=25932
+1: markt
- -1:
+ -1:
* Backport r988817 from trunk which allows using tomcat-native
1.2.x versions.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988823 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: mturk Date: Wed Aug 25 06:14:31 2010 New Revision: 988823 URL: http://svn.apache.org/viewvc?rev=988823&view=rev Log: Vote for daemon 1.0.3 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=988823&r1=988822&r2=988823&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 25 06:14:31 2010 @@ -157,7 +157,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49674 Upgrade to Commons Daemon 1.0.3 http://svn.apache.org/viewvc?rev=981815&view=rev - +1: markt, kfujino + +1: markt, kfujino, mturk -1: * Add Null check when CHANGE_SESSION_ID message received. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
