Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h

2010-09-11 Thread William A. Rowe Jr.
On 9/11/2010 12:23 AM, Mladen Turk wrote:
> On 09/10/2010 08:06 PM, William A. Rowe Jr. wrote:
>> On 9/10/2010 12:48 PM, mt...@apache.org wrote:
>>> Author: mturk
>>> Date: Fri Sep 10 17:48:15 2010
>>> New Revision: 995901
>>>
>>> URL: http://svn.apache.org/viewvc?rev=995901&view=rev
>>> Log:
>>> Oops. We should really do something with that portable.h
>>
>> svn rm it. The make files need simple cat portable.h.in>  portable.h 
>> statements
>> to generate timestamped flavors on netware/win32/os2.
>>
> 
> Well it's already excluded in jk_global.h by
> #if !defined(WIN32) && !defined(AS400) && !defined(NETWARE)
> #include "portable.h"
> #endif
> 
> So, dunno if we need to ship that at the first place.

Sounds like not.

This might be a good point to drop it and let people confirm that it isn't used?

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



Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h

2010-09-11 Thread Mladen Turk

On 09/11/2010 09:54 AM, William A. Rowe Jr. wrote:


So, dunno if we need to ship that at the first place.


Sounds like not.

This might be a good point to drop it and let people confirm that it isn't used?



+1

Regards
--
^TM

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



svn commit: r996112 - in /tomcat/trunk/java/org/apache/catalina/startup: EngineRuleSet.java HostRuleSet.java

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 09:48:32 2010
New Revision: 996112

URL: http://svn.apache.org/viewvc?rev=996112&view=rev
Log:
Remove unnecessary digester configuration
hostConfigClass and engineConfigClass were removed before 6.0.x

Modified:
tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=996112&r1=996111&r2=996112&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Sep 11 
09:48:32 2010
@@ -94,10 +94,6 @@ public class EngineRuleSet extends RuleS
  "org.apache.catalina.core.StandardEngine",
  "className");
 digester.addSetProperties(prefix + "Engine");
-digester.addRule(prefix + "Engine",
- new LifecycleListenerRule
- ("org.apache.catalina.startup.EngineConfig",
-  "engineConfigClass"));
 digester.addSetNext(prefix + "Engine",
 "setContainer",
 "org.apache.catalina.Container");

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=996112&r1=996111&r2=996112&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Sep 11 
09:48:32 2010
@@ -96,10 +96,6 @@ public class HostRuleSet extends RuleSet
 digester.addSetProperties(prefix + "Host");
 digester.addRule(prefix + "Host",
  new CopyParentClassLoaderRule());
-digester.addRule(prefix + "Host",
- new LifecycleListenerRule
- ("org.apache.catalina.startup.HostConfig",
-  "hostConfigClass"));
 digester.addSetNext(prefix + "Host",
 "addChild",
 "org.apache.catalina.Container");



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



svn commit: r996114 - in /tomcat/trunk/java/org/apache/catalina/startup: EngineRuleSet.java HostRuleSet.java

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 10:17:07 2010
New Revision: 996114

URL: http://svn.apache.org/viewvc?rev=996114&view=rev
Log:
Revert r996112. At least some of that config is required.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=996114&r1=996113&r2=996114&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sat Sep 11 
10:17:07 2010
@@ -94,6 +94,10 @@ public class EngineRuleSet extends RuleS
  "org.apache.catalina.core.StandardEngine",
  "className");
 digester.addSetProperties(prefix + "Engine");
+digester.addRule(prefix + "Engine",
+ new LifecycleListenerRule
+ ("org.apache.catalina.startup.EngineConfig",
+  "engineConfigClass"));
 digester.addSetNext(prefix + "Engine",
 "setContainer",
 "org.apache.catalina.Container");

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=996114&r1=996113&r2=996114&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Sat Sep 11 
10:17:07 2010
@@ -96,6 +96,10 @@ public class HostRuleSet extends RuleSet
 digester.addSetProperties(prefix + "Host");
 digester.addRule(prefix + "Host",
  new CopyParentClassLoaderRule());
