Re: Redeclaration of variables by tag handler (BZ 48616, 42390)

[Mark Thomas]

On 16/02/2010 03:36, Konstantin Kolinko wrote:
> The examples webapp appears to be working with this,  and tests in
> trunk do pass, with exception of about 50% of cookie tests.

You can't run the cookie tests in one go in Eclipse as each test needs
to be run in a new JVM. If you run them one at a time they should pass.
Alternatively, run the tests via Ant where a new JVM is forked for each
test.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910424 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Tue Feb 16 08:25:24 2010
New Revision: 910424

URL: http://svn.apache.org/viewvc?rev=910424&view=rev
Log:
Allow chunking compilation by default. User still needs to set the 
enable_chunked_encoding to enable the protocol.

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=910424&r1=910423&r2=910424&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Feb 16 08:25:24 2010
@@ -51,13 +51,7 @@
 
 #include 
 
-#ifdef ISAPI_ALLOW_CHUNKING
-#define HAS_CHUNKING "-CHUNKING"
-#else
-#define HAS_CHUNKING ""
-#endif
-
-#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION HAS_CHUNKING
+#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION
 #define SHM_DEF_NAME   "JKISAPISHMEM"
 #define DEFAULT_WORKER_NAME ("ajp13")
 
@@ -2663,9 +2657,7 @@
 watchdog_interval = get_config_int(src, WATCHDOG_INTERVAL_TAG, 0);
 if (watchdog_interval < 0)
 watchdog_interval = 0;
-#ifdef ISAPI_ALLOW_CHUNKING
 chunked_encoding_enabled = get_config_bool(src, 
ENABLE_CHUNKED_ENCODING_TAG, JK_FALSE);
-#endif
 if (get_config_parameter(src, ERROR_PAGE_TAG, error_page_buf, 
sizeof(error_page_buf))) {
 error_page = error_page_buf;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910434 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Tue Feb 16 08:41:41 2010
New Revision: 910434

URL: http://svn.apache.org/viewvc?rev=910434&view=rev
Log:
Add few code comments. No functional change

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=910434&r1=910433&r2=910434&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Feb 16 08:41:41 2010
@@ -2393,6 +2393,9 @@
 int rc = JK_FALSE;
 
 if (!jk_open_file_logger(&logger, log_file, log_level)) {
+/* TODO: Use System logging to notify the user that
+ *   we cannot open the configured log file.
+ */
 logger = NULL;
 }
 StringCbCopy(shm_name, MAX_PATH, SHM_DEF_NAME);
@@ -2529,11 +2532,14 @@
 jk_log(logger, JK_LOG_WARNING,
"You can remove the shm_size attribute if you want 
to use the optimal size.");
 }
-if ((rv = jk_shm_open(shm_name, shm_config_size, logger)) != 0)
+if ((rv = jk_shm_open(shm_name, shm_config_size, logger)) != 
0) {
+/* TODO: Do not try to open the worker if we cannot creat
+ *   the shared memory segment.
+ */
 jk_log(logger, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing 
workers will not function properly.",
jk_shm_name(), rv);
-
+}
 worker_env.uri_to_worker = uw_map;
 worker_env.server_name = serverName;
 worker_env.pool = NULL;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: jk/cluster - intelligent systems load

[Mark Thomas]

On 16/02/2010 07:01, Mladen Turk wrote:
> On 02/16/2010 12:24 AM, Mark Thomas wrote:
>> On 15/02/2010 21:52, Filip Hanik - Dev Lists wrote:

>>> why not just a servlet filter?
>>
>> +1. I was going to suggest the same thing.
>>
> 
> Why not reusing the clustering code for that.
> It would allow to pre-redirect the requests
> without doing the actual ping for undeployed
> applications or for the instances going down.
> Just having filter would be enough to get the
> info about the single node, but the highest
> latency in mod_jk comes from detecting the failed
> node not the busiest one.

I don't see why the current set of valid cluster nodes could not be
passed back via a header.

That raises the interesting question of if a node goes down, which
component will notice first? The proxy or the cluster? With long
timeouts in the proxy, there is a good chance the cluster will notice
quite some time earlier so there is a definite advantage to this.

The other thing it potentially allows is the cluster to tell the proxy
about which nodes are in the cluster, allowing a more dynamic
configuration. Not sure I'd want to use that in production, but in dev
that could be useful.

All of this / some of this could make a great GSOC project.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: jk/cluster - intelligent systems load

[Mladen Turk]

On 02/16/2010 09:56 AM, Mark Thomas wrote:


I don't see why the current set of valid cluster nodes could not be
passed back via a header.



Exactly.


That raises the interesting question of if a node goes down, which
component will notice first? The proxy or the cluster? With long
timeouts in the proxy, there is a good chance the cluster will notice
quite some time earlier so there is a definite advantage to this.



Both mod_jk and isapi_redirect have now watchdog logic that can
ping backends on regular intervals without user intervetion so
the latency will be around 60 seconds which is IMO acceptable for
node maintenance.
Httpd 2.3+ has mod_hartbeat and mod_watchdog so this can easily
be ported to mod_proxy_ajp/http


The other thing it potentially allows is the cluster to tell the proxy
about which nodes are in the cluster, allowing a more dynamic
configuration. Not sure I'd want to use that in production, but in dev
that could be useful.



Hmm, the zero conf is actually more desired in production then in
dev environments since it allows single point of admin and no need
for webserver reconfig.


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: jk/cluster - intelligent systems load

[Mark Thomas]

On 16/02/2010 09:08, Mladen Turk wrote:
> On 02/16/2010 09:56 AM, Mark Thomas wrote:
>> The other thing it potentially allows is the cluster to tell the proxy
>> about which nodes are in the cluster, allowing a more dynamic
>> configuration. Not sure I'd want to use that in production, but in dev
>> that could be useful.
>>
> 
> Hmm, the zero conf is actually more desired in production then in
> dev environments since it allows single point of admin and no need
> for webserver reconfig.

Its just a personal opinion. I don't like any form of auto-configuration
in production because I always feel I never quite know what it is doing
or, more importantly, what it might do. If folks want to use it in
production then there would obviously be nothing stopping them.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910442 - /tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java

[markt]

Author: markt
Date: Tue Feb 16 09:27:49 2010
New Revision: 910442

URL: http://svn.apache.org/viewvc?rev=910442&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580
Prevent AccessControlException if first access is to a JSP that uses a 
FunctionMapper

Modified:
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=910442&r1=910441&r2=910442&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Tue Feb 
16 09:27:49 2010
@@ -99,6 +99,9 @@
 loader.loadClass( basePackage +
 "runtime.JspContextWrapper");   
 
+// Trigger loading of class and reading of property
+SecurityUtil.isPackageProtectionEnabled();
+
 loader.loadClass( basePackage +
 "servlet.JspServletWrapper");
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910443 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 09:29:36 2010
New Revision: 910443

URL: http://svn.apache.org/viewvc?rev=910443&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=910443&r1=910442&r2=910443&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 09:29:36 2010
@@ -374,3 +374,10 @@
   Avoid ArrayIndexOutOfBoundsException triggered by Java 6/7 XML parser bug
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580
+  Prevent AccessControlException if first access is to a JSP that uses a
+  FunctionMapper
+  http://svn.apache.org/viewvc?rev=910442&view=rev
+  +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 48580] 6.0.24: AccessControlException in ProtectedFunctionMapper on first access to certain JSP

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48580

--- Comment #4 from Mark Thomas  2010-02-16 09:29:49 UTC ---
This has been fixed in 7.0.x 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

