svn commit: r1351954 - /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
Author: olamy
Date: Wed Jun 20 07:03:09 2012
New Revision: 1351954
URL: http://svn.apache.org/viewvc?rev=1351954&view=rev
Log:
upgrade archetype to use last selenium version
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml?rev=1351954&r1=1351953&r2=1351954&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-it/pom.xml
Wed Jun 20 07:03:09 2012
@@ -31,7 +31,7 @@
2.3
-2.23.1
+2.24.1
9898
http://localhost:${tomcat.port}/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351991 - in /tomcat/trunk: java/org/apache/catalina/valves/LocalStrings.properties java/org/apache/catalina/valves/StuckThreadDetectionValve.java java/org/apache/catalina/valves/mbeans-d
Author: kkolinko
Date: Wed Jun 20 08:36:07 2012
New Revision: 1351991
URL: http://svn.apache.org/viewvc?rev=1351991&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=50306
Improve StuckThreadDetectionValve:
- Add getStuckThreadNames() method, callable through JMX
- Add thread ids to the log messages
I also removed the @author tag, as that is against our policies.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1351991&r1=1351990&r2=1351991&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Wed
Jun 20 08:36:07 2012
@@ -47,8 +47,8 @@ sslValve.certError=Failed to process cer
sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
#Stuck thread detection Valve
-stuckThreadDetectionValve.notifyStuckThreadDetected=Thread "{0}" has been
active for {1} milliseconds (since {2}) to serve the same request for {4} and
may be stuck (configured threshold for this StuckThreadDetectionValve is {5}
seconds). There is/are {3} thread(s) in total that are monitored by this Valve
and may be stuck.
-stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
+stuckThreadDetectionValve.notifyStuckThreadDetected=Thread "{0}" (id={6}) has
been active for {1} milliseconds (since {2}) to serve the same request for {4}
and may be stuck (configured threshold for this StuckThreadDetectionValve is
{5} seconds). There is/are {3} thread(s) in total that are monitored by this
Valve and may be stuck.
+stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
# HTTP status reports
http.100=The client may continue ({0}).
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1351991&r1=1351990&r2=1351991&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Wed Jun 20 08:36:07 2012
@@ -35,12 +35,8 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.res.StringManager;
/**
- * This valve allows to detect requests that take a long time to process,
which might
- * indicate that the thread that is processing it is stuck.
- * Based on code proposed by TomLu in Bugzilla entry #50306
- *
- * @author slaurent
- *
+ * This valve allows to detect requests that take a long time to process, which
+ * might indicate that the thread that is processing it is stuck.
*/
public class StuckThreadDetectionValve extends ValveBase {
@@ -123,10 +119,14 @@ public class StuckThreadDetectionValve e
if (log.isWarnEnabled()) {
String msg = sm.getString(
"stuckThreadDetectionValve.notifyStuckThreadDetected",
-monitoredThread.getThread().getName(),
Long.valueOf(activeTime),
+monitoredThread.getThread().getName(),
+Long.valueOf(activeTime),
monitoredThread.getStartTime(),
Integer.valueOf(numStuckThreads),
-monitoredThread.getRequestUri(), Integer.valueOf(threshold));
+monitoredThread.getRequestUri(),
+Integer.valueOf(threshold),
+String.valueOf(monitoredThread.getThread().getId())
+);
// msg += "\n" + getStackTraceAsString(trace);
Throwable th = new Throwable();
th.setStackTrace(monitoredThread.getThread().getStackTrace());
@@ -134,13 +134,15 @@ public class StuckThreadDetectionValve e
}
}
-private void notifyStuckThreadCompleted(String threadName,
-long activeTime, int numStuckThreads) {
+private void notifyStuckThreadCompleted(CompletedS
svn commit: r1351993 - /tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
Author: kkolinko
Date: Wed Jun 20 08:44:31 2012
New Revision: 1351993
URL: http://svn.apache.org/viewvc?rev=1351993&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=50306
Followup to r1351991: Update Spanish LocalStrings file as well.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1351993&r1=1351992&r2=1351993&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties Wed
Jun 20 08:44:31 2012
@@ -32,8 +32,8 @@ errorReportValve.rootCauseInLogs = La tr
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el
puerto en cabecera HTTP [{1}]
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear
un objeto java.security.cert.X509Certificate
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto
asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden
procesar los datos del certificado.
-stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" ha estado
activo durante {1} miilisegundos (desde {2}) para servir el mismo requerimiento
para {4} y puede estar atascado (el umbral configurado para este
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son
monitorizados por esta V\u00E1lvula y pueden estar atascados.
-stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}", que
previamente se report\u00F3 como atascado, se ha completado. Estuvo activo por
aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} hilo(s)
que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" (id={6})
ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo
requerimiento para {4} y puede estar atascado (el umbral configurado para este
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son
monitorizados por esta V\u00E1lvula y pueden estar atascados.
+stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}),
que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo
por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2}
hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
# HTTP status reports
http.100 = El cliente puede continuar ({0}).
http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la
cabecera "Upgrade" ({0}).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1351997 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/
Author: kkolinko
Date: Wed Jun 20 08:55:40 2012
New Revision: 1351997
URL: http://svn.apache.org/viewvc?rev=1351997&view=rev
Log:
Merged revisions r1351991, r1351993 from tomcat/trunk:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=50306
Improve StuckThreadDetectionValve:
- Add getStuckThreadNames() method, callable through JMX
- Add thread ids to the log messages
I also removed the @author tag, as that is against our policies.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1351991,1351993
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1351997&r1=1351996&r2=1351997&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Wed Jun 20 08:55:40 2012
@@ -52,8 +52,8 @@ sslValve.certError=Failed to process cer
sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
#Stuck thread detection Valve
-stuckThreadDetectionValve.notifyStuckThreadDetected=Thread "{0}" has been
active for {1} milliseconds (since {2}) to serve the same request for {4} and
may be stuck (configured threshold for this StuckThreadDetectionValve is {5}
seconds). There is/are {3} thread(s) in total that are monitored by this Valve
and may be stuck.
-stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
+stuckThreadDetectionValve.notifyStuckThreadDetected=Thread "{0}" (id={6}) has
been active for {1} milliseconds (since {2}) to serve the same request for {4}
and may be stuck (configured threshold for this StuckThreadDetectionValve is
{5} seconds). There is/are {3} thread(s) in total that are monitored by this
Valve and may be stuck.
+stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
# HTTP status reports
http.100=The client may continue ({0}).
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1351997&r1=1351996&r2=1351997&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
Wed Jun 20 08:55:40 2012
@@ -37,8 +37,8 @@ remoteIpValve.syntax = Se han suministra
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el
puerto en cabecera HTTP [{1}]
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear
un objeto java.security.cert.X509Certificate
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto
asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden
procesar los datos del certificado.
-stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" ha estado
activo durante {1} miilisegundos (desde {2}) para servir el mismo requerimiento
para {4} y puede estar atascado (el umbral configurado para este
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son
monitorizados por esta V\u00E1lvula y pueden estar atascados.
-stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}", que
previamente se report\u00F3 como atascado, se ha completado. Estuvo activo por
aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2} hilo(s)
que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" (id={6})
ha estado activo durante {1} miilisegundos (desde {2}
[Bug 50306] Detect stuck threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=50306 Konstantin Kolinko changed: What|Removed |Added Attachment #28961|0 |1 is obsolete|| --- Comment #12 from Konstantin Kolinko --- Created attachment 28966 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28966&action=edit 2012-06-20_tc6_50306_StuckThreadDetectionValve.patch Updated documentation and MBean description, aligning proposed patch with Tomcat 7. -- 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: r1352000 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Jun 20 09:09:50 2012 New Revision: 1352000 URL: http://svn.apache.org/viewvc?rev=1352000&view=rev Log: Update proposed 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=1352000&r1=1351999&r2=1352000&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 20 09:09:50 2012 @@ -233,7 +233,7 @@ PATCHES PROPOSED TO BACKPORT: take a long time to process, which might indicate that their processing threads are stuck. Based on a patch provided by TomLu. Patch: - https://issues.apache.org/bugzilla/attachment.cgi?id=28961 + https://issues.apache.org/bugzilla/attachment.cgi?id=28966 Eol-Style: svn propset svn:eol-style native java/org/apache/catalina/valves/StuckThreadDetectionValve.java +1: kkolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352011 - /tomcat/trunk/webapps/docs/config/realm.xml
Author: kkolinko Date: Wed Jun 20 09:31:22 2012 New Revision: 1352011 URL: http://svn.apache.org/viewvc?rev=1352011&view=rev Log: Correct description of UserDatabaseRealm Modified: tomcat/trunk/webapps/docs/config/realm.xml Modified: tomcat/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1352011&r1=1352010&r2=1352011&view=diff == --- tomcat/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/trunk/webapps/docs/config/realm.xml Wed Jun 20 09:31:22 2012 @@ -613,7 +613,7 @@ that is based on a UserDatabase resource made available through the global JNDI resources configured for this Tomcat instance. -The Memory Based Realm implementation supports the following +The UserDatabase Realm implementation supports the following additional attributes: @@ -632,8 +632,8 @@ -The name of the resource that this realm will use for user, password -and role information. +The name of the global UserDatabase resource +that this realm will use for user, password and role information. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352013 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/realm.xml
Author: kkolinko Date: Wed Jun 20 09:35:25 2012 New Revision: 1352013 URL: http://svn.apache.org/viewvc?rev=1352013&view=rev Log: Merged revision 1352011 from tomcat/trunk: Correct description of UserDatabaseRealm Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1352011 Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml?rev=1352013&r1=1352012&r2=1352013&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/realm.xml Wed Jun 20 09:35:25 2012 @@ -613,7 +613,7 @@ that is based on a UserDatabase resource made available through the global JNDI resources configured for this Tomcat instance. -The Memory Based Realm implementation supports the following +The UserDatabase Realm implementation supports the following additional attributes: @@ -632,8 +632,8 @@ -The name of the resource that this realm will use for user, password -and role information. +The name of the global UserDatabase resource +that this realm will use for user, password and role information. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352017 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/config/realm.xml
Author: kkolinko Date: Wed Jun 20 09:40:58 2012 New Revision: 1352017 URL: http://svn.apache.org/viewvc?rev=1352017&view=rev Log: CTR: docs Merged revision 1352011 from tomcat/trunk: Correct description of UserDatabaseRealm Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1352011 Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml?rev=1352017&r1=1352016&r2=1352017&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Wed Jun 20 09:40:58 2012 @@ -556,7 +556,7 @@ that is based on a UserDatabase resource made available through the global JNDI resources configured for this Tomcat instance. -The Memory Based Realm implementation supports the following +The UserDatabase Realm implementation supports the following additional attributes: @@ -575,8 +575,8 @@ -The name of the resource that this realm will use for user, password -and role information. +The name of the global UserDatabase resource +that this realm will use for user, password and role information. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352026 - /tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml
Author: kkolinko Date: Wed Jun 20 09:51:04 2012 New Revision: 1352026 URL: http://svn.apache.org/viewvc?rev=1352026&view=rev Log: CTR: docs Correct description of UserDatabaseRealm and remove duplicate one. Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml?rev=1352026&r1=1352025&r2=1352026&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/realm.xml Wed Jun 20 09:51:04 2012 @@ -506,7 +506,7 @@ that is based on a UserDatabase resource made available through the global JNDI resources configured for this Tomcat instance. -The Memory Based Realm implementation supports the following +The UserDatabase Realm implementation supports the following additional attributes: @@ -525,8 +525,8 @@ -The name of the resource that this realm will use for user, password -and role information. +The name of the global UserDatabase resource +that this realm will use for user, password and role information. @@ -604,32 +604,6 @@ - - -The User Database Realm is Realm implementation -that is based on an implementation of the UserDatabase -interface that is made available through the global JNDI resources -configured for this Tomcat instance. - -The User Database Realm implementation supports the following -additional attributes: - - - - -The global JNDI name of the UserDatabase resource -used by this Realm. - - - - -See the Container-Managed Security Guide for more -information on setting up container managed security using the -UserDatabase Realm component. - - - - The JAAS Realm implementation supports the following additional - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/690 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1352013 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352043 - in /tomcat/site/trunk: docs/svn.html xdocs/svn.xml
Author: kkolinko Date: Wed Jun 20 10:56:12 2012 New Revision: 1352043 URL: http://svn.apache.org/viewvc?rev=1352043&view=rev Log: Add answers to several frequent questions regarding the Git mirrors. Modified: tomcat/site/trunk/docs/svn.html tomcat/site/trunk/xdocs/svn.xml Modified: tomcat/site/trunk/docs/svn.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1352043&r1=1352042&r2=1352043&view=diff == --- tomcat/site/trunk/docs/svn.html (original) +++ tomcat/site/trunk/docs/svn.html Wed Jun 20 10:56:12 2012 @@ -418,6 +418,31 @@ its projects. See http://git.ap + +Several notes for the users of Git: + + + + +The Git repositories at http://git.apache.org/";>http://git.apache.org/ +and their clones at GitHub are only mirrors. The official code repository +is the Subversion one, documented above. + +The Git mirrors do not have support for the svn:externals +property. +A consequence of this is that the tomcat70.git repository +lacks the source code for the jdbc-pool module. The code comes +from certain revision of Tomcat trunk, as configured by the +svn:externals property that is set on the modules +directory. +To be able to build Tomcat 7, you have to get the missing source code, e.g. +from a source archive of a released version of Tomcat 7. + +To propose a patch, please follow general patch submission guidelines, +documented on the Bug Database page. + + + Modified: tomcat/site/trunk/xdocs/svn.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1352043&r1=1352042&r2=1352043&view=diff == --- tomcat/site/trunk/xdocs/svn.xml (original) +++ tomcat/site/trunk/xdocs/svn.xml Wed Jun 20 10:56:12 2012 @@ -124,6 +124,24 @@ http://svn.apache.org/repos/asf/tomcatThe Apache Software Foundation provides read-only Git mirrors for its projects. See http://git.apache.org/";>http://git.apache.org/ +Several notes for the users of Git: + + + The Git repositories at http://git.apache.org/";>http://git.apache.org/ +and their clones at GitHub are only mirrors. The official code repository +is the Subversion one, documented above. + The Git mirrors do not have support for the svn:externals +property. +A consequence of this is that the tomcat70.git repository +lacks the source code for the jdbc-pool module. The code comes +from certain revision of Tomcat trunk, as configured by the +svn:externals property that is set on the modules +directory. +To be able to build Tomcat 7, you have to get the missing source code, e.g. +from a source archive of a released version of Tomcat 7. + To propose a patch, please follow general patch submission guidelines, +documented on the Bug Database page. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352056 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Wed Jun 20 12:27:55 2012
New Revision: 1352056
URL: http://svn.apache.org/viewvc?rev=1352056&view=rev
Log:
getURI() and getURL() do exactly the same thing. Further the encoded parameter
of getURL() does not effect the output.
Deprecate getURL() and use getURI() instead.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1352056&r1=1352055&r2=1352056&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Jun
20 12:27:55 2012
@@ -1775,11 +1775,11 @@ public class WebappClassLoader
off = externalsLength;
}
for (i = 0; i < filesLength; i++) {
-urls[off + i] = getURL(files[i], true);
+urls[off + i] = getURI(files[i]);
}
off += filesLength;
for (i = 0; i < jarFilesLength; i++) {
-urls[off + i] = getURL(jarRealFiles[i], true);
+urls[off + i] = getURI(jarRealFiles[i]);
}
off += jarFilesLength;
if (!searchExternalFirst) {
@@ -2928,7 +2928,7 @@ public class WebappClassLoader
ResourceEntry entry = new ResourceEntry();
try {
entry.source = getURI(new File(file, path));
-entry.codeBase = getURL(new File(file, path), false);
+entry.codeBase = entry.source;
} catch (MalformedURLException e) {
return null;
}
@@ -3062,8 +3062,8 @@ public class WebappClassLoader
entry = new ResourceEntry();
try {
-entry.codeBase = getURL(jarRealFiles[i], false);
-String jarFakeUrl =
getURI(jarRealFiles[i]).toString();
+entry.codeBase = getURI(jarRealFiles[i]);
+String jarFakeUrl = entry.codeBase.toString();
jarFakeUrl = "jar:" + jarFakeUrl + "!/" + path;
entry.source = new URL(jarFakeUrl);
entry.lastModified =
jarRealFiles[i].lastModified();
@@ -3449,7 +3449,9 @@ public class WebappClassLoader
/**
* Get URL.
+ * @deprecated Use {@link #getURI(File)} instead
*/
+@Deprecated
protected URL getURL(File file, boolean encoded)
throws MalformedURLException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352057 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Wed Jun 20 12:28:23 2012
New Revision: 1352057
URL: http://svn.apache.org/viewvc?rev=1352057&view=rev
Log:
Remove deprecated code.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1352057&r1=1352056&r2=1352057&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Jun
20 12:28:23 2012
@@ -3449,28 +3449,6 @@ public class WebappClassLoader
/**
* Get URL.
- * @deprecated Use {@link #getURI(File)} instead
- */
-@Deprecated
-protected URL getURL(File file, boolean encoded)
-throws MalformedURLException {
-
-File realFile = file;
-try {
-realFile = realFile.getCanonicalFile();
-} catch (IOException e) {
-// Ignore
-}
-if(encoded) {
-return getURI(realFile);
-}
-
-return realFile.toURI().toURL();
-}
-
-
-/**
- * Get URL.
*/
protected URL getURI(File file)
throws MalformedURLException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352059 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Wed Jun 20 12:28:55 2012
New Revision: 1352059
URL: http://svn.apache.org/viewvc?rev=1352059&view=rev
Log:
Better comment
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1352059&r1=1352058&r2=1352059&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Jun
20 12:28:55 2012
@@ -3448,7 +3448,7 @@ public class WebappClassLoader
/**
- * Get URL.
+ * Get the URI for the given file.
*/
protected URL getURI(File file)
throws MalformedURLException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1352066 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Wed Jun 20 12:36:39 2012
New Revision: 1352066
URL: http://svn.apache.org/viewvc?rev=1352066&view=rev
Log:
Port clean-up from trunk
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1352056,1352059
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1352066&r1=1352065&r2=1352066&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Wed Jun 20 12:36:39 2012
@@ -1775,11 +1775,11 @@ public class WebappClassLoader
off = externalsLength;
}
for (i = 0; i < filesLength; i++) {
-urls[off + i] = getURL(files[i], true);
+urls[off + i] = getURI(files[i]);
}
off += filesLength;
for (i = 0; i < jarFilesLength; i++) {
-urls[off + i] = getURL(jarRealFiles[i], true);
+urls[off + i] = getURI(jarRealFiles[i]);
}
off += jarFilesLength;
if (!searchExternalFirst) {
@@ -2928,7 +2928,7 @@ public class WebappClassLoader
ResourceEntry entry = new ResourceEntry();
try {
entry.source = getURI(new File(file, path));
-entry.codeBase = getURL(new File(file, path), false);
+entry.codeBase = entry.source;
} catch (MalformedURLException e) {
return null;
}
@@ -3062,8 +3062,8 @@ public class WebappClassLoader
entry = new ResourceEntry();
try {
-entry.codeBase = getURL(jarRealFiles[i], false);
-String jarFakeUrl =
getURI(jarRealFiles[i]).toString();
+entry.codeBase = getURI(jarRealFiles[i]);
+String jarFakeUrl = entry.codeBase.toString();
jarFakeUrl = "jar:" + jarFakeUrl + "!/" + path;
entry.source = new URL(jarFakeUrl);
entry.lastModified =
jarRealFiles[i].lastModified();
@@ -3449,7 +3449,9 @@ public class WebappClassLoader
/**
* Get URL.
+ * @deprecated Use {@link #getURI(File)} instead
*/
+@Deprecated
protected URL getURL(File file, boolean encoded)
throws MalformedURLException {
@@ -3468,7 +3470,7 @@ public class WebappClassLoader
/**
- * Get URL.
+ * Get the URI for the given file.
*/
protected URL getURI(File file)
throws MalformedURLException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-163) No undeploy goal
Tony Chemit created MTOMCAT-163: --- Summary: No undeploy goal Key: MTOMCAT-163 URL: https://issues.apache.org/jira/browse/MTOMCAT-163 Project: Apache Tomcat Maven Plugin Issue Type: New Feature Components: tomcat7 Affects Versions: 2.0-beta-1 Reporter: Tony Chemit Assignee: Olivier Lamy (*$^¨%`£) in tomcat6-m-p there is a undeploy goal but no more in tomcat7 plugin. I understand that undeploy function is now no more accessible via the /manager/html but only via the /manager/text. I see one problem to fix this : - The manager url (via the AbstractCatalinaMojo#url field) is common to all mojo and by default is setted to /manager/html. Should we use instead two fields : - one for tomcat manager url (http://localhost:8080/manager) (common to all mojo) - one for type of manager to use html in some mojo case, text in other cases ? -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-163) No undeploy goal
[ https://issues.apache.org/jira/browse/MTOMCAT-163?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tony Chemit updated MTOMCAT-163: Attachment: MTOMCAT-163__No_undeploy_goal.diff Patch with undeploy mojo for tomcat7-m-p + usage of /manager/text in AbstractCatalinaMojo (not the best way to do it FMHO). > No undeploy goal > > > Key: MTOMCAT-163 > URL: https://issues.apache.org/jira/browse/MTOMCAT-163 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature > Components: tomcat7 >Affects Versions: 2.0-beta-1 >Reporter: Tony Chemit >Assignee: Olivier Lamy (*$^¨%`£) > Attachments: MTOMCAT-163__No_undeploy_goal.diff > > Original Estimate: 2h > Remaining Estimate: 2h > > in tomcat6-m-p there is a undeploy goal but no more in tomcat7 plugin. > I understand that undeploy function is now no more accessible via the > /manager/html but only via the /manager/text. > I see one problem to fix this : > - The manager url (via the AbstractCatalinaMojo#url field) is common to all > mojo and by default is setted to /manager/html. > Should we use instead two fields : > - one for tomcat manager url (http://localhost:8080/manager) (common to all > mojo) > - one for type of manager to use html in some mojo case, text in other cases ? -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/691 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1352066 Blamelist: markt Build succeeded! sincerely, -The Buildbot
[jira] [Created] (MTOMCAT-164) Add french translation
Tony Chemit created MTOMCAT-164: --- Summary: Add french translation Key: MTOMCAT-164 URL: https://issues.apache.org/jira/browse/MTOMCAT-164 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Components: commons-lib Affects Versions: 2.0-beta-1 Reporter: Tony Chemit Assignee: Olivier Lamy (*$^¨%`£) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-164) Add french translation
[ https://issues.apache.org/jira/browse/MTOMCAT-164?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tony Chemit updated MTOMCAT-164: Attachment: MTOMCAT-164.diff A first flush of them. > Add french translation > -- > > Key: MTOMCAT-164 > URL: https://issues.apache.org/jira/browse/MTOMCAT-164 > Project: Apache Tomcat Maven Plugin > Issue Type: Improvement > Components: commons-lib >Affects Versions: 2.0-beta-1 >Reporter: Tony Chemit >Assignee: Olivier Lamy (*$^¨%`£) > Attachments: MTOMCAT-164.diff > > Original Estimate: 1h > Remaining Estimate: 1h > -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53393] tomcat-connectors-1.2.37-src Crashing web server segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=53393 --- Comment #7 from William A. Rowe Jr. --- Please see comment #2 on how to convert the core dump you attached into a gdb backtrace (e.g. 'thread apply all bt') so we can see the full picture relative to what your machine knows about its installation. Without the actual binaries corresponding to your installation, unwinding that backtrace is non-trivial. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53445] New: Support consistent Jmx object naming strategy across managed resources
https://issues.apache.org/bugzilla/show_bug.cgi?id=53445 Priority: P2 Bug ID: 53445 Assignee: dev@tomcat.apache.org Summary: Support consistent Jmx object naming strategy across managed resources Severity: enhancement Classification: Unclassified Reporter: alexfran...@gmail.com Hardware: PC Status: NEW Version: unspecified Component: jdbc-pool Product: Tomcat Modules Tomcat JDBC Pool Versions tested: 7.0.27 & 7.0.28 More of an inquiry. Let me preface by saying we have recently adopted this pool and are very pleased so far. Currently, Jmx managed resources like ConnectionPool and SlowQueryReportJmx are registered under the same domain (i.e. tomcat.jdbc). Some users may want to employ an alternate object naming strategy. With DataSource#createObjectName it is relatively easy to change the ConnectionPool ObjectName (i.e. subclass). However, with SlowQueryReportJmx, due to a static getObjectName method, it requires overriding additional methods which is less desirable. It appears that ConnectionPool has a constant POOL_JMX_TYPE_PREFIX. SlowQueryReportJmx appears to use this but DataSource does not? Is there any reason that the SlowQueryReportJmx#getObjectName method is static? What about registering an object naming strategy with the pool that the various components would use, facilitating consistency? This would mitigate the need to override just to alter the ObjectName. Reference: Spring MBean exporters and their ObjectNamingStrategy interface. Thanks. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53393] tomcat-connectors-1.2.37-src Crashing web server segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=53393
satyapal changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |INVALID
--- Comment #8 from satyapal ---
Marking this bug as invalid because the problem is not with mod_jk the problem
is with Mod_auth_cas, Mod_auth_cas is crashing the web server i found this in
stack trace
[pid 10098] <... stat resumed> {st_mode=S_IFDIR|0750, st_size=143360, ...}) = 0
[pid 10099] read(18, "GET /core/js/optimus.js HTTP/1.1"..., 8000) = 423
[pid 10098]
open("/var/cache/apache2/mod_auth_cas/02ca9bb8b348fd1dfff7ba6545a79930",
O_RDONLY|O_CLOEXEC) = 19
[pid 10099] mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS,
-1, 0
[pid 10098] fcntl(19, F_SETLKW, {type=F_RDLCK, whence=SEEK_SET, start=0, len=0}
[pid 10099] <... mmap resumed> )= 0x7f90143bd000
[pid 10098] <... fcntl resumed> ) = 0
[pid 10098] lseek(19, 0, SEEK_SET
[pid 10099] stat("/var/cache/apache2/mod_auth_cas/",
[pid 10098] <... lseek resumed> ) = 0
[pid 10099] <... stat resumed> {st_mode=S_IFDIR|0750, st_size=143360, ...}) = 0
[pid 10099]
open("/var/cache/apache2/mod_auth_cas/02ca9bb8b348fd1dfff7ba6545a79930",
O_RDONLY|O_CLOEXEC
[pid 10098] read(19,
[pid 10099] <... open resumed> )= 20
[pid 10098] <... read resumed> "", 1024) = 0
[pid 10099] fcntl(20, F_SETLKW, {type=F_RDLCK, whence=SEEK_SET, start=0,
len=0}) = 0
[pid 10098] --- SIGSEGV (Segmentation fault) @ 0 (0) ---
so i compiled latest version of mod_auth_cas from source using
apxs2 -i -lssl -lcurl -c mod_auth_cas.c
and now it's working fine.
--
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