+digester.addRule(prefix + "Host",
+ new LifecycleListenerRule
+ ("org.apache.catalina.startup.HostConfig",
+  "hostConfigClass"));
 digester.addSetNext(prefix + "Host",
 "addChild",
 "org.apache.catalina.Container");



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



svn commit: r996117 - /tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 10:44:50 2010
New Revision: 996117

URL: http://svn.apache.org/viewvc?rev=996117&view=rev
Log:
Fix an issue where  elements defined in server.xml did not use 
the configClass specified by the parent  element

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=996117&r1=996116&r2=996117&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java 
Sat Sep 11 10:44:50 2010
@@ -19,18 +19,27 @@
 package org.apache.catalina.startup;
 
 
-import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Container;
 import org.apache.catalina.LifecycleListener;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.digester.Rule;
 import org.xml.sax.Attributes;
 
 
 /**
- * Rule that creates a new LifecycleListener instance,
- * and associates it with the top object on the stack (which must
- * implement LifecycleListener).
+ * Rule that creates a new {...@link LifecycleListener} and associates it with 
the
+ * top object on the stack which must implement {...@link Container}. The
+ * implementation class to be used is determined by:
+ * 
+ * Does the top element on the stack specify an implementation class using
+ * the attribute specified when this rule was created?
+ * Does the parent {...@link Container} of the {...@link Container} on the 
top of
+ * the stack specify an implementation class using the attribute specified
+ * when this rule was created?
+ * Use the default implementation class specified when this rule was
+ * created.
+ * 
  */