Re: jk/cluster - intelligent systems load

[Mladen Turk]

On 02/16/2010 10:21 AM, Mark Thomas wrote:

On 16/02/2010 09:08, Mladen Turk wrote:

On 02/16/2010 09:56 AM, Mark Thomas wrote:

The other thing it potentially allows is the cluster to tell the proxy
about which nodes are in the cluster, allowing a more dynamic
configuration. Not sure I'd want to use that in production, but in dev
that could be useful.



Hmm, the zero conf is actually more desired in production then in
dev environments since it allows single point of admin and no need
for webserver reconfig.


Its just a personal opinion. I don't like any form of auto-configuration
in production because I always feel I never quite know what it is doing
or, more importantly, what it might do.


Well it's zero conf inside web server only, so its conf is passed from
Tomcat, and that is certainly something strictly defined inside .xml or
via some manager app.

There was attempt for creating AJP14 protocol, since the current one
lacks some IPC capabilities with the limited packed size being the major
problem. However I'd rather see mod_jk/isapi with http protocol then creating
some AJP extensions or even completely new protocol. Network and processing
speed changed a lot since 90's so now there's almost no performance difference
between AJP and HTTP implementations. With some new HTTP proposals for
connection reusing even that factor could be eliminated in the future.


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910471 - /tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

[markt]

Author: markt
Date: Tue Feb 16 11:07:00 2010
New Revision: 910471

URL: http://svn.apache.org/viewvc?rev=910471&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
Avoid NPE as config may be null but ctxt won't be

Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=910471&r1=910470&r2=910471&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Tue Feb 
16 11:07:00 2010
@@ -162,7 +162,7 @@
 }
 
 public ServletContext getServletContext() {
-return config.getServletContext();
+return ctxt.getServletContext();
 }
 
 /**



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910473 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 11:08:04 2010
New Revision: 910473

URL: http://svn.apache.org/viewvc?rev=910473&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=910473&r1=910472&r2=910473&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 11:08:04 2010
@@ -381,3 +381,9 @@
   http://svn.apache.org/viewvc?rev=910442&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
+  Avoid NPE on background compile
+  http://svn.apache.org/viewvc?rev=910471&view=rev
+  +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 48582] JspServletWrapper.getServletContext() throws NullPointerException

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48582

--- Comment #3 from Mark Thomas  2010-02-16 11:08:19 UTC ---
Fixed in 7.0.x 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: r910485 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

[markt]

Author: markt
Date: Tue Feb 16 11:40:55 2010
New Revision: 910485

URL: http://svn.apache.org/viewvc?rev=910485&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589
Make JNDIRealm easier to extend by making the User class protected
Based on a patch by Candid Dauth

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=910485&r1=910484&r2=910485&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Feb 16 
11:40:55 2010
@@ -24,6 +24,7 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -2214,26 +2215,41 @@
 }
 
 
+ // -- Private Classes
+
+ /**
+  * A private class representing a User
+  */
+ protected static class User {
+ 
+ private String username = null;
+ private String dn = null;
+ private String password = null;
+ private ArrayList roles = null;
+
+ User(String username, String dn, String password,
+ ArrayList roles) {
+ this.username = username;
+ this.dn = dn;
+ this.password = password;
+ this.roles = roles;
+ }
+
+ public String getUserName() {
+ return username;
+ }
+ 
+ public String getDN() {
+ return dn;
+ }
+ 
+ public String getPassword() {
+ return password;
+ }
+ 
+ public List getRoles() {
+ return Collections.unmodifiableList(roles);
+ }
+ }
 }
 
-// -- Private Classes
-
-/**
- * A private class representing a User
- */
-class User {
-String username = null;
-String dn = null;
-String password = null;
-ArrayList roles = null;
-
-
-User(String username, String dn, String password,
-ArrayList roles) {
-this.username = username;
-this.dn = dn;
-this.password = password;
-this.roles = roles;
-}
-
-}



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910486 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 11:42:14 2010
New Revision: 910486

URL: http://svn.apache.org/viewvc?rev=910486&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=910486&r1=910485&r2=910486&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 11:42:14 2010
@@ -387,3 +387,10 @@
   http://svn.apache.org/viewvc?rev=910471&view=rev
   +1: markt
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589
+  Make JNDIRealm easier to extend
+  Based on a patch by Candid Dauth
+  http://svn.apache.org/viewvc?rev=910485&view=rev
+  +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 48750] New: performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

   Summary: performance problems with JSF 1.2
   Product: Tomcat 6
   Version: 6.0.24
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: major
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: m...@recommind.com


I noticed serious performance problems with JSF 1.2 and Tomcat which seems to
be caused by Tomcat.
The corresponding discussion is available here:
http://marc.info/?l=tomcat-user&m=126607491020706&w=2

