svn commit: r884887 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Author: markt
Date: Fri Nov 27 14:55:26 2009
New Revision: 884887
URL: http://svn.apache.org/viewvc?rev=884887&view=rev
Log:
Double-check getResource() works as intended after report of issue with Grails
(http://jira.codehaus.org/browse/GRAILS-5038)
All seems OK. Maybe a Grails issue?
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=884887&r1=884886&r2=884887&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Fri Nov 27
14:55:26 2009
@@ -18,7 +18,11 @@
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.net.URL;
+import java.net.URLConnection;
import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
@@ -95,8 +99,33 @@
if (url == null) {
res.getWriter().write("null");
} else {
-res.getWriter().write(url.toString());
+res.getWriter().write(url.toString() + "\n");
+res.getWriter().write("The first 20 characters of that
resource are:\n");
+
+// Read some content from the resource
+URLConnection conn = url.openConnection();
+
+InputStream is = null;
+Reader reader = null;
+char cbuf[] = new char[20];
+try {
+is = conn.getInputStream();
+reader = new InputStreamReader(is);
+reader.read(cbuf);
+res.getWriter().write(cbuf);
+} finally {
+if (reader != null) {
+try { reader.close(); } catch(IOException ioe)
{/*Ignore*/}
+}
+if (is != null) {
+try { is.close(); } catch(IOException ioe) {/*Ignore*/}
+}
+}
+
+
}
+
+
}
}
@@ -242,9 +271,12 @@
tomcat.start();
+ByteChunk res = new ByteChunk();
+
int rc =getUrl("http://localhost:"; + getPort() + contextPath +
-"/testGetResource", new ByteChunk(), null);
+"/testGetResource", res, null);
assertEquals(HttpServletResponse.SC_OK, rc);
+assertTrue(res.toString().contains("
Undefined variables
Hello,
there are undefined variables firstName and lastName at the
http://localhost:8081/examples/servlets/reqparams.html. Isn't it an error:
Source Code for Request Parameter Example
import java.io.*;
import java.util.*;
import javax.servlet.*;
import javax.servlet.http.*;
public class RequestParamExample extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("");
out.println("");
out.println("Request Parameters Example");
out.println("");
out.println("");
out.println("Request Parameters Example");
out.println("Parameters in this request:");
if (firstName != null || lastName != null) {
out.println("First Name:");
out.println(" = " + HTMLFilter.filter(firstName) + "");
out.println("Last Name:");
out.println(" = " + HTMLFilter.filter(lastName));
} else {
out.println("No Parameters, Please enter some");
}
out.println("");
out.print("");
out.println("First Name:");
out.println("");
out.println("");
out.println("Last Name:");
out.println("");
out.println("");
out.println("");
out.println("");
out.println("");
out.println("");
}
public void doPost(HttpServletRequest request, HttpServletResponse res)
throws IOException, ServletException
{
doGet(request, response);
}
}
Leopold Marek
Tel.: +420 724 362 641
E-mail: le1ma...@atlas.cz
svn commit: r884905 - in /tomcat/trunk/java/org/apache/catalina: core/LocalStrings_fr.properties manager/LocalStrings_fr.properties session/LocalStrings_fr.properties
Author: markt
Date: Fri Nov 27 16:53:37 2009
New Revision: 884905
URL: http://svn.apache.org/viewvc?rev=884905&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48295
Correct French translations.
Patch provided by Marc Paquette
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=884905&r1=884904&r2=884905&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Fri
Nov 27 16:53:37 2009
@@ -131,7 +131,7 @@
standardHost.removing=Retrait de l''application web pour le chemin de contexte
{0}
standardHost.removeError=Erreur lors du retrait de l''application web pour le
chemin de contexte {0}
standardHost.start=D\u00e9marrage de l''application web application pour le
chemin de contexte {0}
-standardHost.stop=Arr\u00e9t de l''application web application pour le chemin
de contexte {0}
+standardHost.stop=Arr\u00eat de l''application web application pour le chemin
de contexte {0}
standardHost.unfoundContext=Impossible de trouver un contexte pour l''URI {0}
demand\u00e9e
standardHost.warRequired=Une URL vers l''archive d''application web (war) est
n\u00e9cessaire
standardHost.warURL=URL vers l''archive d''application web (war) invalide: {0}
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=884905&r1=884904&r2=884905&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
Fri Nov 27 16:53:37 2009
@@ -20,7 +20,7 @@
htmlManagerServlet.appsRemove=Retirer
htmlManagerServlet.appsSessions=Sessions
htmlManagerServlet.appsStart=D\u00e9marrer
-htmlManagerServlet.appsStop=Arr\u00e9ter
+htmlManagerServlet.appsStop=Arr\u00eater
htmlManagerServlet.appsTitle=Applications
htmlManagerServlet.installButton=Installation
htmlManagerServlet.installConfig=URL de configuration:
@@ -68,7 +68,7 @@
managerServlet.sessions=OK - Information de session pour l''application au
chemin de contexte {0}
managerServlet.started=OK - Application d\u00e9marr\u00e9e pour le chemin de
contexte {0}
managerServlet.startFailed=ECHEC - L''application pour le chemin de contexte
{0} n''a pas pu\u00eatred\u00e9marr\u00e9e
-managerServlet.stopped=OK - Application arr\u00e9t\u00e9e pour le chemin de
contexte {0}
+managerServlet.stopped=OK - Application arr\u00eat\u00e9e pour le chemin de
contexte {0}
managerServlet.undeployed=OK - Application non-d\u00e9ploy\u00e9e pour le
chemin de contexte {0}
managerServlet.unknownCommand=ECHEC - Commande inconnue {0}
managerServlet.userDatabaseError=ECHEC - Impossible de r\u00e9soudre la base
de donn\u00e9es utilisateurs der\u00e9f\u00e9rence
Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=884905&r1=884904&r2=884905&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Fri Nov 27 16:53:37 2009
@@ -27,7 +27,7 @@
JDBCStore.removing=Retrait de la Session {0} de la base de donn\u00e9es {1}
JDBCStore.SQLException=Erreur SQL {0}
JDBCStore.checkConnectionDBClosed=La connexion \u00e0 la base de donn\u00e9es
est nulle ou a \u00e9t\u00e9 trouv\u00e9 ferm\u00e9. Tentative de
r\u00e9ouverture.
-JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture re-open
de la base de donn\u00e9es a \u00e9chou\u00e9. La base de donn\u00e9es est peut
\u00eatre arr\u00e9t\u00e9e.
+JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture re-open
de la base de donn\u00e9es a \u00e9chou\u00e9. La base de donn\u00e9es est peut
\u00eatre arr\u00eat\u00e9e.
JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite {0}
JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a
pas \u00e9t\u00e9 trouv\u00e9e {0}
managerBase.complete=L''alimentation du g\u00e9n\u00e9rateur de nombre
al\u00e9atoire est termin\u00e9
-
To unsubsc
svn commit: r884906 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 16:54:41 2009 New Revision: 884906 URL: http://svn.apache.org/viewvc?rev=884906&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=884906&r1=884905&r2=884906&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 16:54:41 2009 @@ -473,3 +473,11 @@ http://svn.apache.org/viewvc?rev=884341&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48295 + Correct French translations + http://svn.apache.org/viewvc?rev=884905&view=rev + Patch provided by Marc Paquette + +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 48295] Some occurences of eacute instead of ecircumflex in french translations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48295 --- Comment #1 from Mark Thomas 2009-11-27 08:54:54 GMT --- Many thanks for the patch. It has been applied to trunk and proposed 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: r884907 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
Author: markt
Date: Fri Nov 27 16:57:21 2009
New Revision: 884907
URL: http://svn.apache.org/viewvc?rev=884907&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48297
Missing french translations and some weird sentences
Patch provided by Marc Paquette
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=884907&r1=884906&r2=884907&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
Fri Nov 27 16:57:21 2009
@@ -13,21 +13,40 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-htmlManagerServlet.appsAvailable=Fonctionnant
+htmlManagerServlet.appsAvailable=Fonctionnelle
htmlManagerServlet.appsName=Nom d''affichage
htmlManagerServlet.appsPath=Chemin
htmlManagerServlet.appsReload=Recharger
-htmlManagerServlet.appsRemove=Retirer
+htmlManagerServlet.appsUndeploy=Retirer
+htmlManagerServlet.appsExpire=Expirer les sessions
htmlManagerServlet.appsSessions=Sessions
htmlManagerServlet.appsStart=D\u00e9marrer
htmlManagerServlet.appsStop=Arr\u00eater
+htmlManagerServlet.appsTasks=Commandes
htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.installButton=Installation
-htmlManagerServlet.installConfig=URL de configuration:
-htmlManagerServlet.installPath=Chemin:
-htmlManagerServlet.installTitle=Installation
-htmlManagerServlet.installWar=URL du WAR:
+htmlManagerServlet.expire.explain=inactives depuis ≥
+htmlManagerServlet.expire.unit=minutes
+htmlManagerServlet.helpHtmlManager=Aide HTML Gestionnaire
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Aide Gestionnaire
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.deployButton=Deployer
+htmlManagerServlet.deployConfig=URL du fichier XML de configuration:
+htmlManagerServlet.deployPath=Chemin de context (requis):
+htmlManagerServlet.deployServer=Emplacement du r\u00e9pertoire ou fichier WAR
de d\u00e9ploiement sur le serveur
+htmlManagerServlet.deployTitle=Deployer
+htmlManagerServlet.deployUpload=Fichier WAR \u00e0 d\u00e9ployer
+htmlManagerServlet.deployUploadFail=ECHEC - T\u00e9l\u00e9versement pour
d\u00e9ploiement a \u00e9chou\u00e9, exception: {0}
+htmlManagerServlet.deployUploadFile=Choisir le fichier WAR \u00e0
t\u00e9l\u00e9verser
+htmlManagerServlet.deployUploadInServerXml=ECHEC - Fichier WAR \"{0}\" ne peut
\u00eatre t\u00e9l\u00e9vers\u00e9 lorsque le contexte est d\u00e9fini dans
server.xml
+htmlManagerServlet.deployUploadNotWar=ECHEC - Fichier \u00e0
t\u00e9l\u00e9verser, \"{0}\", doit \u00eatre un .war
+htmlManagerServlet.deployUploadNoFile=ECHEC - T\u00e9l\u00e9versement a
\u00e9chou\u00e9, aucun fichier
+htmlManagerServlet.deployUploadWarExists=ECHEC - Fichier War \"{0}\"
d\u00e9j\u00ea existant sur le serveur
+htmlManagerServlet.deployWar=URL vers WAR ou r\u00e9pertoire:
+htmlManagerServlet.list=Lister les applications
+htmlManagerServlet.manager=Gestionnaire
htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=-
htmlManagerServlet.serverJVMVendor=Fournisseur de la JVM
htmlManagerServlet.serverJVMVersion=Version de la JVM
htmlManagerServlet.serverOSArch=Architecture d''OS
@@ -40,8 +59,10 @@
managerServlet.alreadyDocBase=ECHEC - Le r\u00e9pertoire {0} est
d\u00e9j\u00e0 utilis\u00e9
managerServlet.configured=OK - Application configur\u00e9e depuis le fichier
contexte {0}
managerServlet.deployed=OK - Application d\u00e9ploy\u00e9e pour le chemin de
contexte {0}
+managerServlet.deployFailed=ECHEC - Echec au d\u00e9ploiement de
l''application pour le chemin de contexte {0}
+managerServlet.deployedButNotStarted=ECHEC - Application d\u00e9ploy\u00e9e
pour le chemin de contexte {0} mais le d\u00e9marrage du contexte a
\u00e9chou\u00e9
managerServlet.exception=ECHEC - L''exception {0} a \u00e9t\u00e9
rencontr\u00e9e
-managerServlet.installed=OK - Application install\u00e9e pour le chemin de
contexte {0}
+managerServlet.deployed=OK - Application install\u00e9e pour le chemin de
contexte {0}
managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide {0} a
\u00e9t\u00e9 sp\u00e9cifi\u00e9
managerServlet.invalidWar=ECHEC - Une URL d''application invalide {0} a
\u00e9t\u00e9 sp\u00e9cifi\u00e9e
managerServlet.listed=OK - Applications list\u00e9es pour l''h\u00f4te virtuel
(virtual host) {0}
@@ -52,26 +73,33 @@
managerServlet.noDirectory=ECHEC - La base de document n''est pas un
r\u00e9pertoire pour le chemin {0}
managerServlet.noDocBase=ECHEC - Impossible de retirer la base de document
pour le chemin {
DO NOT REPLY [Bug 48297] Missing french translations and some weird sentences (patch for trunk)
https://issues.apache.org/bugzilla/show_bug.cgi?id=48297 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 08:57:28 GMT --- Patch applied. Many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884909 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 17:05:30 2009 New Revision: 884909 URL: http://svn.apache.org/viewvc?rev=884909&view=rev Log: Add second patch to 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=884909&r1=884908&r2=884909&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 17:05:30 2009 @@ -474,10 +474,11 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48295 +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48295 & + https://issues.apache.org/bugzilla/show_bug.cgi?id=48296 Correct French translations - http://svn.apache.org/viewvc?rev=884905&view=rev - Patch provided by Marc Paquette + http://people.apache.org/~markt/patches/2009-11-27-bug48295-6.patch + Patches provided by Marc Paquette +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 48296] Missing french translations and some weird sentences
https://issues.apache.org/bugzilla/show_bug.cgi?id=48296 --- Comment #1 from Mark Thomas 2009-11-27 09:06:01 GMT --- Thanks for the patch. I have combined it with the patch for bug 48295 and proposed the combined 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: r884913 - in /tomcat/trunk/java/javax: annotation/Resource.java ejb/EJB.java el/BeanELResolver.java el/ELContext.java el/ListELResolver.java el/MapELResolver.java el/ResourceBundleELResolv
Author: markt
Date: Fri Nov 27 17:14:16 2009
New Revision: 884913
URL: http://svn.apache.org/viewvc?rev=884913&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48267
Generics
Patch provided by sebb
Modified:
tomcat/trunk/java/javax/annotation/Resource.java
tomcat/trunk/java/javax/ejb/EJB.java
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/ELContext.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/javax/xml/ws/WebServiceRef.java
Modified: tomcat/trunk/java/javax/annotation/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resource.java?rev=884913&r1=884912&r2=884913&view=diff
==
--- tomcat/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/trunk/java/javax/annotation/Resource.java Fri Nov 27 17:14:16 2009
@@ -32,6 +32,7 @@
APPLICATION
}
public String name() default "";
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
public Class type() default Object.class;
public AuthenticationType authenticationType() default
AuthenticationType.CONTAINER;
public boolean shareable() default true;
Modified: tomcat/trunk/java/javax/ejb/EJB.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJB.java?rev=884913&r1=884912&r2=884913&view=diff
==
--- tomcat/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/trunk/java/javax/ejb/EJB.java Fri Nov 27 17:14:16 2009
@@ -29,6 +29,7 @@
public @interface EJB {
String name() default "";
String description() default "";
+ @SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
Class beanInterface() default java.lang.Object.class;
String beanName() default "";
String mappedName() default "";
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=884913&r1=884912&r2=884913&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Fri Nov 27 17:14:16 2009
@@ -229,7 +229,8 @@
this.type = descriptor.getPropertyType();
}
- public Class getPropertyType() {
+ @SuppressWarnings("unchecked") // Can't use Class because
API needs to match specification
+public Class getPropertyType() {
return this.type;
}
@@ -285,7 +286,7 @@
return props.get(ctx, prop);
}
- private final static Method getMethod(Class type, Method m) {
+ private final static Method getMethod(Class type, Method m) {
if (m == null || Modifier.isPublic(type.getModifiers())) {
return m;
}
Modified: tomcat/trunk/java/javax/el/ELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=884913&r1=884912&r2=884913&view=diff
==
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Fri Nov 27 17:14:16 2009
@@ -39,6 +39,7 @@
this.resolved = false;
}
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
public Object getContext(Class key) {
if (this.map == null) {
return null;
@@ -46,6 +47,7 @@
return this.map.get(key);
}
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
public void putContext(Class key, Object contextObject) throws
NullPointerException {
if (key == null || contextObject == null) {
throw new NullPointerException();
Modified: tomcat/trunk/java/javax/el/ListELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=884913&r1=884912&r2=884913&view=diff
==
--- tomcat/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ListELResolver.java Fri Nov 27 17:14:16 2009
@@ -28,7 +28,7 @@
private final boolean readOnly;
- private final static Class UNMODIFIABLE =
+ private final static Class UNMODIFIABLE =
Collections.unmodifiableList(new ArrayList()).getClass();
public ListELResolver() {
@@ -46,9 +46,9 @@
throw new NullPointerException();
}
- if (base instance
DO NOT REPLY [Bug 48267] Patch to fix generics in javax packages
https://issues.apache.org/bugzilla/show_bug.cgi?id=48267 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2009-11-27 09:14:30 GMT --- Fix in trunk. Many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884914 - /tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Author: markt
Date: Fri Nov 27 17:17:12 2009
New Revision: 884914
URL: http://svn.apache.org/viewvc?rev=884914&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48282
Correct possible NPE
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=884914&r1=884913&r2=884914&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Nov 27
17:17:12 2009
@@ -429,8 +429,10 @@
Iterator items = descriptors.values().iterator();
while (items.hasNext()) {
ManagedBean item = items.next();
-if ((group == null) && (item.getGroup() == null)) {
-results.add(item.getName());
+if ((group == null)) {
+if (item.getGroup() == null){
+results.add(item.getName());
+}
} else if (group.equals(item.getGroup())) {
results.add(item.getName());
}
@@ -678,7 +680,7 @@
} else if( source instanceof InputStream ) {
type=param;
inputsource=source;
-} else if( source instanceof Class ) {
+} else if( source instanceof Class ) {
location=((Class)source).getName();
type=param;
inputsource=source;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48282] Possible NPE in org.apache.tomcat.util.modeler.Registry
https://issues.apache.org/bugzilla/show_bug.cgi?id=48282 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 09:17:44 GMT --- Fixed in trunk. Many thanks for the patch -- 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: r884916 - /tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
Author: markt Date: Fri Nov 27 17:24:47 2009 New Revision: 884916 URL: http://svn.apache.org/viewvc?rev=884916&view=rev Log: Re-order the numbering so each dispatcher type always refers to the same bit so we can use bitwise operations Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=884916&r1=884915&r2=884916&view=diff == --- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Nov 27 17:24:47 2009 @@ -53,16 +53,16 @@ public static final int FORWARD_ERROR =3; public static final int INCLUDE = 4; public static final int INCLUDE_ERROR = 5; -public static final int INCLUDE_ERROR_FORWARD =6; -public static final int INCLUDE_FORWARD = 7; +public static final int INCLUDE_FORWARD = 6; +public static final int INCLUDE_ERROR_FORWARD =7; public static final int REQUEST = 8; public static final int REQUEST_ERROR = 9; -public static final int REQUEST_ERROR_FORWARD = 10; -public static final int REQUEST_ERROR_FORWARD_INCLUDE = 11; -public static final int REQUEST_ERROR_INCLUDE = 12; -public static final int REQUEST_FORWARD = 13; -public static final int REQUEST_INCLUDE = 14; -public static final int REQUEST_FORWARD_INCLUDE= 15; +public static final int REQUEST_FORWARD = 10; +public static final int REQUEST_ERROR_FORWARD = 11; +public static final int REQUEST_INCLUDE = 12; +public static final int REQUEST_ERROR_INCLUDE = 13; +public static final int REQUEST_FORWARD_INCLUDE= 14; +public static final int REQUEST_ERROR_FORWARD_INCLUDE = 15; // represents nothing having been set. This will be seen // as equal to a REQUEST @@ -221,7 +221,8 @@ // per the SRV.6.2.5 absence of any dispatcher elements is // equivalent to a REQUEST value if (dispatcherMapping == NOT_SET) return REQUEST; -else return dispatcherMapping; + +return dispatcherMapping; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884923 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationFilterFactory.java deploy/FilterMap.java
Author: markt
Date: Fri Nov 27 17:52:25 2009
New Revision: 884923
URL: http://svn.apache.org/viewvc?rev=884923&view=rev
Log:
Take advantage of revised constants to simplify code
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=884923&r1=884922&r2=884923&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Fri Nov 27 17:52:25 2009
@@ -54,11 +54,8 @@
// --- Constructors
-
-/*
- * Prevent instantiation outside of the getInstanceMethod().
- */
private ApplicationFilterFactory() {
+// Prevent instantiation outside of the getInstanceMethod().
}
@@ -334,54 +331,26 @@
private boolean matchDispatcher(FilterMap filterMap, DispatcherType type) {
switch (type) {
case FORWARD : {
-if (filterMap.getDispatcherMapping() == FilterMap.FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.FORWARD_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE) {
+if ((filterMap.getDispatcherMapping() & FilterMap.FORWARD) >
0) {
return true;
}
break;
}
case INCLUDE : {
-if (filterMap.getDispatcherMapping() == FilterMap.INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE) {
-return true;
+if ((filterMap.getDispatcherMapping() & FilterMap.INCLUDE) >
0) {
+return true;
}
break;
}
case REQUEST : {
-if (filterMap.getDispatcherMapping() == FilterMap.REQUEST ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE) {
-return true;
+if ((filterMap.getDispatcherMapping() & FilterMap.REQUEST) >
0) {
+return true;
}
break;
}
case ERROR : {
-if (filterMap.getDispatcherMapping() == FilterMap.ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.FORWARD_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
-filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE) {
-return true;
+if ((filterMap.getDispatcherMapping() & FilterMap.ERROR) > 0) {
+
svn commit: r884924 - /tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
Author: markt Date: Fri Nov 27 17:53:29 2009 New Revision: 884924 URL: http://svn.apache.org/viewvc?rev=884924&view=rev Log: Further simplication - delete unused constants Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=884924&r1=884923&r2=884924&view=diff == --- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Nov 27 17:53:29 2009 @@ -50,19 +50,8 @@ public static final int ERROR = 1; public static final int FORWARD = 2; -public static final int FORWARD_ERROR =3; public static final int INCLUDE = 4; -public static final int INCLUDE_ERROR = 5; -public static final int INCLUDE_FORWARD = 6; -public static final int INCLUDE_ERROR_FORWARD =7; public static final int REQUEST = 8; -public static final int REQUEST_ERROR = 9; -public static final int REQUEST_FORWARD = 10; -public static final int REQUEST_ERROR_FORWARD = 11; -public static final int REQUEST_INCLUDE = 12; -public static final int REQUEST_ERROR_INCLUDE = 13; -public static final int REQUEST_FORWARD_INCLUDE= 14; -public static final int REQUEST_ERROR_FORWARD_INCLUDE = 15; // represents nothing having been set. This will be seen // as equal to a REQUEST - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884926 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationFilterFactory.java deploy/FilterMap.java
Author: markt
Date: Fri Nov 27 18:01:12 2009
New Revision: 884926
URL: http://svn.apache.org/viewvc?rev=884926&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48285
Add handling of Async dispatcher types
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=884926&r1=884925&r2=884926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Fri Nov 27 18:01:12 2009
@@ -354,6 +354,12 @@
}
break;
}
+case ASYNC : {
+if ((filterMap.getDispatcherMapping() & FilterMap.ASYNC) > 0) {
+return true;
+}
+break;
+}
}
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=884926&r1=884925&r2=884926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Nov 27
18:01:12 2009
@@ -52,6 +52,7 @@
public static final int FORWARD = 2;
public static final int INCLUDE = 4;
public static final int REQUEST = 8;
+public static final int ASYNC = 16;
// represents nothing having been set. This will be seen
// as equal to a REQUEST
@@ -134,22 +135,7 @@
/**
*
* This method will be used to set the current state of the FilterMap
- * representing the state of when filters should be applied:
- *
- *ERROR
- *FORWARD
- *FORWARD_ERROR
- *INCLUDE
- *INCLUDE_ERROR
- *INCLUDE_ERROR_FORWARD
- *REQUEST
- *REQUEST_ERROR
- *REQUEST_ERROR_INCLUDE
- *REQUEST_ERROR_FORWARD_INCLUDE
- *REQUEST_INCLUDE
- *REQUEST_FORWARD,
- *REQUEST_FORWARD_INCLUDE
- *
+ * representing the state of when filters should be applied.
*/
public void setDispatcher(String dispatcherString) {
String dispatcher = dispatcherString.toUpperCase();
@@ -166,6 +152,9 @@
} else if (dispatcher.equals(DispatcherType.ERROR.name())) {
// apply ERROR to the global dispatcherMapping.
dispatcherMapping |= ERROR;
+} else if (dispatcher.equals(DispatcherType.ASYNC.name())) {
+// apply ERROR to the global dispatcherMapping.
+dispatcherMapping |= ASYNC;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48285] ApplicationFilterFactory.matchDispatcher() fails to check ASYNC
https://issues.apache.org/bugzilla/show_bug.cgi?id=48285 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 10:01:53 GMT --- This was part of the Servlet 3.0 TODO list. I have simplified the code in this area and added the necessary handling for the ASYNC type. -- 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: r884935 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Author: markt
Date: Fri Nov 27 18:11:34 2009
New Revision: 884935
URL: http://svn.apache.org/viewvc?rev=884935&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48287
Eclipse warnings
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=884935&r1=884934&r2=884935&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Fri Nov 27 18:11:34 2009
@@ -162,7 +162,7 @@
}
}
-
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set getResourcePaths(String path) {
if (SecurityUtil.isPackageProtectionEnabled()){
return (Set)doPrivileged("getResourcePaths",
@@ -246,6 +246,7 @@
/**
* @deprecated
*/
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
@Deprecated
public Enumeration getServlets() {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -259,6 +260,7 @@
/**
* @deprecated
*/
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
@Deprecated
public Enumeration getServletNames() {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -330,6 +332,7 @@
}
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Enumeration getInitParameterNames() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Enumeration) doPrivileged(
@@ -349,6 +352,7 @@
}
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Enumeration getAttributeNames() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Enumeration) doPrivileged(
@@ -427,7 +431,7 @@
}
}
-
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public T createFilter(Class c)
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -482,6 +486,7 @@
}
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public T createServlet(Class c)
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -503,6 +508,7 @@
}
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public EnumSet getDefaultSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (EnumSet)
@@ -512,7 +518,7 @@
}
}
-
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public EnumSet getEffectiveSessionTrackingModes() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (EnumSet)
@@ -588,6 +594,7 @@
@Override
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public T createListener(Class c)
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -642,6 +649,7 @@
@Override
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Map getFilterRegistrations() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Map) doPrivileged(
@@ -664,6 +672,7 @@
@Override
+@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Map
getServletRegistrations() {
if (SecurityUtil.isPackageProtectionEnabled()) {
return (Map) doPrivileged(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48287] ApplicationContextFacade - generics fixes
https://issues.apache.org/bugzilla/show_bug.cgi?id=48287 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 10:13:00 GMT --- Fixed in trunk. Many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884937 - in /tomcat/trunk/java/org/apache: el/lang/EvaluationContext.java jasper/el/ELContextWrapper.java
Author: markt
Date: Fri Nov 27 18:14:19 2009
New Revision: 884937
URL: http://svn.apache.org/viewvc?rev=884937&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48288
Supress some warnings
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=884937&r1=884936&r2=884937&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Fri Nov 27
18:14:19 2009
@@ -54,6 +54,7 @@
}
@Override
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification in super-class
public Object getContext(Class key) {
return this.elContext.getContext(key);
}
@@ -69,6 +70,7 @@
}
@Override
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification in super-class
public void putContext(Class key, Object contextObject) {
this.elContext.putContext(key, contextObject);
}
Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=884937&r1=884936&r2=884937&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Fri Nov 27
18:14:19 2009
@@ -55,6 +55,7 @@
}
@Override
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match super-class specification
public Object getContext(Class key) {
return this.target.getContext(key);
}
@@ -70,6 +71,7 @@
}
@Override
+@SuppressWarnings("unchecked") // Can't use Class because API needs to
match super-class specification
public void putContext(Class key, Object contextObject) throws
NullPointerException {
this.target.putContext(key, contextObject);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48288] Patch to fix generics in javax.el package helpers
https://issues.apache.org/bugzilla/show_bug.cgi?id=48288 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 10:14:26 GMT --- Patch applied to trunk. Many thanks -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884938 - in /tomcat/trunk: java/org/apache/el/lang/ELSupport.java test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Fri Nov 27 18:20:12 2009
New Revision: 884938
URL: http://svn.apache.org/viewvc?rev=884938&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48289
Javadoc / generics fixes
Patch procided by sebb
Modified:
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=884938&r1=884937&r2=884938&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Fri Nov 27 18:20:12 2009
@@ -50,10 +50,33 @@
}
/**
- * @param obj0
- * @param obj1
- * @return
- * @throws EvaluationException
+ * Compare two objects, after coercing to the same type if appropriate.
+ *
+ * If the objects are identical, or they are equal according to
+ * {...@link #equals(Object, Object)} then return 0.
+ *
+ * If either object is a BigDecimal, then coerce both to BigDecimal first.
+ * Similarly for Double(Float), BigInteger, and Long(Integer, Char, Short,
Byte).
+ *
+ * Otherwise, check that the first object is an instance of Comparable,
and compare
+ * against the second object. If that is null, return 1, otherwise
+ * return the result of comparing against the second object.
+ *
+ * Similarly, if the second object is Comparable, if the first is null,
return -1,
+ * else return the result of comparing against the first object.
+ *
+ * A null object is considered as:
+ *
+ * ZERO when compared with Numbers
+ * the empty string for String compares
+ * Otherwise null is considered to be lower than anything else.
+ *
+ *
+ * @param obj0 first object
+ * @param obj1 second object
+ * @return -1, 0, or 1 if this object is less than, equal to, or greater
than val.
+ * @throws ELException if neither object is Comparable
+ * @throws ClassCastException if the objects are not mutually comparable
*/
public final static int compare(final Object obj0, final Object obj1)
throws ELException {
@@ -83,20 +106,32 @@
if (obj0 instanceof String || obj1 instanceof String) {
return coerceToString(obj0).compareTo(coerceToString(obj1));
}
-if (obj0 instanceof Comparable) {
-return (obj1 != null) ? ((Comparable) obj0).compareTo(obj1) : 1;
-}
-if (obj1 instanceof Comparable) {
-return (obj0 != null) ? -((Comparable) obj1).compareTo(obj0) : -1;
+if (obj0 instanceof Comparable) {
+@SuppressWarnings("unchecked")
+final Comparable comparable = (Comparable) obj0;
+return (obj1 != null) ? comparable.compareTo(obj1) : 1;
+}
+if (obj1 instanceof Comparable) {
+@SuppressWarnings("unchecked")
+final Comparable comparable = (Comparable) obj1;
+return (obj0 != null) ? -comparable.compareTo(obj0) : -1;
}
throw new ELException(MessageFactory.get("error.compare", obj0, obj1));
}
/**
- * @param obj0
- * @param obj1
- * @return
- * @throws EvaluationException
+ * Compare two objects for equality, after coercing to the same type if
appropriate.
+ *
+ * If the objects are identical (including both null) return true.
+ * If either object is null, return false.
+ * If either object is Boolean, coerce both to Boolean and check equality.
+ * Similarly for Enum, String, BigDecimal, Double(Float), Long(Integer,
Short, Byte, Character)
+ * Otherwise default to using Object.equals().
+ *
+ * @param obj0 the first object
+ * @param obj1 the second object
+ * @return true if the objects are equal
+ * @throws ELException
*/
public final static boolean equals(final Object obj0, final Object obj1)
throws ELException {
@@ -148,14 +183,17 @@
return null;
}
if (obj.getClass().isEnum()) {
-return (Enum) obj;
+return (Enum) obj;
}
return Enum.valueOf(type, obj.toString());
}
/**
- * @param obj
- * @return
+ * Convert an object to Boolean.
+ * Null and empty string are false.
+ * @param obj the object to convert
+ * @return the Boolean value of the object
+ * @throws IllegalArgumentException if object is not Boolean or String
*/
public final static Boolean coerceToBoolean(final Object obj)
throws IllegalArgumentException {
@@ -304,16 +342,17 @@
}
/**
+ * Coerce an object to a string
* @param obj
- * @return
+ * @return the String value of the object
*/
public final static Str
DO NOT REPLY [Bug 48289] ElSupport - Javadoc and generics fixes
https://issues.apache.org/bugzilla/show_bug.cgi?id=48289 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-27 10:21:04 GMT --- Patch applied to trunk. Many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884944 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/docs/changelog.xml jasper/src/share/org/apache/jasper/compiler/Generator.java
Author: markt
Date: Fri Nov 27 18:31:53 2009
New Revision: 884944
URL: http://svn.apache.org/viewvc?rev=884944&view=rev
Log:
Fix regression in previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884944&r1=884943&r2=884944&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 18:31:53 2009
@@ -40,8 +40,6 @@
+1: kkolinko, markt
-1:
-
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39844
Port r588477 (fix for #43668) by billbarker that corrected this for Tomcat 6
http://people.apache.org/~markt/patches/2009-07-11-bug39844.patch
@@ -86,12 +84,6 @@
+1: markt
-1:
-* Fix regression in fix for
- https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
- http://svn.apache.org/viewvc?rev=809131&view=rev
- +1: markt, kkolinko, mturk
- -1:
-
* Port r795052 from modules/ha to modules/cluster
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
Enable the JvmRouteBinderValve to work with PersistentManagers as well as
clusters
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=884944&r1=884943&r2=884944&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Nov 27
18:31:53 2009
@@ -98,6 +98,9 @@
+38797: Fix regression in previous fix for this bug. (markt)
+
+
41661: Fix thread safety issue in JspConfig.init() (markt)
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=884944&r1=884943&r2=884944&view=diff
==
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
Fri Nov 27 18:31:53 2009
@@ -1690,6 +1690,17 @@
generateLocalVariables(out, n);
}
+// Add the named objects to the lits of 'introduced' names to
enable
+// a later test as per JSP.5.3
+VariableInfo[] infos = n.getVariableInfos();
+if (infos != null && infos.length > 0) {
+for (int i = 0; i < infos.length; i++) {
+VariableInfo info = infos[i];
+if (info != null && info.getVarName() != null)
+pageInfo.getVarInfoNames().add(info.getVarName());
+}
+}
+
if (n.implementsSimpleTag()) {
generateCustomDoTag(n, handlerInfo, tagHandlerVar);
} else {
@@ -1747,17 +1758,6 @@
// restore previous writer
out = outSave;
}
-
-// Add the named objects to the lits of 'introduced' names to
enable
-// a later test as per JSP.5.3
-VariableInfo[] infos = n.getVariableInfos();
-if (infos != null && infos.length > 0) {
-for (int i = 0; i < infos.length; i++) {
-VariableInfo info = infos[i];
-if (info != null && info.getVarName() != null)
-pageInfo.getVarInfoNames().add(info.getVarName());
-}
-}
}
private static final String SINGLE_QUOTE = "'";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38797] 5.5.12 and 5.5.15 emit different code on
https://issues.apache.org/bugzilla/show_bug.cgi?id=38797 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #15 from Mark Thomas 2009-11-27 10:32:36 GMT --- Fixed in 5.5.x and will be included in 5.5.29 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884947 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java container/modules/cluster/src/share/org/apac
Author: markt
Date: Fri Nov 27 18:41:21 2009
New Revision: 884947
URL: http://svn.apache.org/viewvc?rev=884947&view=rev
Log:
Port r795052 from modules/ha to modules/cluster
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884947&r1=884946&r2=884947&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 18:41:21 2009
@@ -84,15 +84,6 @@
+1: markt
-1:
-* Port r795052 from modules/ha to modules/cluster
- Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
- Enable the JvmRouteBinderValve to work with PersistentManagers as well as
clusters
- Patch by Chris Chandler
- http://svn.apache.org/viewvc?rev=795052&view=rev
- This has already been applied to OACC:
http://svn.apache.org/viewvc?rev=812446&view=rev
- +1: rjung, markt, mturk
- -1:
-
* Spurious startup errors in the cluster
Although the secondary node is able to retrieve all sessions,
the main thread doesn't see the changed stateTransfered flag,
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=884947&r1=884946&r2=884947&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Fri Nov 27 18:41:21 2009
@@ -39,6 +39,7 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
@@ -208,14 +209,19 @@
ServletException {
if (getEnabled()
- && getCluster() != null
&& request.getContext() != null
&& request.getContext().getDistributable() ) {
// valve cluster can access manager - other cluster handle
turnover
// at host level - hopefully!
Manager manager = request.getContext().getManager();
- if (manager != null && manager instanceof ClusterManager
- &&
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+
+ if (manager != null && (
+ (manager instanceof ClusterManager
+ && getCluster() != null
+ &&
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+ ||
+ (manager instanceof PersistentManager)))
+
handlePossibleTurnover(request, response);
}
// Pass this request on to the next valve in our pipeline
@@ -376,9 +382,13 @@
if (catalinaSession instanceof DeltaSession)
((DeltaSession) catalinaSession).resetDeltaRequest();
changeRequestSessionID(request, response, sessionId, newSessionID);
-// now sending the change to all other clusternode!
-ClusterManager manager = (ClusterManager)catalinaSession.getManager();
-sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
+
+if (getCluster() != null) {
+// now sending the change to all other clusternode!
+ClusterManager manager =
(ClusterManager)catalinaSession.getManager();
+sendSessionIDClusterBackup(manager,request,sessionId,
newSessionID);
+}
+
lifecycle.fireLifecycleEvent("After session migration",
catalinaSession);
if (log.isDebugEnabled()) {
log.debug(sm.getString("jvmRoute.changeSession", sessionId,
@@ -548,13 +558,12 @@
}
}
}
-if (cluster == null) {
-throw new RuntimeException("No clustering support at container "
-+ container.getName());
-}
-if (log.isInfoEnabled())
+if (log.isInfoEnabled()) {
log.info(sm.getString("jvmRoute.valve.started"));
+if (cluster == null)
+log.info(sm.getString("jvmRoute.noCluster"));
+}
}
Modified:
tomcat/tc5
svn commit: r884949 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java container/modules/ha/src/share/org/apache/catalina/
Author: markt Date: Fri Nov 27 18:46:12 2009 New Revision: 884949 URL: http://svn.apache.org/viewvc?rev=884949&view=rev Log: Spurious startup errors in the cluster Although the secondary node is able to retrieve all sessions, the main thread doesn't see the changed stateTransfered flag, and thus waits until the transfer timeout occurs. Observed on Solaris. Switching to volatile fixes it. Port of Rainer's patch (r814024) in trunk Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884949&r1=884948&r2=884949&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 18:46:12 2009 @@ -84,16 +84,6 @@ +1: markt -1: -* Spurious startup errors in the cluster - Although the secondary node is able to retrieve all sessions, - the main thread doesn't see the changed stateTransfered flag, - and thus waits until the transfer timeout occurs. - Observed on Solaris. Switching to volatile fixes it. - Backport from trunk: http://svn.apache.org/viewvc?rev=814024&view=rev - Need to patch both copies of DeltaManager (ha and cluster). - +1: rjung, markt, mturk - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384 Correct synchronisation problem that leads to cluster members permanently disappearing Modified: tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=884949&r1=884948&r2=884949&view=diff == --- tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original) +++ tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java Fri Nov 27 18:46:12 2009 @@ -129,7 +129,7 @@ private boolean notifySessionListenersOnReplication = true; -private boolean stateTransfered = false ; +private volatile boolean stateTransfered = false ; private int stateTransferTimeout = 60; Modified: tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=884949&r1=884948&r2=884949&view=diff == --- tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java Fri Nov 27 18:46:12 2009 @@ -111,7 +111,7 @@ private boolean expireSessionsOnShutdown = false; private boolean notifyListenersOnReplication = true; private boolean notifySessionListenersOnReplication = true; -private boolean stateTransfered = false ; +private volatile boolean stateTransfered = false ; private int stateTransferTimeout = 60; private boolean sendAllSessions = true; private boolean sendClusterDomainOnly = true ; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884957 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 19:06:23 2009 New Revision: 884957 URL: http://svn.apache.org/viewvc?rev=884957&view=rev Log: No need to port fix to container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java It uses the implementation from 6.0.x which Filip commented on the original bug (https://issues.apache.org/bugzilla/show_bug.cgi?id=46384#c3) that the 6.0.x implementation didn't exhibit this issue. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884957&r1=884956&r2=884957&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:06:23 2009 @@ -90,14 +90,6 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=24253 +1: markt, rjung, kkolinko -1: - rjung: the same fix seems to be necessary for - container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java - (plus another use of the mutex also in receive() around membership.removeMember(m). - - kkolinko: re rjung's comment: Those /tribes/membership/ classes - are not included in TC 5.5 releases. Thus no need to patch them. - I wonder if those can be removed from /tc5.5.x/trunk, but I actually do - not mind. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46950 Adds support for SSL renegotiation when CLIENT-CERT auth is required due to a - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884960 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java container/webapps/docs/changelog.xml
Author: markt
Date: Fri Nov 27 19:09:42 2009
New Revision: 884960
URL: http://svn.apache.org/viewvc?rev=884960&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384
Correct synchronisation problem that leads to cluster members permanently
disappearing
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884960&r1=884959&r2=884960&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:09:42 2009
@@ -84,13 +84,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46384
- Correct synchronisation problem that leads to cluster members permanently
- disappearing
- https://issues.apache.org/bugzilla/attachment.cgi?id=24253
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46950
Adds support for SSL renegotiation when CLIENT-CERT auth is required due to a
security constraint
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=884960&r1=884959&r2=884960&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Fri Nov 27 19:09:42 2009
@@ -265,23 +265,25 @@
McastMember m = McastMember.getMember(data);
if(log.isDebugEnabled())
log.debug("Mcast receive ping from member " + m);
-if ( membership.memberAlive(m) ) {
-if(log.isDebugEnabled())
-log.debug("Mcast add member " + m);
-service.memberAdded(m);
+synchronized (membershipMutex) {
+if ( membership.memberAlive(m) ) {
+if(log.isDebugEnabled())
+log.debug("Mcast add member " + m);
+service.memberAdded(m);
+}
}
} finally {
checkExpire();
}
}
-protected Object expiredMutex = new Object();
+protected final Object membershipMutex = new Object();
/**
* check member expire or alive
*/
protected void checkExpire() {
-synchronized (expiredMutex) {
+synchronized (membershipMutex) {
McastMember[] expired = membership.expire(timeToExpiration);
for ( int i=0; ihttp://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=884960&r1=884959&r2=884960&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Nov 27
19:09:42 2009
@@ -123,6 +123,10 @@
Remove unnecessary Java5 dependencies. (markt)
+
+46384: Correct synchronisation issue that could lead to a
+cluster member disappering permanently. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46384] Due to missing synchronization, a member may disappear permanent.
https://issues.apache.org/bugzilla/show_bug.cgi?id=46384 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2009-11-27 11:09:59 GMT --- This has been fixed in 5.5.x and will be included in 5.5.29 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884964 - in /tomcat/tc5.5.x/trunk: ./ connectors/http11/src/java/org/apache/coyote/http11/ connectors/jni/java/org/apache/tomcat/jni/ container/catalina/src/share/org/apache/catalina/core
Author: markt
Date: Fri Nov 27 19:15:50 2009
New Revision: 884964
URL: http://svn.apache.org/viewvc?rev=884964&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46950
Adds support for SSL renegotiation when CLIENT-CERT auth is required due to a
security constraint
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884964&r1=884963&r2=884964&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:15:50 2009
@@ -147,20 +147,11 @@
+1: kkolinko
-1:
-
* Include root cause exception into the one produced by
ApplicationContextFacade#doPrivileged()
http://svn.apache.org/viewvc?rev=831819&view=rev
+1: kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46950
- Adds support for SSL renegotiation when CLIENT-CERT auth is required due to a
- security constraint
- Backport of http://svn.apache.org/viewvc?rev=83&view=rev
-
http://people.apache.org/~rjung/patches/tc5.5.x-backport-BZ46950-r815418-20091102.patch
- +1: rjung, markt, mturk
- -1:
-
* Fix CVE-2009-3548 - Windows installer uses insecure default password
http://svn.apache.org/viewvc?rev=834047&view=rev
+1: markt, mturk
Modified:
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=884964&r1=884963&r2=884964&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Fri Nov 27 19:15:50 2009
@@ -1098,13 +1098,14 @@
request.setAttribute(AprEndpoint.CIPHER_SUITE_KEY,
sslO);
}
// Get client certificate and the certificate chain if
present
+// certLength == -1 indicates an error
int certLength = SSLSocket.getInfoI(socket,
SSL.SSL_INFO_CLIENT_CERT_CHAIN);
byte[] clientCert = SSLSocket.getInfoB(socket,
SSL.SSL_INFO_CLIENT_CERT);
X509Certificate[] certs = null;
-if (clientCert != null) {
+if (clientCert != null && certLength > -1) {
certs = new X509Certificate[certLength + 1];
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
-certs[0] = (X509Certificate)
cf.generateCertificate(new ByteArrayInputStream(clientCert));
+certs[0] = (X509Certificate)
cf.generateCertificate(new ByteArrayInputStream(clientCert));
for (int i = 0; i < certLength; i++) {
byte[] data = SSLSocket.getInfoB(socket,
SSL.SSL_INFO_CLIENT_CERT_CHAIN + i);
certs[i+1] = (X509Certificate)
cf.generateCertificate(new ByteArrayInputStream(data));
@@ -1131,29 +1132,35 @@
} else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
if (ssl && (socket != 0)) {
- // Consume and buffer the request body, so that it does not
- // interfere with the client's handshake messages
+// Consume and buffer the request body, so that it does not
+// interfere with the client's handshake messages
InputFilter[] inputFilters = inputBuffer.getFilters();
((BufferedInputFilter)
inputFilters[Constants.BUFFERED_FILTER]).setLimit(maxSavePostSize);
inputBuffer.addActiveFilter(inputFilters[Constants.BUFFERED_FILTER]);
try {
-// Renegociate certificates
-SSLSocket.renegotiate(socket);
-// Get client certificate and the certificate chain if
present
-int certLength = SSLSocket.getInfoI(socket,
SSL.SSL_INFO_CLIENT_CERT_CHAIN);
-byte[] clientCert = SSLSocket.getInfoB(socket,
SSL.SSL_INFO_CLIENT_CERT);
-X509Certificate[] certs = null;
-if (clientCert != null) {
-certs = new X509Certificate[certLength + 1];
-
DO NOT REPLY [Bug 46950] SSL renegotiation does not occur when resource with CLIENT-CERT auth is requested
https://issues.apache.org/bugzilla/show_bug.cgi?id=46950 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2009-11-27 11:16:10 GMT --- This has been applied to 5.5.x and will be included in 5.5.29 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884966 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 19:16:44 2009 New Revision: 884966 URL: http://svn.apache.org/viewvc?rev=884966&view=rev Log: These were updated to 17 due to other patches Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884966&r1=884965&r2=884966&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:16:44 2009 @@ -52,14 +52,6 @@ http://people.apache.org/~markt/patches/2009-07-12-apr-ipv6.patch +1: markt, kkolinko -1: - kkolinko: This patch is a backport of rev.697046 -A comment in STATUS.txt there ([1]) says -"use trunk >=r690600 of TC-native", thus it requires -TC-native 1.1.15 or .16. -Do we need to update REQUIRED_PATCH, RECOMMENDED_PV -in AprLifecycleListener? -[1] http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?r1=697046&r2=697045&pathrev=697046 - markt: We should update recommended. * Minor cleanups for AccessLogValve classes Reuses StringBuffer, uses char instead of single-char String, etc. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r884976 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/bin/catalina.sh container/webapps/docs/changelog.xml
Author: markt Date: Fri Nov 27 19:38:09 2009 New Revision: 884976 URL: http://svn.apache.org/viewvc?rev=884976&view=rev Log: Refix https://issues.apache.org/bugzilla/show_bug.cgi?id=37848 Don't output info messages when there is no terminal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884976&r1=884975&r2=884976&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:38:09 2009 @@ -111,12 +111,6 @@ +1: rjung, markt, mturk -1: -* Refix https://issues.apache.org/bugzilla/show_bug.cgi?id=37848 - Don't output info messages when there is no terminal - http://svn.apache.org/viewvc?rev=828225&view=rev - +1: markt, kkolinko, mturk - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097 There are two patches to be applied: 1) Make WebappClassLoader to do not swallow AccessControlException Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh?rev=884976&r1=884975&r2=884976&view=diff == --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Fri Nov 27 19:38:09 2009 @@ -209,7 +209,9 @@ else shift if [ "$1" = "-security" ] ; then - echo "Using Security Manager" + if [ $have_tty -eq 1 ]; then +echo "Using Security Manager" + fi shift exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ @@ -235,7 +237,9 @@ shift if [ "$1" = "-security" ] ; then -echo "Using Security Manager" +if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" +fi shift exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ @@ -259,7 +263,9 @@ shift touch "$CATALINA_BASE"/logs/catalina.out if [ "$1" = "-security" ] ; then -echo "Using Security Manager" +if [ $have_tty -eq 1 ]; then + echo "Using Security Manager" +fi shift "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=884976&r1=884975&r2=884976&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Nov 27 19:38:09 2009 @@ -63,6 +63,10 @@ +37848: Re-fix. Don't display info output when there is no +terminal. (markt) + + 41059: Reduce the chances of errors when using ENABLE_CLEAR_REFERENCES. Patch by Curt Arnold. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 37848] Inappropriate Output From catalina.sh When No Terminal Available
https://issues.apache.org/bugzilla/show_bug.cgi?id=37848 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2009-11-27 11:40:49 GMT --- The patch has been applied to 5.5.x and will be included in 5.5.29 onwards. It has also been applied to 6.0.x and will be in 6.0.21 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48300] New: AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Summary: AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path Product: Tomcat 5 Version: 5.5.28 Platform: PC OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: Native:Integration AssignedTo: dev@tomcat.apache.org ReportedBy: p...@gmx.de AprLifecycleListenes says "apr not found" but loads Http11AprProtocol connector 27.11.2009 21:07:45 org.apache.catalina.core.AprLifecycleListener lifecycleEvent INFO: The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib/jvm/java-6-sun-1.6.0.16/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.16/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.16/jre/../lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.16/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.16/jre/lib/i386:/usr/lib/xulrunner-addons:/usr/lib/xulrunner-addons:/usr/java/packages/lib/i386:/lib:/usr/lib 27.11.2009 21:07:45 org.apache.coyote.http11.Http11AprProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8080 27.11.2009 21:07:45 org.apache.coyote.http11.Http11AprProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8443 27.11.2009 21:07:45 org.apache.coyote.ajp.AjpAprProtocol init AprLifecycleListenes was commented out in server.xml, Http11AprProtocol connector loaded anyhow 27.11.2009 21:08:23 org.apache.coyote.http11.Http11AprProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8080 27.11.2009 21:08:23 org.apache.coyote.http11.Http11AprProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8443 27.11.2009 21:08:23 org.apache.coyote.ajp.AjpAprProtocol init Only if i use a -Djava.library.path=/none AprLifecycleListenes fails really to load http11AprProtocol connector and loads the desired http11.Http11BaseProtocol 27.11.2009 21:02:23 org.apache.catalina.core.AprLifecycleListener lifecycleEvent INFO: The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /none 27.11.2009 21:02:23 org.apache.coyote.http11.Http11BaseProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8080 27.11.2009 21:02:25 org.apache.coyote.http11.Http11BaseProtocol init INFO: Initializing Coyote HTTP/1.1 on http-8443 -- 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: r884998 - in /tomcat/tc5.5.x/trunk: ./ connectors/util/java/org/apache/tomcat/util/net/jsse/ container/webapps/docs/ container/webapps/docs/config/
Author: markt
Date: Fri Nov 27 20:43:58 2009
New Revision: 884998
URL: http://svn.apache.org/viewvc?rev=884998&view=rev
Log:
CVE-2009-3555. Provide option to disable legacy SSL renegotiation.
Based on Costin's patch for trunk with some modifications.
Note an alternative patch is proposed but it requires some of the changes in
this patch anyway.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884998&r1=884997&r2=884998&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 20:43:58 2009
@@ -153,12 +153,6 @@
+1: kkolinko
-1:
-* Disable TLS renegotiation be default with an option to re-enable it
- Based on Costin's patch for trunk with Mark's modifications
- http://people.apache.org/~markt/patches/2009-11-10-cve-2009-3555-tc5.patch
- +1: markt, mturk, kkolinko
- -1:
-
* Align server.xml installed by .exe installer with the one bundled in
zip/tgz archives
http://people.apache.org/~kkolinko/patches/2009-11-15_Installer_serverxml_tc55.patch
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java?rev=884998&r1=884997&r2=884998&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
Fri Nov 27 20:43:58 2009
@@ -129,6 +129,9 @@
enabledCiphers = getEnabledCiphers(requestedCiphers,
sslProxy.getSupportedCipherSuites());
+allowUnsafeLegacyRenegotiation =
+
"true".equals(attributes.get("allowUnsafeLegacyRenegotiation"));
+
// Check the SSL config is OK
checkConfig();
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java?rev=884998&r1=884997&r2=884998&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
Fri Nov 27 20:43:58 2009
@@ -120,6 +120,9 @@
enabledCiphers = getEnabledCiphers(requestedCiphers,
sslProxy.getSupportedCipherSuites());
+allowUnsafeLegacyRenegotiation =
+
"true".equals(attributes.get("allowUnsafeLegacyRenegotiation"));
+
// Check the SSL config is OK
checkConfig();
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java?rev=884998&r1=884997&r2=884998&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java
Fri Nov 27 20:43:58 2009
@@ -96,7 +96,9 @@
break;
}
}
-socket.setSoTimeout(oldTimeout);
+if (!socket.isClosed()) {
+socket.setSoTimeout(oldTimeout);
+}
if (listener.completed == false) {
throw new SocketException("SSL Cert handshake timeout");
}
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=884998&r1=884997&r2=884998&view=diff
==
---
tomcat/tc5.5.x/trunk
svn commit: r884999 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 20:46:32 2009 New Revision: 884999 URL: http://svn.apache.org/viewvc?rev=884999&view=rev Log: Votes Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884999&r1=884998&r2=884999&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 20:46:32 2009 @@ -130,7 +130,7 @@ (to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c13 ) http://people.apache.org/~kkolinko/patches/2009-11-12_PrivilegedFindResource_tc6.patch - +1: kkolinko + +1: kkolinko, markt -1: * Include root cause exception into the one produced by ApplicationContextFacade#doPrivileged() @@ -156,7 +156,7 @@ * Align server.xml installed by .exe installer with the one bundled in zip/tgz archives http://people.apache.org/~kkolinko/patches/2009-11-15_Installer_serverxml_tc55.patch - +1: kkolinko + +1: kkolinko, markt -1: * Single quote should be not be treated as a separator @@ -167,7 +167,7 @@ * Implement https://issues.apache.org/bugzilla/show_bug.cgi?id=37847 Make location and filename of catalina.out configurable in catalina.sh http://svn.apache.org/viewvc?rev=881088&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Update to commons-pool 1.5.4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r885002 - in /tomcat/tc6.0.x/trunk: RUNNING.txt bin/catalina.bat bin/catalina.sh bin/service.bat webapps/docs/changelog.xml webapps/docs/logging.xml
Author: markt Date: Fri Nov 27 20:51:03 2009 New Revision: 885002 URL: http://svn.apache.org/viewvc?rev=885002&view=rev Log: Allow per instance configuration of JULI or log4j for core Tomcat logging when using CATALINA_BASE. Modified: tomcat/tc6.0.x/trunk/RUNNING.txt tomcat/tc6.0.x/trunk/bin/catalina.bat tomcat/tc6.0.x/trunk/bin/catalina.sh tomcat/tc6.0.x/trunk/bin/service.bat tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Modified: tomcat/tc6.0.x/trunk/RUNNING.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RUNNING.txt?rev=885002&r1=885001&r2=885002&view=diff == --- tomcat/tc6.0.x/trunk/RUNNING.txt (original) +++ tomcat/tc6.0.x/trunk/RUNNING.txt Fri Nov 27 20:51:03 2009 @@ -104,7 +104,7 @@ files in the following directories based on the value of $CATALINA_BASE instead of $CATALINA_HOME: -* bin - Only setenv.sh (*nix) and setenv.bat (windows) +* bin - Only setenv.sh (*nix), setenv.bat (windows) and tomcat-juli.jar * conf - Server configuration files (including server.xml) Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=885002&r1=885001&r2=885002&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Fri Nov 27 20:51:03 2009 @@ -110,14 +110,6 @@ call "%CATALINA_HOME%\bin\setclasspath.bat" %1 if errorlevel 1 goto end -rem Add on extra jar file to CLASSPATH -rem Note that there are no quotes as we do not want to introduce random -rem quotes into the CLASSPATH -if "%CLASSPATH%" == "" goto emptyClasspath -set CLASSPATH=%CLASSPATH%; -:emptyClasspath -set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar - if not "%CATALINA_BASE%" == "" goto gotBase set CATALINA_BASE=%CATALINA_HOME% :gotBase @@ -126,6 +118,21 @@ set CATALINA_TMPDIR=%CATALINA_BASE%\temp :gotTmpdir +rem Add tomcat-juli.jar and bootstrap.jar to classpath +rem tomcat-juli.jar can be over-ridden per instance +rem Note that there are no quotes as we do not want to introduce random +rem quotes into the CLASSPATH +if "%CLASSPATH%" == "" goto emptyClasspath +set CLASSPATH=%CLASSPATH%; +:emptyClasspath +if "%CATALINA_BASE%" == "%CATALINA_HOME%" goto juliClasspathHome +if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome +set CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar +goto juliClasspathDone +:juliClasspathHome +set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar +:juliClasspathDone + if not "%LOGGING_CONFIG%" == "" goto noJuliConfig set LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=885002&r1=885001&r2=885002&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Fri Nov 27 20:51:03 2009 @@ -157,14 +157,19 @@ fi fi -# Add on extra jar files to CLASSPATH +if [ -z "$CATALINA_BASE" ] ; then + CATALINA_BASE="$CATALINA_HOME" +fi + +# Add tomcat-juli.jar and bootstrap.jar to classpath +# tomcat-juli.jar can be over-ridden per instance if [ ! -z "$CLASSPATH" ] ; then CLASSPATH="$CLASSPATH": fi -CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar - -if [ -z "$CATALINA_BASE" ] ; then - CATALINA_BASE="$CATALINA_HOME" +if [ "$CATALINA_BASE" != "$CATALINA_HOME" ] && [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then + CLASSPATH="$CLASSPATH""$CATALINA_BASE"/bin/tomcat-juli.jar:"$CATALINA_HOME"/bin/bootstrap.jar +else + CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar fi if [ -z "$CATALINA_OUT" ] ; then Modified: tomcat/tc6.0.x/trunk/bin/service.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=885002&r1=885001&r2=885002&view=diff == --- tomcat/tc6.0.x/trunk/bin/service.bat (original) +++ tomcat/tc6.0.x/trunk/bin/service.bat Fri Nov 27 20:51:03 2009 @@ -92,7 +92,7 @@ set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org/ set PR_INSTALL=%EXECUTABLE% set PR_LOGPATH=%CATALINA_BASE%\logs -set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar +set PR_CLASSPATH=%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar rem Set the server jvm from JAVA_HOME set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll if exist "%PR_JVM%" goto foundJvm Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=885002&r1=885001&r2=885002&view=diff
svn commit: r885003 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 20:51:21 2009 New Revision: 885003 URL: http://svn.apache.org/viewvc?rev=885003&view=rev Log: Remove applied 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=885003&r1=885002&r2=885003&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 20:51:21 2009 @@ -142,25 +142,6 @@ +1: markt -1: -* Allow per instance configuration of JULI or log4j for core Tomcat logging - Updated patch with the suggested tweak for 6.0.x so we don't break Eclipse - integration - Konstantin's update of Mark's patch with the following changes - (in catalina.bat/sh): -- Added an explicit check that CATALINA_BASE != CATALINA_HOME. - Otherwise the [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] check will succeed - when those are equal. -- Moved the code that adds ";" or ":" to non-empty CLASSPATH. That is to avoid - the gap between this preparationary step and the one that actually adds jars - to the CLASSPATH. - http://people.apache.org/~kkolinko/patches/2009-11-16_log-config-per-instance.patch - +1: kkolinko - +1: markt - You should also give yourself credit in the changelog - +1: funkman - was +1 for the original patch, assume he is OK with Konstantin's -improvements but give him a change to change hos vote if not - -1: - - * Prevent NPE in JULI FileHandler during shutdown where the logger has been shutdown and delayed resources still trying to log http://svn.apache.org/viewvc?rev=666232&view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r885005 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 20:53:13 2009 New Revision: 885005 URL: http://svn.apache.org/viewvc?rev=885005&view=rev Log: Separate proposals 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=885005&r1=885004&r2=885005&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 20:53:13 2009 @@ -145,10 +145,14 @@ * Prevent NPE in JULI FileHandler during shutdown where the logger has been shutdown and delayed resources still trying to log http://svn.apache.org/viewvc?rev=666232&view=rev - +1: kkolinko, markt - +1: fhanik - I would add in http://svn.apache.org/viewvc?rev=881396&view=rev + +1: kkolinko, markt, fhanik -1: +* Make JULI FileHandler thread safe + http://svn.apache.org/viewvc?rev=881396&view=rev + +1: fhanik + -1: + * Make FileHandler.java extensible http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?r1=666232&r2=709018&pathrev=793882&view=patch +1: fhanik, jim, markt, kkolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 --- Comment #1 from Hendrik Saly 2009-11-27 12:55:39 UTC --- Seems that org.apache.tomcat.jni.SSL has no Field named TCN_MAJOR_VERSION as expected in org.apache.catalina.core.AprLifecycleListener line 91-93. This cause a java.lang.NoSuchFieldException: TCN_MAJOR_VERSION, caught by the catch(Throwable t) in line 94 in org.apache.catalina.core.AprLifecycleListener. APR gets loaded but worong message is generated: INFO: The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/lib ... -- 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: r885008 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt Date: Fri Nov 27 21:03:27 2009 New Revision: 885008 URL: http://svn.apache.org/viewvc?rev=885008&view=rev Log: Prevent NPE in JULI FileHandler during shutdown where the logger has been shutdown and delayed resources still trying to log Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 27 21:03:27 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,772872,77 6921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=885008&r1=885007&r2=885008&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:03:27 2009 @@ -142,12 +142,6 @@ +1: markt -1: -* Prevent NPE in JULI FileHandler during shutdown where the logger has been - shutdown and delayed resources still trying to log - http://svn.apache.org/viewvc?rev=666232&view=rev - +1: kkolinko, markt, fhanik - -1: - * Make JULI FileHandler thread safe http://svn.apache.org/viewvc?rev=881396&view=rev +1: fhanik Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java URL: http://svn.apa
svn commit: r885011 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 21:04:02 2009 New Revision: 885011 URL: http://svn.apache.org/viewvc?rev=885011&view=rev Log: Add attribution to comment 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=885011&r1=885010&r2=885011&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:04:02 2009 @@ -171,7 +171,7 @@ -0: markt for all SBuilder->SBuffer patches. Code cleanup is fine in trunk but no need to backport it -0: funkman - -1: Is there a real benefit, other than clouding the revision history? ;) + -1: fhanik Is there a real benefit, other than clouding the revision history? ;) I'd consider 6.0.x to be in maintenance mode not clean up/refactor mode. The patches, as well as patches for individual files inside them, are - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r885016 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt
Date: Fri Nov 27 21:09:22 2009
New Revision: 885016
URL: http://svn.apache.org/viewvc?rev=885016&view=rev
Log:
Make FileHandler.java extensible
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=885016&r1=885015&r2=885016&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:09:22 2009
@@ -147,11 +147,6 @@
+1: fhanik
-1:
-* Make FileHandler.java extensible
-
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?r1=666232&r2=709018&pathrev=793882&view=patch
- +1: fhanik, jim, markt, kkolinko
- -1:
-
* Allow configurable buffer size of loggers
http://svn.apache.org/viewvc?rev=814708&view=rev
http://svn.apache.org/viewvc?rev=814876&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=885016&r1=885015&r2=885016&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Fri Nov 27
21:09:22 2009
@@ -60,7 +60,7 @@
this.prefix = prefix;
this.suffix = suffix;
configure();
-open();
+openWriter();
}
@@ -121,9 +121,9 @@
if (!date.equals(tsDate)) {
synchronized (this) {
if (!date.equals(tsDate)) {
-close();
+closeWriter();
date = tsDate;
-open();
+openWriter();
}
}
}
@@ -158,6 +158,10 @@
* Close the currently open log file (if any).
*/
public void close() {
+closeWriter();
+}
+
+protected void closeWriter() {
try {
if (writer == null)
@@ -197,7 +201,7 @@
String tsString = ts.toString().substring(0, 19);
date = tsString.substring(0, 10);
-String className = FileHandler.class.getName();
+String className = this.getClass().getName(); //allow classes to
override
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -264,7 +268,11 @@
/**
* Open the new log file for the date specified by date.
*/
-private void open() {
+protected void open() {
+openWriter();
+}
+
+protected void openWriter() {
// Create the directory if necessary
File dir = new File(directory);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=885016&r1=885015&r2=885016&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 27 21:09:22 2009
@@ -285,6 +285,9 @@
Prevent NPE in JULI during shutdown when resources try to log messages
after JULI has been shutdown. (fhanik/kkolinko)
+
+Make the JULI FileHandler easier to extend. (fhanik)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 --- Comment #2 from Hendrik Saly 2009-11-27 13:11:25 UTC --- Created an attachment (id=24631) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24631) A first Patch -- 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: r885018 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml webapps/docs/logging.xml
Author: markt Date: Fri Nov 27 21:12:36 2009 New Revision: 885018 URL: http://svn.apache.org/viewvc?rev=885018&view=rev Log: Make buffer size for FileHandler configurable Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 27 21:12:36 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,77 2872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=885018&r1=885017&r2=885018&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:12:36 2009 @@ -147,12 +147,6 @@ +1: fhanik -1: -* Allow configurable buffer size of loggers - http://svn.apache.org/viewvc?rev=814708&view=rev - http://svn.apache.org/viewvc?rev=814876&view=rev - +1: fhanik, jim, markt, kkolinko - -1: - * Allow to disable buffering in JULI FileHandler This allows to configure immediate publishing of log records, like it was before rev.814876. Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java URL: http:/
svn commit: r885020 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 21:15:31 2009 New Revision: 885020 URL: http://svn.apache.org/viewvc?rev=885020&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=885020&r1=885019&r2=885020&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:15:31 2009 @@ -144,7 +144,7 @@ * Make JULI FileHandler thread safe http://svn.apache.org/viewvc?rev=881396&view=rev - +1: fhanik + +1: fhanik, markt -1: * Allow to disable buffering in JULI FileHandler @@ -378,7 +378,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252 Patch attached to BZ - +1: fhanik + +1: fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Mark Thomas changed: What|Removed |Added Attachment #24631|0 |1 is obsolete|| --- Comment #3 from Mark Thomas 2009-11-27 13:25:16 GMT --- (From update of attachment 24631) The patch is in the wrong format. Please use diff -u. Also, you are confusing this issue with bug 47712 which has already been fixed. -- 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 47712] NoSuchFieldException when trying to use Tomcat Native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 Hendrik Saly changed: What|Removed |Added CC||p...@gmx.de --- Comment #6 from Hendrik Saly 2009-11-27 13:37:13 UTC --- *** Bug 48300 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
DO NOT REPLY [Bug 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Hendrik Saly changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #4 from Hendrik Saly 2009-11-27 13:37:13 UTC --- sorry for not seeing bug #47712 *** This bug has been marked as a duplicate of bug 47712 *** -- 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 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Mark Thomas changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE | --- Comment #5 from Mark Thomas 2009-11-27 13:40:14 GMT --- Again, you have misunderstood this bug. It is not at all related to bug 47712. -- 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 47712] NoSuchFieldException when trying to use Tomcat Native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=47712 --- Comment #7 from Mark Thomas 2009-11-27 13:41:00 GMT --- This is not a duplicate of Bug 48300. -- 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: r885026 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 21:42:25 2009 New Revision: 885026 URL: http://svn.apache.org/viewvc?rev=885026&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=885026&r1=885025&r2=885026&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:42:25 2009 @@ -450,3 +450,10 @@ +1: markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 + Only the APR lifecycle listener should try and initialise APR + http://people.apache.org/~markt/patches/2009-11-27-bug48300.patch + +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 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 --- Comment #6 from Hendrik Saly 2009-11-27 13:50:57 UTC --- The only difference (related to bug 47712) i see is that APR get loaded even if AprLifecycleListenes was commented out, right? The other problems seems solved by fixing bug 47712. I had not reported the problem if I had found previously bug 47712 -- 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: r885029 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 21:51:20 2009 New Revision: 885029 URL: http://svn.apache.org/viewvc?rev=885029&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=885029&r1=885028&r2=885029&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 21:51:20 2009 @@ -227,3 +227,10 @@ http://svn.apache.org/viewvc?rev=883177&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 + Only the APR lifecycle listener should try and initialise APR + Patch also syncs all APR lifecycle listener changes from 6.0.x to 5.5.x + http://people.apache.org/~markt/patches/2009-11-27-bug48300-tc5.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r885030 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 21:52:13 2009 New Revision: 885030 URL: http://svn.apache.org/viewvc?rev=885030&view=rev Log: tc6 and tc5 need different patches 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=885030&r1=885029&r2=885030&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 21:52:13 2009 @@ -452,7 +452,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Only the APR lifecycle listener should try and initialise APR - http://people.apache.org/~markt/patches/2009-11-27-bug48300.patch + http://people.apache.org/~markt/patches/2009-11-27-bug48300-tc6.patch +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 48300] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 --- Comment #7 from Mark Thomas 2009-11-27 13:58:11 GMT --- Exactly. APR getting loaded even if the listener disabled is a bug. That is totally separate from the issue with the APR listener described in 47712. The only similarity between these bugs is that they are both to do with the APR listener. There are two separate, independent bugs here. This bug has already been fixed in trunk. I have proposed the fix for back port to 6.0.x and 5.5.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: r885038 - /tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Author: markt
Date: Fri Nov 27 22:23:40 2009
New Revision: 885038
URL: http://svn.apache.org/viewvc?rev=885038&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342
Make sure replicated context is initialised before accessing fields
Patch provided by Keiichi Fujino
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=885038&r1=885037&r2=885038&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Fri
Nov 27 22:23:40 2009
@@ -54,6 +54,13 @@
@Override
public synchronized void start() throws LifecycleException {
if ( this.started ) return;
+if( !initialized ) {
+try {
+init();
+} catch( Exception ex ) {
+throw new LifecycleException("Error initializaing ", ex);
+}
+}
super.addLifecycleListener(this);
try {
CatalinaCluster catclust = (CatalinaCluster)this.getCluster();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r885039 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Fri Nov 27 22:24:37 2009 New Revision: 885039 URL: http://svn.apache.org/viewvc?rev=885039&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=885039&r1=885038&r2=885039&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 27 22:24:37 2009 @@ -456,4 +456,9 @@ +1: markt -1: - +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 + Fix NPE on replicated context start + Patch provided by Keiichi Fujino + +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 47342] ReplicatedContext#start throws NullPointerException.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 --- Comment #3 from Mark Thomas 2009-11-27 14:25:26 GMT --- Thanks for the patch. The patch has been applied to trunk (although other changes in trunk mean the NPE doesn't occur) and has been proposed 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
DO NOT REPLY [Bug 47407] HttpSessionListener doesn't operate in the session replication when BackupManager is used.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47407 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Mark Thomas 2009-11-27 15:05:44 GMT --- The only listener whose events are replicated is the HttpSessionAttributeListener. Support for other session listeners could be added but that would be an enhancement. Any such enhancement would need to be configurable and should include all ClusterManagers. -- 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 47426] 400 Bad Request when sending two consecutive POST requests over the same connection
https://issues.apache.org/bugzilla/show_bug.cgi?id=47426 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas 2009-11-27 15:58:59 GMT --- The APR classes quoted in the stack trace were not added to Tomcat 6 until several months after Tomcat 5.5.15 was released. If that Tomcat version is accurate, this looks like a local change in the JBoss source tree. Additionally, that particular APR connector is not the default APR connector in 6.0.x and has to be explicitly enabled. I have run your test using the latest 6.0.x code and I can't reproduce this problem. I'd suggest upgrading JBoss to a more recent version that uses a newer version of Apache Tomcat. -- 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