-
 public class LifecycleListenerRule extends Rule {
 
 
@@ -83,21 +92,43 @@ public class LifecycleListenerRule exten
 public void begin(String namespace, String name, Attributes attributes)
 throws Exception {
 
-// Instantiate a new LifecyleListener implementation object
-String className = listenerClass;
+Container c = (Container) digester.peek();
+Container p = null;
+Object obj = digester.peek(1);
+if (obj instanceof Container) {
+p = (Container) obj;
+}
+
+String className = null;
+
+// Check the container for the specified attribute
 if (attributeName != null) {
 String value = attributes.getValue(attributeName);
 if (value != null)
 className = value;
 }
+
+// Check the container's parent for the specified attribute
+if (p != null && className == null) {
+String configClass =
+(String) IntrospectionUtils.getProperty(p, attributeName);
+if (configClass != null && configClass.length() > 0) {
+className = configClass;
+}
+}
+
+// Use the default
+if (className == null) {
+className = listenerClass;
+}
+
+// Instantiate a new LifecyleListener implementation object
 Class clazz = Class.forName(className);
 LifecycleListener listener =
 (LifecycleListener) clazz.newInstance();
 
 // Add this LifecycleListener to our associated component
-Lifecycle lifecycle = (Lifecycle) digester.peek();
-lifecycle.addLifecycleListener(listener);
-
+c.addLifecycleListener(listener);
 }
 
 



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



Re: [VOTE] Release Tomcat 5.5.31 Build

2010-09-11 Thread Jim Jagielski

On Sep 8, 2010, at 10:50 AM, Jim Jagielski wrote:

> The builds for Tomcat 5.5.31 are ready for testing and approval.
> The candidates binaries are available here:
> 
>  http://people.apache.org/~jim/tomcat-5.5/
> 
> According to the release process, the 5.5.31 build corresponding to the
> tag TOMCAT_5_5_31 [1] is:
> 
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [ ] Stable
> +++
> 
> 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_31/
> 

+1: Stable

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



Re: [VOTE] Release Tomcat 5.5.31 Build

2010-09-11 Thread Rainer Jung

On 08.09.2010 16:50, Jim Jagielski wrote:

The builds for Tomcat 5.5.31 are ready for testing and approval.
The candidates binaries are available here:

   http://people.apache.org/~jim/tomcat-5.5/

According to the release process, the 5.5.31 build corresponding to the
tag TOMCAT_5_5_31 [1] is:

[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable


Thanks for RMing.

Rainer

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



Re: [VOTE] Release Tomcat 5.5.31 Build

2010-09-11 Thread Mladen Turk

According to the release process, the 5.5.31 build corresponding to the
tag TOMCAT_5_5_31 [1] is:

[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable



Regards
--
^TM

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



Re: [VOTE] Release Tomcat 5.5.31 Build

2010-09-11 Thread Mark Thomas
On 08/09/2010 15:50, Jim Jagielski wrote:
> The builds for Tomcat 5.5.31 are ready for testing and approval.
> The candidates binaries are available here:
> 
>   http://people.apache.org/~jim/tomcat-5.5/
> 
> According to the release process, the 5.5.31 build corresponding to the
> tag TOMCAT_5_5_31 [1] is:
> 
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [X] Stable
> +++
> 
> 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_31/

OpenPGP signatures good
Key in web of trust

src.tag.gz == src.zip (except line endings, as expected)

src.zip != svn tag
Several differences
1. JavaMail
The changes only formalise what previous release managers had done
manually so whilst I would have held the file changes over for 5.5.32, I
don't have a problem with this difference between the tag and src bundle.
2. Build output
No strong feelings. I wouldn't have included it but I don't see any harm
in it being there.
3. build.xml
Copied there by build process

Windows installer works correctly on 64-bit Windows

JNDI Mail factories present in JAR

Servlet 2.4 TCK passes

JSP 2.0 TCK passes

Mark

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



svn commit: r996159 - /tomcat/trunk/webapps/docs/changelog.xml

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 15:47:01 2010
New Revision: 996159

URL: http://svn.apache.org/viewvc?rev=996159&view=rev
Log:
Update changelog

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=996159&r1=996158&r2=996159&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Sep 11 15:47:01 2010
@@ -131,6 +131,10 @@
 49892: Correct JNDI name for method resource injections.
 Based on a patch by Gurkan Erdogdu. (markt)
   
+  
+Ensure that Context elements defined in server.xml use any configClass
+setting specified in the parent Host element. (markt)
+  
 
   
   



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



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

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 15:53:15 2010
New Revision: 996160

URL: http://svn.apache.org/viewvc?rev=996160&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=996160&r1=996159&r2=996160&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 11 15:53:15 2010
@@ -187,4 +187,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=993042&view=rev
   +1: markt, kfujino
   -1:
- 
\ No newline at end of file
+
+* Make sure Contexts defined in server.xml pick up any configClass setting from
+  the parent Host.
+  http://people.apache.org/~markt/patches/2010-09-11-configClass.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: r996163 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 16:32:02 2010
New Revision: 996163

URL: http://svn.apache.org/viewvc?rev=996163&view=rev
Log:
Update commons pool to 1.5.5

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=996163&r1=996162&r2=996163&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sat Sep 11 16:32:02 2010
@@ -132,8 +132,8 @@ commons-dbcp.home=${base.path}/commons-d
 
commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.4-src.tar.gz
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.5.4-src
-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.5-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.5-src.tar.gz
 
 # - NSIS, version 2.0 or later -
 nsis.home=${base.path}/nsis-2.46

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=996163&r1=996162&r2=996163&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Sep 11 16:32:02 2010
@@ -238,6 +238,9 @@
 49758: Fix generics warnings exposed by a fix in Eclipse 
3.6.
 Patch provided by sebb. (markt)
   
+  
+Update commons pool to 1.5.5. (markt)
+  
 
   
 



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



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

2010-09-11 Thread markt
Author: markt
Date: Sat Sep 11 16:33:11 2010
New Revision: 996164

URL: http://svn.apache.org/viewvc?rev=996164&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=996164&r1=996163&r2=996164&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 11 16:33:11 2010
@@ -193,3 +193,8 @@ PATCHES PROPOSED TO BACKPORT:
   http://people.apache.org/~markt/patches/2010-09-11-configClass.patch
   +1: markt
   -1:
+
+* Update commons pool to 1.5.5
+  http://svn.apache.org/viewvc?rev=996163&view=rev
+  +1: markt
+  -1:



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



Re: Can jsp-file be a JspServlet init-param?

2010-09-11 Thread Mark Thomas
On 11/09/2010 07:20, David Jencks wrote:
> 
> On Sep 8, 2010, at 11:48 PM, Mark Thomas wrote:
> 
>> On 09/09/2010 00:54, David Jencks wrote:
>>> I've recently rewritten the geronimo-jetty integration to work off the 
>>> servlet 3 *Registration classes.  This works great except for servlets 
>>> backed by jsp files, since there's no way to tell the servlet container 
>>> through the ServletRegistration interface that its actually something with 
>>> this extra jsp file name that needs to be added through some special 
>>> process into the request.
>>
>> That looks like an oversight in the 3.0 spec.
> 
> I'm not sure why you think that.

Because  is the only element of a servlet's configuration you
can't set via the registration class. I can't see any good reason for
the omission, hence my thinking it was an oversight.

>  A servlet extension mechanism such as a jsp engine can use the  servlet 3 
> API to add servlets directly.  I think it would make more sense to completely 
> remove any mention of jsp from web.xml and the servlet spec and run jsps off 
> a separate configuration file.

Nice idea but unlikely to happen based on past experience. The Servlet
(and JSP) EGs have bent over backwards to ensure backwards
compatibility. I can't recall any feature being removed and I doubt
something as significant as this would be removed from the Servlet spec.

> excellent, see https://issues.apache.org/bugzilla/show_bug.cgi?id=49916

I'm currently at 49884, working my way down the bug list prior to a
7.0.3 release so I'll look at this before then (unless one of the other
committers beats me to it).

> If I've understood the tomcat build this passes all the tests and also 
> appears to cause no tck problems in the geronimo-tomcat integration.

Sounds good.

Mark

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



DO NOT REPLY [Bug 49811] [PATCH] Disable UrlRewriting

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

--- Comment #10 from Mark Thomas  2010-09-11 13:13:15 EDT ---
Functionally, the patch looks good to me and I'd propose it for Tomcat if it
wasn't for some minor cosmetic issues:
- use 4 spaces rather than tabs
- setDisableURLRewriting(boolean allow) is confusing.
setDisableURLRewriting(boolean disable) would be better

Fix those and I'll propose it 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 49234] JMX Descriptor Modifications

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #91 from Mark Thomas  2010-09-11 13:18:01 EDT ---
Please enable validation in your build process and ensure in future that patch
you provide build with validation enabled. This one had a number of tabs that
needs to be replaced with spaces.

-- 
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 49811] [PATCH] Disable UrlRewriting

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

--- Comment #11 from Wesley  2010-09-11 13:27:48 EDT 
---
(In reply to comment #10)

> - use 4 spaces rather than tabs

Em do you have a style guide? If theres any code formatters I can use for
eclipse that would be great. Then I can just use the format shortcut.

> - setDisableURLRewriting(boolean allow) is confusing.
> setDisableURLRewriting(boolean disable) would be better
> 
+1

-- 
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 49811] [PATCH] Disable UrlRewriting

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

--- Comment #12 from Mark Thomas  2010-09-11 13:39:50 EDT ---
(In reply to comment #11)
> Em do you have a style guide? If theres any code formatters I can use for
> eclipse that would be great. Then I can just use the format shortcut.

'fraid not. In short: no tabs, '{' at the end of lines, 80 char line length,
spacing to hard to explain - as per existing files.

The tabs were the only issue I saw in your patch.

If you follow the style of the file you are editing you should be 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



DO NOT REPLY [Bug 49234] JMX Descriptor Modifications

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #92 from Mark Thomas  2010-09-11 13:51:37 EDT ---
The patch is heading in the right direction and I am tempted to commit it.
However, I see a bunch of stack traces in the logs when I try to start a
Context so I think there is still some more work required but definitely making
progress.

-- 
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 49811] [PATCH] Disable UrlRewriting

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

Wesley  changed:

   What|Removed |Added

  Attachment #25961|0   |1
is obsolete||

--- Comment #13 from Wesley  2010-09-11 17:54:00 EDT 
---
Created an attachment (id=26018)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26018)
V3 with tabs fixed and parameter name on Context interface changed.

V3 of the patch. Hopefully the last one.

Doing a scan of the source reveals several java files that already begin with a
tab.

Searching for ^\t

-- 
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: Proposed .dsp and source change to jk for apache 2.0

2010-09-11 Thread Tim Whittington
+1 from me.

I've been maintaining my own VS 2003 (and now 2005) solution for a while now
with Apache 2.0/2.2 projects.

cheers
tim

On Thu, Sep 9, 2010 at 4:51 AM, William A. Rowe Jr. wrote:

> It seems I've been lax in committing anything in recent memory, and had my
> commit privileges for the jk module suspended :)  But wanted to pass on
> these
> very small proposals;
>
>  * mod_jk.dsp should have referred to a project 'named' mod_jk, the
> 'project
>   name' should generally match the name of the .dsp file itself.
>
>  * mod_jk.dsp would benefit from having 'mod_jk - Win32 Release httpd 2.2'
>   targets, so that we can build either for httpd 2.0 or 2.2 without making
>   any changes to the library references (libapr.lib vs libapr-1.lib).
>   In any case, having a default to 2.0 seems awfully archaic now :)
>
>  * mod_jk.c conditionally compiled for map_to_storage.  That hook predated
>   the beta and GA of httpd 2.0, so leaving such a test in place is likely
>   confusing to the more casual reviewer.
>
> I'm happy to commit this myself, if the team will entertain restoring my
> commit bit to the connectors tree and folks are happy with the suggestions.
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>