Metadata-complete is set to true in web.xml 
(see https://issues.apache.org/bugzilla/show_bug.cgi?id=48600)

I deployed two web apps to Tomcat and Jetty and compared performance data.
Average results of 500 calls of a simple jsf page (jsp) with 1000 h:output
tags:

JSF 1.1:
  Tomcat 6.0.24: 26ms
  Jetty 7.0.1: 35ms

JSF 1.2:
  Tomcat 6.0.24: 72ms
  Jetty 7.0.1: 41ms

Result:
Tomcat is much faster with JSF 1.1 but terrible slow with JSF 1.2!

One difference between Tomcat and Jetty in the compiled jsp is the
AnnotationHelper.

Compiled method for a single outputtext tag:
Tomcat:
private boolean
_jspx_meth_h_005foutputText_005f999(javax.servlet.jsp.tagext.JspTag
_jspx_th_h_005fform_005f0, PageContext _jspx_page_context)
throws Throwable {
  PageContext pageContext = _jspx_page_context;
  JspWriter out = _jspx_page_context.getOut();
  //  h:outputText
  org.apache.myfaces.taglib.html.HtmlOutputTextTag
_jspx_th_h_005foutputText_005f999 = new
org.apache.myfaces.taglib.html.HtmlOutputTextTag();
 
org.apache.jasper.runtime.AnnotationHelper.postConstruct(_jsp_annotationprocessor,
_jspx_th_h_005foutputText_005f999);
  _jspx_th_h_005foutputText_005f999.setPageContext(_jspx_page_context);
  _jspx_th_h_005foutputText_005f999.setParent((javax.servlet.jsp.tagext.Tag)
_jspx_th_h_005fform_005f0);
  // /1000hout.jsp(1021,0) name = value type = javax.el.ValueExpression reqTime
= false required = false fragment = false deferredValue = true expectedTypeName
= java.lang.Object deferredMethod = false methodSignature = null
  _jspx_th_h_005foutputText_005f999.setValue(new
org.apache.jasper.el.JspValueExpression("/1000hout.jsp(1021,0)
'1'",_el_expressionfactory.createValueExpression("1",java.lang.Object.class)));
  // /1000hout.jsp(1021,0) name = style type = javax.el.ValueExpression reqTime
= false required = false fragment = false deferredValue = true expectedTypeName
= java.lang.Object deferredMethod = false methodSignature = null
  _jspx_th_h_005foutputText_005f999.setStyle(new
org.apache.jasper.el.JspValueExpression("/1000hout.jsp(1021,0)
'z-index:29202;'",_el_expressionfactory.createValueExpression("z-index:29202;",java.lang.Object.class)));
  _jspx_th_h_005foutputText_005f999.setJspId("jsp_711124934_1001");
  int _jspx_eval_h_005foutputText_005f999 =
_jspx_th_h_005foutputText_005f999.doStartTag();
  if (_jspx_th_h_005foutputText_005f999.doEndTag() ==
javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
_jspx_th_h_005foutputText_005f999.release();
   
org.apache.jasper.runtime.AnnotationHelper.preDestroy(_jsp_annotationprocessor,
_jspx_th_h_005foutputText_005f999);
return true;
  }
  _jspx_th_h_005foutputText_005f999.release();
 
org.apache.jasper.runtime.AnnotationHelper.preDestroy(_jsp_annotationprocessor,
_jspx_th_h_005foutputText_005f999);
  return false;
}

Jetty:
private boolean _jspx_meth_h_outputText_999(javax.servlet.jsp.tagext.JspTag
_jspx_th_h_form_0, PageContext _jspx_page_context)
throws Throwable {
  PageContext pageContext = _jspx_page_context;
  JspWriter out = _jspx_page_context.getOut();
  //  h:outputText
  org.apache.myfaces.taglib.html.HtmlOutputTextTag _jspx_th_h_outputText_999 =
new org.apache.myfaces.taglib.html.HtmlOutputTextTag();
  if (_jspx_resourceInjector != null) {
_jspx_resourceInjector.inject(_jspx_th_h_outputText_999  );
  }
  _jspx_th_h_outputText_999.setPageContext(_jspx_page_context);
  _jspx_th_h_outputText_999.setParent((javax.servlet.jsp.tagext.Tag)
_jspx_th_h_form_0);
  _jspx_th_h_outputText_999.setJspId("id2019");
 
_jspx_th_h_outputText_999.setValue(org.apache.jasper.runtime.PageContextImpl.getValueExpression("1",
(PageContext)_jspx_page_context, java.lang.Object.class, null));
 
_jspx_th_h_outputText_999.setStyle(org.apache.jasper.runtime.PageContextImpl.getValueExpression("z-index:29202;",
(PageContext)_jspx_page_context, java.lang.Object.class, null));
  int _jspx_eval_h_outputText_999 = _jspx_th_h_outputText_999.doStartTag();
  if (_jspx_th_h_outputText_999.doEndTag() ==
javax.servlet.jsp.tagext.Tag.SKIP_PAGE) {
   
_jspx_tagPool_h_outputText_value_style_nobody.reuse(_jspx_th_h_outputText_999);
return true;
  }
 
_jspx_tagPool_h_outputText_value_style_nobody.reuse(_jspx_th_h_outputText_999);
  return false;
}

A demo web app is attached
Just call http://:/jsf12/faces/1000hout.jsp

Can the AnnotationHelper be turned off completely?

-- 
Configure bugmail: htt

DO NOT REPLY [Bug 48589] org.apache.catalina.realm.JNDIRealm User class should be accessible from sub-classes

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48589

--- Comment #2 from Mark Thomas  2010-02-16 11:44:03 UTC ---
Thanks for the patch. I didn't use it directly but used it as the basis for the
fix I have applied to 7.0.x and proposed for 6.0.x

For future reference, please provide patches in diff -u format as this makes
the patch easier to work with.

The main difference in the fix that I applied is that the User fields are now
private with public accessors. I prefer this to allowing read/write access
directly to the fields.

-- 
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

Timing for 6.0.25?

[Mark Thomas]

Mainly a question for Jean-Frederic, but what are the thoughts on aiming
for a 6.0.25 release quite soon? There were a handful of regressions in
6.0.24 it would be good to fix.

Also, if folks have a little time, there are a reasonable number of
proposals in the STATUS file for review. While some are quite involved,
a number are quite simple and should be quick to review.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910485 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

[sebb]

On 16/02/2010, ma...@apache.org  wrote:
> Author: markt
>  Date: Tue Feb 16 11:40:55 2010
>  New Revision: 910485
>
>  URL: http://svn.apache.org/viewvc?rev=910485&view=rev
>  Log:
>  Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589
>  Make JNDIRealm easier to extend by making the User class protected
>  Based on a patch by Candid Dauth
>
>  Modified:
> tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
>
>  Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=910485&r1=910484&r2=910485&view=diff
>  
> ==
>  --- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
>  +++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Feb 16 
> 11:40:55 2010
>  @@ -24,6 +24,7 @@
>   import java.text.MessageFormat;
>   import java.util.ArrayList;
>   import java.util.Arrays;
>  +import java.util.Collections;
>   import java.util.HashMap;
>   import java.util.HashSet;
>   import java.util.Hashtable;
>  @@ -2214,26 +2215,41 @@
>  }
>
>
>  + // -- Private 
> Classes
>  +
>  + /**
>  +  * A private class representing a User

s/private/protected/ ?

>  +  */
>  + protected static class User {
>  +
>  + private String username = null;
>  + private String dn = null;
>  + private String password = null;
>  + private ArrayList roles = null;

These could/should be final, as they don't appear to be updated once
constructed.

>  + User(String username, String dn, String password,
>  + ArrayList roles) {
>  + this.username = username;
>  + this.dn = dn;
>  + this.password = password;
>  + this.roles = roles;

The ArrayList should be copied for safety, otherwise the list can be
externally mutated.
In any case one can create it as unmodifiable.

>  + }
>  +
>  + public String getUserName() {
>  + return username;
>  + }
>  +
>  + public String getDN() {
>  + return dn;
>  + }
>  +
>  + public String getPassword() {
>  + return password;
>  + }
>  +
>  + public List getRoles() {
>  + return Collections.unmodifiableList(roles);
>  + }
>  + }
>   }

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[Jess Holle]

Is there a list of such regressions?

Doing a search for bugs specifically against 6.0.24 and then looking for 
those labeled as regressions shows one bug: 48701 
.


48616  is 
labeled as a blocker rather than a regression, but is apparently also a 
regression.


Any other regressions to be aware of when considering 6.0.24?

--
Jess Holle

On 2/16/2010 5:52 AM, Mark Thomas wrote:

Mainly a question for Jean-Frederic, but what are the thoughts on aiming
for a 6.0.25 release quite soon? There were a handful of regressions in
6.0.24 it would be good to fix.

Also, if folks have a little time, there are a reasonable number of
proposals in the STATUS file for review. While some are quite involved,
a number are quite simple and should be quick to review.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


   

DO NOT REPLY [Bug 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

--- Comment #1 from Michael Heinen  2010-02-16 12:24:01 UTC 
---
Created an attachment (id=25001)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25001)
Jsps - source and java

- Source jsp 1000hout.jsp
- JSP compiled with Tomcat and Jetty (java and class)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[Mark Thomas]

On 16/02/2010 12:20, Jess Holle wrote:
> Is there a list of such regressions?
> 
> Doing a search for bugs specifically against 6.0.24 and then looking for
> those labeled as regressions shows one bug: 48701
> .
> 
> 48616  is
> labeled as a blocker rather than a regression, but is apparently also a
> regression.
> 
> Any other regressions to be aware of when considering 6.0.24?

A quick scan down the list of 6.0.24 bugs gives:
48612
48613
48614
48616
48627
48668
48694
48701
48716

That's just me going from memory rather than reading the detailed
descriptions.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

Michael Heinen  changed:

   What|Removed |Added

   Platform|PC  |All

--- Comment #2 from Michael Heinen  2010-02-16 12:42:44 UTC 
---
The demo web app is available here:
http://www.datafilehost.com/download-9e9da3b8.html

-- 
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 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

Michael Heinen  changed:

   What|Removed |Added

 CC||m...@recommind.com

-- 
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 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #3 from Remy Maucherat  2010-02-16 13:00:02 UTC ---


*** This bug has been marked as a duplicate of bug 48600 ***

-- 
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 48600] Performance issue with tags

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48600

--- Comment #7 from Remy Maucherat  2010-02-16 13:00:02 UTC ---
*** Bug 48750 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 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

--- Comment #4 from Michael Heinen  2010-02-16 13:17:13 UTC 
---
Could anybody pls explain why this is a duplicate of bug #48600?

I set metadata-complete="true" in web.xml
Moreover the patch attached in 48600 does not improve speed further more
therefore I thought this would be another issue.

#48600 is classified as P2 enhancement. It is much more critical from my point
of view because the performance is really poor. This means more parallel
requests and at the end we can serve just half of the users anymore.

-- 
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 48600] Performance issue with tags

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48600

--- Comment #8 from Remy Maucherat  2010-02-16 13:44:56 UTC ---
(In reply to comment #6)
> JBoss use a DummpAnnotationProcessor to remove this capabilities. I think, 
> now,
> JBoss can use this new version.

Which version of JBoss AS are you talking about ? If it's branch 4.2, then it
doesn't support EE 5, so it's not supposed to be doing injection. That makes
things simpler obviously.

JBoss AS (for the releases that do injection) uses an implementation of
Tomcat's instance manager (which may or may not perform better, as I didn't
micro bench it).

-- 
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 48750] performance problems with JSF 1.2

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48750

--- Comment #5 from Remy Maucherat  2010-02-16 13:56:03 UTC ---
The performance levels do not seem catastrophic, so the severity is very
appropriate.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[jean-frederic clere]

On 02/16/2010 12:52 PM, Mark Thomas wrote:
> Mainly a question for Jean-Frederic, but what are the thoughts on aiming
> for a 6.0.25 release quite soon? There were a handful of regressions in
> 6.0.24 it would be good to fix.
> 

+1 on my side :-)

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48600] Performance issue with tags

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48600

Philippe Prados  changed:

   What|Removed |Added

 CC||apa...@prados.fr

--- Comment #9 from Philippe Prados  2010-02-16 15:44:54 UTC 
---
With JBoss 5.0.0 GA, the class 
org.apache.catalina.core.StandardContext.DummyAnnotationProcessor
implements an empty processor.
It's hard coding to use this "special" version.

Philippe Prados

-- 
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 48608] welcome-file ignores filter mapping

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48608

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WORKSFORME

--- Comment #3 from Mark Thomas  2010-02-16 16:07:13 UTC ---
This works for me with the latest 6.0.x code base. I don't recall anything post
6.0.24 that would have fixed this so it was probably covered in the many fixes
in 6.0.24.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[Jim Jagielski]

On Feb 16, 2010, at 9:03 AM, jean-frederic clere wrote:

> On 02/16/2010 12:52 PM, Mark Thomas wrote:
>> Mainly a question for Jean-Frederic, but what are the thoughts on aiming
>> for a 6.0.25 release quite soon? There were a handful of regressions in
>> 6.0.24 it would be good to fix.
>> 
> 
> +1 on my side :-)
> 

Same here.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.1.20

[Jim Jagielski]

I'm +1

On Feb 15, 2010, at 2:57 PM, Jim Jagielski wrote:

> Give me 24hrs... I'll be able to test tomorrow AM.
> 
> On Feb 15, 2010, at 1:54 PM, Mladen Turk wrote:
> 
>> On 02/10/2010 11:19 AM, Mladen Turk wrote:
>>> Hi,
>>> 
>> 
>> Ping. Anyone?
>> 
>> 
>> Regards
>> -- 
>> ^TM
>> 
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[Mark Thomas]

On 16/02/2010 14:03, jean-frederic clere wrote:
> On 02/16/2010 12:52 PM, Mark Thomas wrote:
>> Mainly a question for Jean-Frederic, but what are the thoughts on aiming
>> for a 6.0.25 release quite soon? There were a handful of regressions in
>> 6.0.24 it would be good to fix.
>>
> 
> +1 on my side :-)

Great. When works for you (keeping in mind there are a lot of patches
that folks need time to review). Early next week?

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910584 - /tomcat/trunk/webapps/docs/html-manager-howto.xml

[kkolinko]

Author: kkolinko
Date: Tue Feb 16 16:34:10 2010
New Revision: 910584

URL: http://svn.apache.org/viewvc?rev=910584&view=rev
Log:
correct a misprint

Modified:
tomcat/trunk/webapps/docs/html-manager-howto.xml

Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=910584&r1=910583&r2=910584&view=diff
==
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Tue Feb 16 16:34:10 2010
@@ -44,7 +44,7 @@
   Applications - List of web applications and
   commands.
   Deploy - Deploying web applications.
-  Diagnostocs - Identifying potential problems.
+  Diagnostics - Identifying potential problems.
   Server Information - Information about the Tomcat
   server.
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Timing for 6.0.25?

[jean-frederic clere]

On 02/16/2010 05:15 PM, Mark Thomas wrote:
> On 16/02/2010 14:03, jean-frederic clere wrote:
>> On 02/16/2010 12:52 PM, Mark Thomas wrote:
>>> Mainly a question for Jean-Frederic, but what are the thoughts on aiming
>>> for a 6.0.25 release quite soon? There were a handful of regressions in
>>> 6.0.24 it would be good to fix.
>>>
>>
>> +1 on my side :-)
> 
> Great. When works for you (keeping in mind there are a lot of patches
> that folks need time to review). Early next week?

Yep

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910604 - in /tomcat/trunk: build.xml res/META-INF/annotations-api.jar.manifest res/META-INF/bootstrap.jar.manifest res/META-INF/default.notice res/META-INF/el-api.jar.manifest

[markt]

Author: markt
Date: Tue Feb 16 17:23:23 2010
New Revision: 910604

URL: http://svn.apache.org/viewvc?rev=910604&view=rev
Log:
Manifest improvements
- automate copyright year
- add manifests for el & annotations
- improve default NOTICE
- add info to bootstrap manifest