svn commit: r996235 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

2010-09-11 Thread markt
Author: markt
Date: Sun Sep 12 01:38:30 2010
New Revision: 996235

URL: http://svn.apache.org/viewvc?rev=996235&view=rev
Log:
Fix typos. Remove attributes that don't exist. Add a missing attribute.

Modified:
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=996235&r1=996234&r2=996235&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Sun Sep 
12 01:38:30 2010
@@ -107,18 +107,22 @@
description="Object names of all children"
type="[Ljavax.management.ObjectName;"/>

-

-

-

+
+   
 
@@ -174,21 +178,12 @@
type="java.lang.String"
writeable="false" />
   
-
-
 
   
-
-  
 
@@ -205,7 +200,7 @@
description="Associated loader."
type="org.apache.catalina.Loader" />

-
   



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



DO NOT REPLY [Bug 49234] JMX Descriptor Modifications

2010-09-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234

--- Comment #93 from Mark Thomas  2010-09-11 21:44:59 EDT ---
I got to the bottom of the problem. The correct parent class loader was not
being passed down the object hierarchy. I fixed that and applied your patch. I
can now get to the point where I can create a context with static content and
JSPs via JMX from a server.xml that just contains a Server object. Woot!

With this patch the basic functionality is in place. The MBeans exposed are a
lot better than they were but there is still work to do. For example a quick
review of the StandardContext found a bunch if typos, a missing attribute and
other attributes that are not visible in JConsole. See r996235 for details.

I recommend that the next step is to work through the MBeans in JConsole and
resolving the following issues:
- attributes that show up as Unavailable (in red text)
- methods that can not be called (you'll see an error message when you click on
"Operations" in the navigation tree)

Some will be easier than others. I'd go for the quick win typos (like those in
r966235) first.

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