Added:
tomcat/trunk/res/META-INF/annotations-api.jar.manifest   (with props)
tomcat/trunk/res/META-INF/el-api.jar.manifest   (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/META-INF/bootstrap.jar.manifest
tomcat/trunk/res/META-INF/default.notice

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=910604&r1=910603&r2=910604&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Feb 16 17:23:23 2010
@@ -52,6 +52,7 @@
   
   
   
+  
 
   
   
@@ -401,12 +402,17 @@
 
 
 
+
 
 
 
   
-  
+  
+
+
+
+  
 
 
   
@@ -415,28 +421,30 @@
 
 
+  filesId="files.annotations-api"
+  manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
 
 
 
+  notice="${tomcat.manifests}/servlet-api.jar.notice"
+  license="${tomcat.manifests}/servlet-api.jar.license" />
 
 
 
+  notice="${tomcat.manifests}/jsp-api.jar.notice"
+  license="${tomcat.manifests}/jsp-api.jar.license" />
 
 
 
+  filesId="files.el-api"
+  manifest="${tomcat.manifests}/el-api.jar.manifest" />
 
 
 
 
   
-  
-  
 
 
 
   
-  
-  
 
 
 
   
-  
-  
 
 
@@ -1872,9 +1880,9 @@
 
 
+   default="${tomcat.manifests}/default.notice" />
 
+   default="${tomcat.manifests}/default.license" />
 
   
 

Added: tomcat/trunk/res/META-INF/annotations-api.jar.manifest
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/annotations-api.jar.manifest?rev=910604&view=auto
==
--- tomcat/trunk/res/META-INF/annotations-api.jar.manifest (added)
+++ tomcat/trunk/res/META-INF/annotations-api.jar.manifest Tue Feb 16 17:23:23 
2010
@@ -0,0 +1,11 @@
+Manifest-version: 1.0
+
+Name: javax/servlet/
+Specification-Title: Java API for Servlets (Annotations)
+Specification-Version: 3.0
+Specification-Vendor: Sun Microsystems, Inc.
+Implementation-Title: javax.servlet
+Implementation-Version: 3...@servlet.revision@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@

Propchange: tomcat/trunk/res/META-INF/annotations-api.jar.manifest
--
svn:eol-style = native

Propchange: tomcat/trunk/res/META-INF/annotations-api.jar.manifest
--
svn:keywords = Date Author Id Revision

Modified: tomcat/trunk/res/META-INF/bootstrap.jar.manifest
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/bootstrap.jar.manifest?rev=910604&r1=910603&r2=910604&view=diff
==
--- tomcat/trunk/res/META-INF/bootstrap.jar.manifest (original)
+++ tomcat/trunk/res/META-INF/bootstrap.jar.manifest Tue Feb 16 17:23:23 2010
@@ -1,5 +1,11 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.catalina.startup.Bootstrap
 Class-Path: commons-daemon.jar
-Specification-Title: Catalina
-Specification-Version: @VERSION_MAJOR_MINOR@
\ No newline at end of file
+Specification-Title: Apache Tomcat Bootstrap
+Specification-Version: @VERSION_MAJOR_MINOR@
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat Bootstrap
+Implementation-Version: @VERSION@
+Implementation-Vendor: Apache Software Foundation
+X-Compile-Source-JDK: @source.jdk@
+X-Compile-Target-JDK: @target.jdk@
\ No newline at end of file

Modified: tomcat/trunk/res/META-INF/default.notice
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/default.notice?rev=910604&r1=910603&r2=910604&view=diff
==
--- tomcat/trunk/res/META-INF/default.notice (original)
+++ tomcat/trunk/res/META-INF/default.notice Tue Feb 16 17:23:23 2010
@@ -1,2 +1,5 @@
+Apache Tomcat
+Copyright 19...@year@ The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Added: tomcat/trunk/res/META-INF/el-api.jar.manifest
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/el-api.jar.manifest?rev=910604&view=auto
==
--- tomcat/trunk/res/META-INF/el-api.jar.manifest (added)
+++ tomcat/trunk/res/META-INF/el-api.jar.manifest Tue Feb 16 17:23:23 2010

svn commit: r910612 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

[kkolinko]

Author: kkolinko
Date: Tue Feb 16 17:29:57 2010
New Revision: 910612

URL: http://svn.apache.org/viewvc?rev=910612&view=rev
Log:
If the memory leak occured in the ROOT application, display "/" instead on an 
empty line

It might be better to apply this fix to 
StandardHost.findReloadedContextMemoryLeaks(),
as it is equally hard to see an empty string when calling this method through 
JConsole,
but I am not sure that I want to introduce irregularity into the API.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=910612&r1=910611&r2=910612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Feb 
16 17:29:57 2010
@@ -513,6 +513,9 @@
 ((StandardHost) host).findReloadedContextMemoryLeaks();
 
 for (String result : results) {
+if ("".equals(result)) {
+result = "/";
+}
 writer.println(result);
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: jk/cluster - intelligent systems load

[Costin Manolache]

On Tue, Feb 16, 2010 at 1:38 AM, Mladen Turk  wrote:

> On 02/16/2010 10:21 AM, Mark Thomas wrote:
>
>> On 16/02/2010 09:08, Mladen Turk wrote:
>>
>>> On 02/16/2010 09:56 AM, Mark Thomas wrote:
>>>
 The other thing it potentially allows is the cluster to tell the proxy
 about which nodes are in the cluster, allowing a more dynamic
 configuration. Not sure I'd want to use that in production, but in dev
 that could be useful.


>>> Hmm, the zero conf is actually more desired in production then in
>>> dev environments since it allows single point of admin and no need
>>> for webserver reconfig.
>>>
>>
>> Its just a personal opinion. I don't like any form of auto-configuration
>> in production because I always feel I never quite know what it is doing
>> or, more importantly, what it might do.
>>
>
> Well it's zero conf inside web server only, so its conf is passed from
> Tomcat, and that is certainly something strictly defined inside .xml or
> via some manager app.
>
> There was attempt for creating AJP14 protocol, since the current one
> lacks some IPC capabilities with the limited packed size being the major
> problem. However I'd rather see mod_jk/isapi with http protocol then
> creating
> some AJP extensions or even completely new protocol. Network and processing
> speed changed a lot since 90's so now there's almost no performance
> difference
> between AJP and HTTP implementations. With some new HTTP proposals for
> connection reusing even that factor could be eliminated in the future.
>
>
IMHO bi-directional communication is quite important - there are all kind of
new
protocols ( web socket, SPDY ) that requires it. You can have apache as a
frontend
for those protocols - but than you need AJP or mod_proxy to support it as
well.

I think the main driver for replacing ajp is the 2-directional protocols -
and if we
replace it, why invent a new protocol and not just adopt SPDY, which has all
we need.

There are some issues with SPDY - like the requirement to compress and do
SSL,
but we can easily tweak it.

Regarding auto-conf , smarter load balancing and the other features enabled
by 2-directional
communication - in a large enough cluster they become quite important.

Costin

svn commit: r910643 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Tue Feb 16 18:35:40 2010
New Revision: 910643

URL: http://svn.apache.org/viewvc?rev=910643&view=rev
Log:
vote and propose a corrected 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=910643&r1=910642&r2=910643&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 18:35:40 2010
@@ -341,7 +341,39 @@
 * Memory leak detection for JMX and manager
   
http://people.apache.org/~markt/patches/2010-02-12-memory-leak-detection.patch
   +1: markt
-  -1: 
+  -1: kkolinko:
+- It does not compile, because WebappClassLoader.isStarted() was absent.
+- /findleaks was not mapped to ManagerServlet
+Updated patch proposed below.
+
+  Alternative proposal:
+  
http://people.apache.org/~kkolinko/patches/2010-02-16_tc6_memory-leak-detection.patch
+  It is corrected markt's patch
+  (Added revs.909204,910584,910612
+   TC 6 specifics: /findleaks should be explicitly mapped in web.xml,
+   where TC 7 uses /text/findleaks, and that URL is mentioned in 
manager-howto.xml)
+  +1: kkolinko
+  -1:
+
+  kkolinko: Some further thoughts on naming/messages/documentation
+   - It might be not so clear to a newcomer, that to use this functionality 
you have
+ a) Use you application
+ b) Reload it
+ c) Press the "Find leaks" button
+ It does not work without a) and b).
+
+   - Saying that application "triggered" a memory leak sounds too harsh for
+   me. I think "has" or "suffered" would be better here.
+
+   - It is safe to press the "Find leaks" button several times. Besides the
+   gc call it just "lists" the contexts that are still present in memory.
+   It does not clear its own list.
+
+  kkolinko: The display fix for ROOT context (r910612) might be applied to
+   StandardHost.findReloadedContextMemoryLeaks() as well. Any comments? If
+   results of a JMX call are displayed to humans, I'd be better to have "/"
+   instead of an empty string.
+
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48318
   Handle case where WebDAV resource is in directory listing but is not



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 18:39:08 2010
New Revision: 910644

URL: http://svn.apache.org/viewvc?rev=910644&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=910644&r1=910643&r2=910644&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 18:39:08 2010
@@ -426,3 +426,8 @@
   http://svn.apache.org/viewvc?rev=910485&view=rev
   +1: markt
   -1: 
+
+* Various manifest improvements
+  
http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
+  +1: markt
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Konstantin Kolinko]

2010/2/16  :
> Author: markt
> Date: Tue Feb 16 18:39:08 2010
> New Revision: 910644
>
> URL: http://svn.apache.org/viewvc?rev=910644&view=rev
> Log:
> Proposal
>
> Modified:
>    tomcat/tc6.0.x/trunk/STATUS.txt
>

> +
> +* Various manifest improvements
> +  
> http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
> +  +1: markt
> +  -1:

Looks good, though I have to test it yet.
I see that it includes rev.905360 that was already proposed to TC.6.
You may revoke that old proposal as this one supersedes it.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48611] Can't build "extras" in 6.0.24. default.manifest does not exist

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48611

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

--- Comment #5 from Mark Thomas  2010-02-16 18:56:23 UTC ---
The first patch has been applied and I have proposed a patch to add further
improvements.

As a short-cut to building all of Tomcat you can do:
ant build-manifests
ant -f extras.xml

but I don't want to remove the dependency. Therefore, I am closing this as
WONTFIX.

-- 
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: r910650 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 18:59:48 2010
New Revision: 910650

URL: http://svn.apache.org/viewvc?rev=910650&view=rev
Log:
Withdraw proposal - it is included in a wider manifest 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=910650&r1=910649&r2=910650&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 18:59:48 2010
@@ -216,14 +216,6 @@
   +1: markt, kkolinko
   -1: 
   
-* Make manifests more useful
-  http://svn.apache.org/viewvc?rev=905360&view=rev
-  +1: markt, kkolinko
-  -1: 
-kkolinko: Good, but more fixes will be required:
-1) el-api.jar, annotations-api.jar containing javax.* classes should not 
use this manifest,
-2) jsp-api.jar, servlet-api.jar contain unfiltered 
"@implementation.revision@" in theirs
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48653
   RemoteIpValve : request.secure and request.scheme are not forced to "false"
   and "http" if X-Forwarded-Proto=http



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910665 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 19:56:41 2010
New Revision: 910665

URL: http://svn.apache.org/viewvc?rev=910665&view=rev
Log:
Respond to question

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=910665&r1=910664&r2=910665&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 19:56:41 2010
@@ -151,6 +151,9 @@
   -1:
  kkolinko: Why ValueExpressionImpl.equals() is implemented as comparing
  the hash codes? What will happen with false positives?
+ markt: Not sure why hashCode() was used. It was part of the original
+implementation. I'm not concerned. False positives should be very,
+very rare.
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48627
   Regression in re-working of EL parsing



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910666 - /tomcat/tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Tue Feb 16 19:58:40 2010
New Revision: 910666

URL: http://svn.apache.org/viewvc?rev=910666&view=rev
Log:
add patch URL for BZ 48498

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=910666&r1=910665&r2=910666&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 19:58:40 2010
@@ -399,6 +399,7 @@
 
 * Workaround https://issues.apache.org/bugzilla/show_bug.cgi?id=48498
   Avoid ArrayIndexOutOfBoundsException triggered by Java 6/7 XML parser bug
+  http://svn.apache.org/viewvc?rev=910370&view=rev
   +1: markt
   -1: 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910674 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

[kkolinko]

Author: kkolinko
Date: Tue Feb 16 20:27:20 2010
New Revision: 910674

URL: http://svn.apache.org/viewvc?rev=910674&view=rev
Log:
vote and propose for 5.5

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.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=910674&r1=910673&r2=910674&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Feb 16 20:27:20 2010
@@ -205,3 +205,10 @@
   https://issues.apache.org/bugzilla/attachment.cgi?id=24966
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
+  Avoid NPE on background compile
+  http://svn.apache.org/viewvc?rev=910471&view=rev
+  Patch by markt
+  +1: kkolinko
+  -1: 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=910674&r1=910673&r2=910674&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 20:27:20 2010
@@ -413,7 +413,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
   Avoid NPE on background compile
   http://svn.apache.org/viewvc?rev=910471&view=rev
-  +1: markt
+  +1: markt, kkolinko
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48616] Struts 1.2 and bean:define tag throws jsp 1.1 regression exception

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48616

--- Comment #23 from Mark Thomas  2010-02-16 20:45:19 UTC ---
Trunk patch looks good to me. Feel free to apply it (reverting my previous
fix).

-- 
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: r910683 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 20:49:18 2010
New Revision: 910683

URL: http://svn.apache.org/viewvc?rev=910683&view=rev
Log:
Withdraw my proposal. Vote for Konstantin's.

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=910683&r1=910682&r2=910683&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 20:49:18 2010
@@ -182,33 +182,12 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48616
   This is a regression caused by the fix for
   https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
-  The requirement for variable declaration also depends on whether or not a
-  fragment helper has been used for the parent tag (if any). Where such a 
helper
-  has been used, the variables must be redefined.
-  Test cases for both bugs and the JSP TCK pass with this patch applied.
-  http://people.apache.org/~markt/patches/2010-02-14-bug42390.patch
-  +1: markt
-  -1: kkolinko:
-1. isImplemetedAsFragment() method is wrong.
-   1) A fragment can also be created with  when calling a 
tag,
- when the attribute is declared being of type JspFragment.
- -see JSP.5.10 , or the places where the following 
method is called:
- Generator#GeneratorVisitor#generateJspFragment(Node, String)
-
-   2) It should navigate up the parents chain. The SimpleTag can be one
- of our parents, not necessary the immediate one.
-
-
-  Additional patches (trivial):
-  http://svn.apache.org/viewvc?rev=905643&view=rev (misprint)
-  http://svn.apache.org/viewvc?rev=909865&view=rev (javadoc)
-  +1: kkolinko, markt
-  -1:
-
-  Alternative proposal:
+  JspFragments are scriptless, so do need to declare or sync scripting
+  variables for fragments. Since errors in syncing the scripting variables for
+  JSP FRagments caused 48616 & 42390, this fixes both these bugs too.
   https://issues.apache.org/bugzilla/show_bug.cgi?id=48616#c21
   (https://issues.apache.org/bugzilla/attachment.cgi?id=24992)
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910693 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Feb 16 21:13:18 2010
New Revision: 910693

URL: http://svn.apache.org/viewvc?rev=910693&view=rev
Log:
Withdraw patch. Bug has a better fix proposed.

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=910693&r1=910692&r2=910693&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 16 21:13:18 2010
@@ -93,18 +93,6 @@
   +1: markt, kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
-  Get nested role search working when {1} is used in roleSearch
-  Patch provided by Gabriel
-  http://svn.apache.org/viewvc?rev=904914&view=rev
-  +1: markt
-  -1:
-  -0: kkolinko: I think using groupDN for {1} does not match the
-documentation, and I am not sure that it will work even for the OP of that 
issue,
-though I would like to know more about his configuration to be sure.
-See my comment #2 for that issue.
-
-
 * Fix various EL TCK failures
   http://svn.apache.org/viewvc?view=rev&rev=899653 (signatures)
+1: markt, kkolinko



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910695 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

[markt]

Author: markt
Date: Tue Feb 16 21:15:21 2010
New Revision: 910695

URL: http://svn.apache.org/viewvc?rev=910695&view=rev
Log:
Revert r904913. https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
 now proposes a better solution

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=910695&r1=910694&r2=910695&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Feb 16 
21:15:21 2010
@@ -1687,7 +1687,7 @@
 Set newThisRound = new HashSet(); // Stores 
the groups we find in this iteration
 
 for (String groupDN : newGroupDNs) {
-filter = roleFormat.format(new String[] { groupDN, groupDN 
});
+filter = roleFormat.format(new String[] { groupDN });
 
 if (containerLog.isTraceEnabled()) {
 containerLog.trace("Perform a nested group search with 
base "+ roleBase + " and filter " + filter);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Konstantin Kolinko]

2010/2/16 Konstantin Kolinko :
> 2010/2/16  :
>> Author: markt
>> Date: Tue Feb 16 18:39:08 2010
>> New Revision: 910644
>>
>> URL: http://svn.apache.org/viewvc?rev=910644&view=rev
>> Log:
>> Proposal
>>
>> Modified:
>>    tomcat/tc6.0.x/trunk/STATUS.txt
>>
>
>> +
>> +* Various manifest improvements
>> +  
>> http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
>> +  +1: markt
>> +  -1:
>

1. Why  annotations-api.jar.manifest  starts with "Name: javax/servlet/ " ?

The classes in annotations-api.jar  are in different packages:
javax.annotation
javax.ejb
javax.persistence
javax.xml

2. el-api.jar contains unfiltered @el.revision@ in its manifest

3. If you build extras after building tomcat, all files in extras

extras\catalina-jmx-remote.jar
extras\catalina-ws.jar
extras\tomcat-juli.jar
extras\tomcat-juli-adapters.jar

contain unfiltered \META-INF\NOTICE  with a @YEAR@


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn propchange: r910695 - svn:log

[kkolinko]

Author: kkolinko
Revision: 910695
Modified property: svn:log

Modified: svn:log at Tue Feb 16 21:30:56 2010
--
--- svn:log (original)
+++ svn:log Tue Feb 16 21:30:56 2010
@@ -1,2 +1,2 @@
-Revert r904913. https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
+Revert r904914. https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
  now proposes a better solution


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Mark Thomas]

On 16/02/2010 21:24, Konstantin Kolinko wrote:
> 2010/2/16 Konstantin Kolinko :
>> 2010/2/16  :
>>> Author: markt
>>> Date: Tue Feb 16 18:39:08 2010
>>> New Revision: 910644
>>>
>>> URL: http://svn.apache.org/viewvc?rev=910644&view=rev
>>> Log:
>>> Proposal
>>>
>>> Modified:
>>>tomcat/tc6.0.x/trunk/STATUS.txt
>>>
>>
>>> +
>>> +* Various manifest improvements
>>> +  
>>> http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
>>> +  +1: markt
>>> +  -1:
>>
> 
> 1. Why  annotations-api.jar.manifest  starts with "Name: javax/servlet/ " ?

Because the definitions come from the Servlet spec and I couldn't come
up with a better name. Suggestions welcome.

> 2. el-api.jar contains unfiltered @el.revision@ in its manifest

I'll fix that.

> 3. If you build extras after building tomcat, all files in extras
> 
> extras\catalina-jmx-remote.jar
> extras\catalina-ws.jar
> extras\tomcat-juli.jar
> extras\tomcat-juli-adapters.jar
> 
> contain unfiltered \META-INF\NOTICE  with a @YEAR@

And I thought I fixed that. I'll check. I modified my patch shortly
after I proposed it. Did you get the modified version?

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Konstantin Kolinko]

2010/2/17 Mark Thomas :
> On 16/02/2010 21:24, Konstantin Kolinko wrote:
>> 2010/2/16 Konstantin Kolinko :
>>> 2010/2/16  :
 Author: markt
 Date: Tue Feb 16 18:39:08 2010
 New Revision: 910644

 URL: http://svn.apache.org/viewvc?rev=910644&view=rev
 Log:
 Proposal

 Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt

>>>
 +
 +* Various manifest improvements
 +  
 http://people.apache.org/~markt/patches/2010-02-16-manifest-improvements.patch
 +  +1: markt
 +  -1:
>>>
>>
>> 1. Why  annotations-api.jar.manifest  starts with "Name: javax/servlet/ " ?
>
> Because the definitions come from the Servlet spec and I couldn't come
> up with a better name. Suggestions welcome.

I'll think about that.

For starters, we can remove the "Name:",
so that that title applies to the jar as a whole.

Going into details,
I see that SRV.14.5 says that it "expands on the
Java EE 5 specification section 5 titled “Resources, Naming, and Injection.”"

javax/annotation/
are JSR 250 Common Annotations for the Java™ Platform™

javax/ejb/
are from JSR 220 Enterprise JavaBeansTM 3.0

javax/persistence/
are from JSR 220 Enterprise JavaBeansTM 3.0

javax/xml/ws/
are from JSR 224 JavaTM API for XML-Based Web Services (JAX-WS) 2.0

>
>> 2. el-api.jar contains unfiltered @el.revision@ in its manifest
>
> I'll fix that.
>

Replace
+
with
+

>> 3. If you build extras after building tomcat, all files in extras
>>
>> extras\catalina-jmx-remote.jar
>> extras\catalina-ws.jar
>> extras\tomcat-juli.jar
>> extras\tomcat-juli-adapters.jar
>>
>> contain unfiltered \META-INF\NOTICE  with a @YEAR@
>
> And I thought I fixed that. I'll check. I modified my patch shortly
> after I proposed it. Did you get the modified version?

The current version is the same as the one that I applied.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r910644 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Mark Thomas]

On 16/02/2010 21:33, Mark Thomas wrote:
> On 16/02/2010 21:24, Konstantin Kolinko wrote:
>> 2. el-api.jar contains unfiltered @el.revision@ in its manifest
> 
> I'll fix that.

Fixed. It was a copy/paste error.

>> 3. If you build extras after building tomcat, all files in extras
>>
>> extras\catalina-jmx-remote.jar
>> extras\catalina-ws.jar
>> extras\tomcat-juli.jar
>> extras\tomcat-juli-adapters.jar
>>
>> contain unfiltered \META-INF\NOTICE  with a @YEAR@
> 
> And I thought I fixed that. I'll check. I modified my patch shortly
> after I proposed it. Did you get the modified version?

My bad. I fixed the manifests but forgot the notice. This is now fixed.
I just updated the previous file since no-one has voted for it yet.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910792 - in /tomcat/trunk/java/org/apache/jasper/compiler: Generator.java Node.java ScriptingVariabler.java

[kkolinko]

Author: kkolinko
Date: Wed Feb 17 01:10:34 2010
New Revision: 910792

URL: http://svn.apache.org/viewvc?rev=910792&view=rev
Log:
Apply my patch from https://issues.apache.org/bugzilla/show_bug.cgi?id=48616#c20
This patch
- Reverts r905145,
- Provides an alternative fix for bug 48616 and bug 42390,
- Replaces Vector -> List, Hashtable -> HashMap in the affected API.

JspFragments are scriptless, so no need to declare or sync scripting
variables for fragments. Since errors in syncing the scripting variables for
JSP Fragments caused 48616 & 42390, this fixes both these bugs too.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=910792&r1=910791&r2=910792&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed Feb 17 
01:10:34 2010
@@ -167,26 +167,6 @@
 return b.toString();
 }
 
-/**
- * Finds the  subelement of the given parent node. If not
- * found, null is returned.
- */
-protected static Node.JspBody findJspBody(Node parent) {
-Node.JspBody result = null;
-
-Node.Nodes subelements = parent.getBody();
-for (int i = 0; (subelements != null) && (i < subelements.size()); 
i++) {
-Node n = subelements.getNode(i);
-if (n instanceof Node.JspBody) {
-result = (Node.JspBody) n;
-break;
-}
-}
-
-return result;
-}
-
-
 private String createJspId() {
 if (this.jspIdPrefix == null) {
 StringBuilder sb = new StringBuilder(32);
@@ -358,6 +338,9 @@
 
 @Override
 public void visit(Node.CustomTag n) throws JasperException {
+// XXX - Actually there is no need to declare those
+// "_jspx_" + varName + "_" + nestingLevel variables when we 
are
+// inside a JspFragment.
 
 if (n.getCustomNestingLevel() > 0) {
 TagVariableInfo[] tagVarInfos = n.getTagVariableInfos();
@@ -991,6 +974,25 @@
 }
 }
 
+/**
+ * Finds the  subelement of the given parent node. If 
not
+ * found, null is returned.
+ */
+private Node.JspBody findJspBody(Node parent) {
+Node.JspBody result = null;
+
+Node.Nodes subelements = parent.getBody();
+for (int i = 0; (subelements != null) && (i < subelements.size()); 
i++) {
+Node n = subelements.getNode(i);
+if (n instanceof Node.JspBody) {
+result = (Node.JspBody) n;
+break;
+}
+}
+
+return result;
+}
+
 @Override
 public void visit(Node.ForwardAction n) throws JasperException {
 Node.JspAttribute page = n.getPage();
@@ -2505,11 +2507,16 @@
 }
 
 private void declareScriptingVars(Node.CustomTag n, int scope) {
+if (isFragment) {
+// No need to declare Java variables, if we inside a
+// JspFragment, because a fragment is always scriptless.
+return;
+}
 
-Vector vec = n.getScriptingVars(scope);
+List vec = n.getScriptingVars(scope);
 if (vec != null) {
 for (int i = 0; i < vec.size(); i++) {
-Object elem = vec.elementAt(i);
+Object elem = vec.get(i);
 if (elem instanceof VariableInfo) {
 VariableInfo varInfo = (VariableInfo) elem;
 if (varInfo.getDeclare()) {
@@ -2552,6 +2559,14 @@
 if (n.getCustomNestingLevel() == 0) {
 return;
 }
+if (isFragment) {
+// No need to declare Java variables, if we inside a
+// JspFragment, because a fragment is always scriptless.
+// Thus, there is no need to save/ restore/ sync them.
+// Note, that JspContextWrapper.syncFoo() methods will take
+// care of saving/ restoring/ sync'ing of JspContext 
attributes.
+return;
+}
 
 TagVariableInfo[] tagVarInfos = n.getTagVariableInfos();
 VariableInfo[] varInfos = n.getVariableInfos();
@@ -2559,13 +2574,15 @@
 return;
 }
 
+List declaredVariables = n.getScriptingVars(scope);
+
 if (varInfos.length > 0) {
 for (int i = 0; i < v

DO NOT REPLY [Bug 48616] Struts 1.2 and bean:define tag throws jsp 1.1 regression exception

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48616

--- Comment #24 from Konstantin Kolinko  2010-02-17 
01:11:59 UTC ---
Applied to trunk (r910792), proposed for 6.0 and 5.5.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910796 - /tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java

[kkolinko]

Author: kkolinko
Date: Wed Feb 17 01:52:41 2010
New Revision: 910796

URL: http://svn.apache.org/viewvc?rev=910796&view=rev
Log:
Fix a bug in ImplicitObjectELResolver.ScopeMap intruduced when applying 
generics there:
the get(String) and remove(String) methods were not overwriting the ones of 
AbstractMap,
because those are declared as get(Object) and remove(Object),
thus using ineffective implementations provided by AbstractMap.

Modified:
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=910796&r1=910795&r2=910796&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java 
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Wed 
Feb 17 01:52:41 2010
@@ -561,9 +561,10 @@
 
 }
 
-public final V get(String key) {
+@Override
+public final V get(Object key) {
 if (key != null) {
-return getAttribute(key);
+return getAttribute((String) key);
 }
 return null;
 }
@@ -574,18 +575,19 @@
 throw new NullPointerException();
 }
 if (value == null) {
-this.removeAttribute(key.toString());
+this.removeAttribute(key);
 } else {
-this.setAttribute(key.toString(), value);
+this.setAttribute(key, value);
 }
 return null;
 }
 
-public final V remove(String key) {
+@Override
+public final V remove(Object key) {
 if (key == null) {
 throw new NullPointerException();
 }
-this.removeAttribute(key.toString());
+this.removeAttribute((String) key);
 return null;
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r910803 - /tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java

[kkolinko]

Author: kkolinko
Date: Wed Feb 17 02:26:41 2010
New Revision: 910803

URL: http://svn.apache.org/viewvc?rev=910803&view=rev
Log:
Provide slightly more efficient implementations for ScopeMap.size() and 
ScopeMap.containsKey().

Modified:
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=910803&r1=910802&r2=910803&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java 
(original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Wed 
Feb 17 02:26:41 2010
@@ -524,6 +524,35 @@
 return set;
 }
 
+@Override
+public final int size() {
+int size = 0;
+Enumeration e = getAttributeNames();
+if (e != null) {
+while (e.hasMoreElements()) {
+e.nextElement();
+size++;
+}
+}
+return size;
+}
+
+@Override
+public final boolean containsKey(Object key) {
+if (key == null) {
+return false;
+}
+Enumeration e = getAttributeNames();
+if (e != null) {
+while (e.hasMoreElements()) {
+if (key.equals(e.nextElement())) {
+return true;
+}
+}
+}
+return false;
+}
+
 private class ScopeEntry implements Map.Entry {
 
 private final String key;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.1.20

[Konstantin Kolinko]

2010/2/10 Mladen Turk :
> Apache Tomcat Native 1.1.20 is:
>
> [x] Stable - no major issues, no regressions

Tested win32 binaries only.


Minor: *.md5 and *.sha1 files should have " *" between checksum and
filename, because those files are binary.  md5sum/sha1sum that I am
using were saying that the checksums are wrong without that change.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 48756] New: I am not finding "commons-collections-3.1.jar" in tomcat 5.5.28

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48756

   Summary: I am not finding "commons-collections-3.1.jar" in
tomcat 5.5.28
   Product: Tomcat 5
   Version: 5.5.28
  Platform: PC
OS/Version: All
Status: NEW
  Severity: major
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: msd...@gmail.com


I am facing problem to execute class file, because tomcat 5.5.28 removed
commons-collections-3.1.jar file.

Once I am putting this file manually, its working fine.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.1.20

[Mladen Turk]

On 02/17/2010 05:12 AM, Konstantin Kolinko wrote:

2010/2/10 Mladen Turk:

Apache Tomcat Native 1.1.20 is:

[x] Stable - no major issues, no regressions


Tested win32 binaries only.


Minor: *.md5 and *.sha1 files should have " *" between checksum and
filename, because those files are binary.  md5sum/sha1sum that I am
using were saying that the checksums are wrong without that change.



OK. I'll use the `md5sum --binary ...` in the future
You can do the same however when checking

Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[RESULTS] Was: [VOTE] Release Apache Tomcat Native 1.1.20

[Mladen Turk]

We have collected 4 binding votes, so I'll proceed
with the release.



Apache Tomcat Native 1.1.20 is:

[X] Stable - no major issues, no regressions
[ ] Beta - at least one significant issue -- tell us what it is
[ ] Alpha - multiple significant issues -- tell us what they are



Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org