DO NOT REPLY [Bug 39704] - context with privileged="true" do not setup properly inner loaders

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39704





--- Additional Comments From [EMAIL PROTECTED]  2006-09-08 05:56 ---
(In reply to comment #19)
> Did set useSystemClassLoaderAsParent="false" on the custom loader? Without 
> this
> you will see the old behaviour.

That did the difference. It seems to be working now. 

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33453] - Jasper should recompile JSP files whose datestamps change in either direction (not just newer)

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33453





--- Additional Comments From [EMAIL PROTECTED]  2006-09-08 05:29 ---
What are the side-effects of revalidating the entire tree ?  Does it cause all
class files to be loaded or can the revalidation occur without having any
lasting overheads (like increased memory consumption and slower revalidation
process due to parsing of more complex .class data).

My method only seeks to delete stale work/ .java and .class files during web-app
deployment.

It does not seek to recreate and load them, that can be left to moment of first
use (although it would natually lead on to facilitating an automatic recreation
 function).

By opening the .java file and looking for a magic comment and closing the file
again, there is no lasting overhead.  Since we never loaded the class.  Which is
just great for a revalidation pass during deployment.

I'm a believer there should be a configuration mode of TC which is watertight,
such that no amount of abuse will make the things fail in a way that bites you.
 The work/ directory is a nice speedup but the implementation is more a hack
than an optimization, since it clearly breaks down in situations you wouldn't
expect.

This bug/problem hits developers a lot more than production upgrades.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 31804] - setParent() is not called on nested tags in a tag file (.tagx)

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=31804


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-09-08 04:19 ---
I have read through section JSP.8 and whilst I can't see anything that
explicitly refers to this case:
- tag files are simple tags so should behave in the same way
- tag files currently have their own parent set correctly
- tag files can contain other tags
- not setting the tag file as the parent of tags within the tag file breaks
things like the Spring form tags

Therefore I have committed a patch that fixes this bug. The fix will be in
5.5.20 onwards.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441370 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

2006-09-07 Thread markt 
Author: markt
Date: Thu Sep  7 21:22:09 2006
New Revision: 441370

URL: http://svn.apache.org/viewvc?view=rev&rev=441370
Log:
Fix bug 31804. Set the parent of unnested tags within a tag file to be the tag 
represented by the tag file.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=441370&r1=441369&r2=441370
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Sep  7 21:22:09 2006
@@ -14,6 +14,18 @@
   
 
 
+
+  
+
+  
+31804: Unnested tags within a tag file are now configured
+with the Tag represented by the containing tag file as their parent 
tag.
+  
+
+ 
+
+
+
 
   
 

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?view=diff&rev=441370&r1=441369&r2=441370
==
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java 
Thu Sep  7 21:22:09 2006
@@ -2825,7 +2825,12 @@
 }
 
 // Set parent
-if (!simpleTag) {
+if (isTagFile && parent == null) {
+out.printin(tagHandlerVar);
+out.print(".setParent(");
+out.print("new javax.servlet.jsp.tagext.TagAdapter(");
+out.print("(javax.servlet.jsp.tagext.SimpleTag) this ));");
+} else if (!simpleTag) {
 out.printin(tagHandlerVar);
 out.print(".setParent(");
 if (parent != null) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Tomcat 5.5.19 Beta build is complete

2006-09-07 Thread Filip Hanik - Dev Lists 

http://people.apache.org/~fhanik/v5.5.19-beta/

I will run through the TCK tests tomorrow

Filip

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441329 - /tomcat/site/tags/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:53 2006
New Revision: 441329

URL: http://svn.apache.org/viewvc?view=rev&rev=441329
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/site/tags/TOMCAT_5_5_19/
  - copied from r441328, tomcat/site/trunk/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441328 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:50 2006
New Revision: 441328

URL: http://svn.apache.org/viewvc?view=rev&rev=441328
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_19/
  - copied from r441327, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441327 - /tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:46 2006
New Revision: 441327

URL: http://svn.apache.org/viewvc?view=rev&rev=441327
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_19/
  - copied from r441326, tomcat/jasper/tc5.5.x/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441326 - /tomcat/container/tags/tc5.5.x/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:42 2006
New Revision: 441326

URL: http://svn.apache.org/viewvc?view=rev&rev=441326
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/container/tags/tc5.5.x/TOMCAT_5_5_19/
  - copied from r441325, tomcat/container/tc5.5.x/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441325 - /tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:39 2006
New Revision: 441325

URL: http://svn.apache.org/viewvc?view=rev&rev=441325
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_19/
  - copied from r441324, tomcat/connectors/trunk/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441324 - /tomcat/build/tags/tc5.5.x/TOMCAT_5_5_19/

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:37:36 2006
New Revision: 441324

URL: http://svn.apache.org/viewvc?view=rev&rev=441324
Log:
Tagging Tomcat version TOMCAT_5_5_19.

Added:
tomcat/build/tags/tc5.5.x/TOMCAT_5_5_19/
  - copied from r441323, tomcat/build/tc5.5.x/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Proposal - Comet changes

2006-09-07 Thread Filip Hanik - Dev Lists 

Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:
ok, I've had a chance to think about it, and let me try to summarize 
our ideas, my goal here is to simplify the implementation


I agree to a significant extent, but I would like to go a bit further 
and clean things up for interception.


1. CometEvent would be an interface, in such a way that we could 
reuse the objects in the backend, and also provide a facade to hide 
server details from the servlet


Ok.

2. As suggested, if servlet instanceof CometProcessor && 
comet.support invoke servlet.event(CometEvent) instead of 
servlet.service(), otherwise invoke service()
  This is excellent, cause it will give the implementor a fall back 
option if comet support is not available, he can do the logic 
blocking, ala Future.waitForCompletion style
  This will guarantee that a comet servlet remains portable, nice 
thinking!


Ok.

3. Servlet filters should be respected and used exact same way as a 
servlet, at the end CometEvent.getRequest/CometEvent.getResponse 
should return the same objects as the servlet would have received in 
its service method. Hence in the ApplicationFilterChain object will 
do the check for (isCometProcess && hasCometSupport).
  In a similar manner, this object would also make sure that 
CometEvent.getRequest delivers the wrapper to the servlet 
implementation if a wrapper has been added.
  I don't see a need to break away from the standard filters, or not 
use them.

  For example, a StandardCometEvent implementation would have
getHttpRequest - returns the request for the servlet, could be a 
request wrapper, exposed through CometEvent
getInternalRequest - returns the request object from the 
connector, not exposed through the interface


No, I don't see how filters can work. It is possible that some filters 
which would be wrapping the request would be ok, but most likely they 
would do something when the call returns (and finish what they had to 
do), so any attempt to use the wrapped objects would fail later on.
The same developer that does the comet servlet sets up the mapping for 
the filter, so I don't see a need to have to protect against this scenario.


4. For interception, I think the existing valves and filters 
could/should remain untouched. Interception will/should only be done 
at the activation of the request
  Sequential event method (such as READ) would not go through the 
interceptors, just like it is today. This is essential as we can have 
filters/valves that modify both incoming and outgoing content.


Actually, I would like to have a new type of filters (both for the 
container side and the application side), because things like setting 
up the security contexts, etc, are still likely going to be needed. 
This would be something simpler than valves/filters, with no mapping 
(since most likely, a single servlet is all that's needed to handle 
all the Comet traffic of an application).


The filter would have a filterEvent method, and the difference between 
the application side and the container side is that the first gets the 
facades, and the second the Request and Response objects (which allow 
access to everything). Each request should be un/wrapping as a regular 
filter on each invocation (of course, the wrappers can be stored in a 
request attribute).
I see this as a duplicate effort, trying to recreate something that 
already exist, here are the cons
1. The developers would have to learn something new, tomcat specific to 
achieve the same thing that they could have done using filters

2. They would work the same way as filters, then why not use filters
3. They run into the same risk as you described above, ie, invalidating 
an object at request end, can happen here as well
4. Assuming that there would be only *one* comet servlet per application 
is not a safe assumption, I would never code it that way.
5. You lose the mapping feature, this is extremely useful, and could 
prove to be very useful for comet servlets as well
6. Everyone already knows how a filter works, and they are implementing 
a servlet, makes sense to just piggy back this functionality.




5. StandardCometEvent could be a zero GC object if need be, if the 
SecurityManager is enabled, a non reusable facade should be used


GC doesn't matter too much for the whole connection since it's quite 
long running. These objects would be discarded when the Comet 
connection  ends (but it would be a bit bad to start allocating too 
many objects for each event).

agreed.



6. CometServlet removal - good idea.

7. The servlet should have a way of gracefully ending the session, 
such as CometEvent.close() instead of just letting it timeout


The servlet can close the writer or OS, and the client could send the 
appropriate end chunk, this should work.
that is how it is today, I think its cleaner to provide them with the 
CometEvent.close() method and let the container handle the logistics.
CometEvent.close may be implemented as  
"this.getIn

svn commit: r441316 - /tomcat/build/tc5.5.x/build.properties.default

2006-09-07 Thread fhanik 
Author: fhanik
Date: Thu Sep  7 18:17:46 2006
New Revision: 441316

URL: http://svn.apache.org/viewvc?view=rev&rev=441316
Log:
Updated build number

Modified:
tomcat/build/tc5.5.x/build.properties.default

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?view=diff&rev=441316&r1=441315&r2=441316
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Thu Sep  7 18:17:46 2006
@@ -12,10 +12,10 @@
 # - Vesion Control Flags -
 version.major=5
 version.minor=5
-version.build=18
+version.build=19
 version.patch=0
 #Set the pretty version name
-version=5.5.18
+version=5.5.19
 
 # - Compile Control Flags -
 compile.debug=on



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 31201] - Encoding bug when using action

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=31201


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 23:25 ---
*** Bug 40440 has been marked as a duplicate of this bug. ***

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40440] - Problem with characters when include static html

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40440


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE




--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 23:25 ---


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

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441172 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/ant/jmx/Arg.java catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java webapps/docs/changelo

2006-09-07 Thread pero 
Author: pero
Date: Thu Sep  7 11:38:07 2006
New Revision: 441172

URL: http://svn.apache.org/viewvc?view=rev&rev=441172
Log:
Add multi attribute setting to jmx:set JMX remote ant task.
Patch contributed by Didier Donsez

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/monitoring.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java?view=diff&rev=441172&r1=441171&r2=441172
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/Arg.java
 Thu Sep  7 11:38:07 2006
@@ -23,9 +23,13 @@
  * @since 5.5.10
  */
 public class Arg {
+String name;
 String type;
 String value;
 
+public void setName( String name) {
+this.name=name;
+}
 public void setType( String type) {
 this.type=type;
 }
@@ -35,11 +39,12 @@
 public void addText( String text ) {
 this.value=text;
 }
-
+public String getName() {
+return name;
+}
 public String getValue() {
 return value;
 }
-
 public String getType() {
 return type;
 }

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java?view=diff&rev=441172&r1=441171&r2=441172
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
 Thu Sep  7 11:38:07 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002,2004-2005 The Apache Software Foundation.
+ * Copyright 2002,2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,12 @@
 package org.apache.catalina.ant.jmx;
 
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.management.Attribute;
+import javax.management.AttributeList;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServerConnection;
@@ -30,9 +35,7 @@
 /**
  * Access JMX JSR 160 MBeans Server. 
  * 
- * Get Mbeans attributes
- * Show Get result as Ant console log
- * Bind Get result as Ant properties
+ * Set Mbeans attributes
  * 
  * 
  * Examples:
@@ -42,7 +45,6 @@
  *   
  *   />
  * 
+ *
+ * or 
+ * 
+ * 
+ *   
+ *   >
+ *   
+ *
+ *
+ *   
+ *
+ * 
  * 
  * 
  * First call to a remote MBeanserver save the JMXConnection a referenz 
jmx.server
@@ -69,13 +91,14 @@
 private String value;
 private String type;
 private boolean convert = false ;
-
+private List args=new ArrayList();
+
 // - Instance Info
 
 /**
  * Descriptive information describing this implementation.
  */
-private static final String info = 
"org.apache.catalina.ant.JMXAccessorSetTask/1.0";
+private static final String info = 
"org.apache.catalina.ant.JMXAccessorSetTask/1.1";
 
 /**
  * Return descriptive information about this implementation and the
@@ -89,21 +112,30 @@
 }
 
 // - Properties
-
+
+public void addArg(Arg attribute) {
+args.add(attribute);
+}
+
+public List getArgs() {
+return args;
+}
+
+
 /**
  * @return Returns the attribute.
  */
 public String getAttribute() {
 return attribute;
 }
-
+
 /**
  * @param attribut

DO NOT REPLY [Bug 31804] - setParent() is not called on nested tags in a tag file (.tagx)

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=31804


[EMAIL PROTECTED] changed:

   What|Removed |Added

Version|5.0.29  |5.0.31




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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441145 - in /tomcat/connectors/trunk/procrun/bin: tomcat5.exe tomcat5.exe.amd64 tomcat5w.exe tomcat5w.exe.amd64

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 10:31:29 2006
New Revision: 441145

URL: http://svn.apache.org/viewvc?view=rev&rev=441145
Log:
Upload newest binaries.

Added:
tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64   (with props)
tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64   (with props)
Modified:
tomcat/connectors/trunk/procrun/bin/tomcat5.exe
tomcat/connectors/trunk/procrun/bin/tomcat5w.exe

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5.exe
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5.exe?view=diff&rev=441145&r1=441144&r2=441145
==
Binary files - no diff available.

Added: tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64?view=auto&rev=441145
==
Binary file - no diff available.

Propchange: tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64
--
svn:mime-type = application/octet-stream

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5w.exe
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5w.exe?view=diff&rev=441145&r1=441144&r2=441145
==
Binary files - no diff available.

Added: tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64?view=auto&rev=441145
==
Binary file - no diff available.

Propchange: tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64
--
svn:mime-type = application/octet-stream



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40440] - Problem with characters when include static html

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40440





--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 16:31 ---
Created an attachment (id=18834)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18834&action=view)
testing examples


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40440] New: - Problem with characters when include static html

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40440

   Summary: Problem with characters when include static html
   Product: Tomcat 5
   Version: Unknown
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When I try to include static html page with characters encoded with UTF-8 then
this characters are displayed incorrectly. When I do the same page as jsp and I 
add 

<%@ page contentType="text/html; charset=UTF-8"%> in the beginning then
everything is ok. 

following there are example of code I do for testing. The same example (with
static html) works fine in Tomcat 4

main.jsp

<%@ page contentType="text/html; charset=UTF-8"%>


HTML:<[EMAIL PROTECTED] file="/included.htm" %>

JSP:<[EMAIL PROTECTED] file="/included1.jsp" %>




included.htm

ąęśćżźńłóÓŁĆŹŻĄŚŃĘ


included.jsp

<%@ page contentType="text/html; charset=UTF-8"%>
ąęśćżźńłóÓŁĆŹŻĄŚŃĘ

I also attache this examples

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33453] - Jasper should recompile JSP files whose datestamps change in either direction (not just newer)

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33453





--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 15:18 ---
Daryl,  see comments #35 - #45 and the 4 patch files I posted in the 
Attachment section.  The patch I submitted in March completely fixes this 
problem in a manner similar to your suggestion.

The patch works by storing the timestamp of the .jsp and all its 
dependent .jsps as member data in the compiled servlet.  The isOutDated() 
method was modified to compare the timestamp of the .jsp against the added 
timestamps using != instead of >.

(In reply to comment #59)
> It would be nice to have re-validation maybe that could be implemented using
> magic .java file comments in the japser output "// Jasper-JSP-Prerequisite:
> foobar/test.jsp 72383828372000" where both the top level source and all 
included
> fragments are listed with their Epoch millis for timestamp.  Then the process
> would be to recurse the work/org/apache/ tree, reading all the .java and
> performing a simple stat() on the source files.  This could be done in the
> background with live requests taking priority to be checked on first access
> after deployment.


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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441109 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: Constants.java EmbeddedServletOptions.java JspC.java JspCompilationContext.java Options.java resources/LocalStrings.properties ru

2006-09-07 Thread remm 
Author: remm
Date: Thu Sep  7 08:03:06 2006
New Revision: 441109

URL: http://svn.apache.org/viewvc?view=rev&rev=441109
Log:
- Starting on a Jasper cleanup.
- Make some classes extensible.
- Add some options (like a compiler class name parameter).
- Clean up exception processing.
- Remove fields which are not used.
- Externalize missing strings.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Options.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java?view=diff&rev=441109&r1=441108&r2=441109
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java Thu Sep  7 
08:03:06 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,17 +26,20 @@
  * @author Mark Roth
  */
 public class Constants {
+
 /**
  * The base class of the generated servlets. 
  */
-public static final String JSP_SERVLET_BASE = 
"org.apache.jasper.runtime.HttpJspBase";
+public static final String JSP_SERVLET_BASE = 
+System.getProperty("org.apache.jasper.Constants.JSP_SERVLET_BASE", 
"org.apache.jasper.runtime.HttpJspBase");
 
 /**
  * _jspService is the name of the method that is called by 
  * HttpJspBase.service(). This is where most of the code generated
  * from JSPs go.
  */
-public static final String SERVICE_METHOD_NAME = "_jspService";
+public static final String SERVICE_METHOD_NAME = 
+System.getProperty("org.apache.jasper.Constants.SERVICE_METHOD_NAME", 
"_jspService");
 
 /**
  * Default servlet content type.
@@ -54,37 +57,27 @@
 };
 
 /**
- * FIXME
  * ServletContext attribute for classpath. This is tomcat specific. 
  * Other servlet engines may choose to support this attribute if they 
  * want to have this JSP engine running on them. 
  */
-public static final String SERVLET_CLASSPATH = 
"org.apache.catalina.jsp_classpath";
+public static final String SERVLET_CLASSPATH = 
+System.getProperty("org.apache.jasper.Constants.SERVLET_CLASSPATH", 
"org.apache.catalina.jsp_classpath");
 
 /**
- * FIXME
  * Request attribute for  element of a
  * servlet definition.  If present on a request, this overrides the
  * value returned by request.getServletPath() to select
  * the JSP page to be executed.
  */
-public static final String JSP_FILE = "org.apache.catalina.jsp_file";
+public static final String JSP_FILE = 
+System.getProperty("org.apache.jasper.Constants.JSP_FILE", 
"org.apache.catalina.jsp_file");
 
 
 /**
- * FIXME
- * ServletContext attribute for class loader. This is tomcat specific. 
- * Other servlet engines can choose to have this attribute if they 
- * want to have this JSP engine running on them. 
- */
-//public static final String SERVLET_CLASS_LOADER = 
"org.apache.tomcat.classloader";
-public static final String SERVLET_CLASS_LOADER = 
"org.apache.catalina.classloader";
-
-/**
  * Default size of the JSP buffer.
  */
-public static final int K = 1024;
-public static final int DEFAULT_BUFFER_SIZE = 8*K;
+public static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
 
 /**
  * Default size for the tag buffers.
@@ -100,29 +93,31 @@
  * The query parameter that causes the JSP engine to just
  * pregenerated the servlet but not invoke it. 
  */
-public static final String PRECOMPILE = "jsp_precompile";
+public static final String PRECOMPILE = 
+System.getProperty("org.apache.jasper.Constants.PRECOMPILE", 
"jsp_precompile");
 
 /**
  * The default package name for compiled jsp pages.
  */
-public static final String JSP_PACKAGE_NAME = "org.apache.jsp";
+public static final String JSP_PACKAGE_NAME = 
+System.getProperty("org.apache.jasper.Constants.JSP_PACKAGE_NAME", 
"org.apache.jsp");
 
 /**
  * The default package name for tag handlers generated from tag files
  */
-public static final String TAG_FILE_PACKAGE_NAME = "org.apache.jsp.tag";
+public static final String TAG_FILE_PACKAGE_NA

Re: Proposal - Comet changes

2006-09-07 Thread Remy Maucherat 

Filip Hanik - Dev Lists wrote:
ok, I've had a chance to think about it, and let me try to summarize our 
ideas, my goal here is to simplify the implementation


I agree to a significant extent, but I would like to go a bit further 
and clean things up for interception.


1. CometEvent would be an interface, in such a way that we could reuse 
the objects in the backend, and also provide a facade to hide server 
details from the servlet


Ok.

2. As suggested, if servlet instanceof CometProcessor && comet.support 
invoke servlet.event(CometEvent) instead of servlet.service(), otherwise 
invoke service()
  This is excellent, cause it will give the implementor a fall back 
option if comet support is not available, he can do the logic blocking, 
ala Future.waitForCompletion style

  This will guarantee that a comet servlet remains portable, nice thinking!


Ok.

3. Servlet filters should be respected and used exact same way as a 
servlet, at the end CometEvent.getRequest/CometEvent.getResponse should 
return the same objects as the servlet would have received in its 
service method. Hence in the ApplicationFilterChain object will do the 
check for (isCometProcess && hasCometSupport).
  In a similar manner, this object would also make sure that 
CometEvent.getRequest delivers the wrapper to the servlet implementation 
if a wrapper has been added.
  I don't see a need to break away from the standard filters, or not use 
them.

  For example, a StandardCometEvent implementation would have
getHttpRequest - returns the request for the servlet, could be a 
request wrapper, exposed through CometEvent
getInternalRequest - returns the request object from the connector, 
not exposed through the interface


No, I don't see how filters can work. It is possible that some filters 
which would be wrapping the request would be ok, but most likely they 
would do something when the call returns (and finish what they had to 
do), so any attempt to use the wrapped objects would fail later on.


4. For interception, I think the existing valves and filters 
could/should remain untouched. Interception will/should only be done at 
the activation of the request
  Sequential event method (such as READ) would not go through the 
interceptors, just like it is today. This is essential as we can have 
filters/valves that modify both incoming and outgoing content.


Actually, I would like to have a new type of filters (both for the 
container side and the application side), because things like setting up 
the security contexts, etc, are still likely going to be needed. This 
would be something simpler than valves/filters, with no mapping (since 
most likely, a single servlet is all that's needed to handle all the 
Comet traffic of an application).


The filter would have a filterEvent method, and the difference between 
the application side and the container side is that the first gets the 
facades, and the second the Request and Response objects (which allow 
access to everything). Each request should be un/wrapping as a regular 
filter on each invocation (of course, the wrappers can be stored in a 
request attribute).


5. StandardCometEvent could be a zero GC object if need be, if the 
SecurityManager is enabled, a non reusable facade should be used


GC doesn't matter too much for the whole connection since it's quite 
long running. These objects would be discarded when the Comet connection 
 ends (but it would be a bit bad to start allocating too many objects 
for each event).



6. CometServlet removal - good idea.

7. The servlet should have a way of gracefully ending the session, such 
as CometEvent.close() instead of just letting it timeout


The servlet can close the writer or OS, and the client could send the 
appropriate end chunk, this should work.


8. Session timeouts/invalidations. An active comet session should not 
invalidate the HttpSession based on inactive time.

  getAccessCount() would return >0 if there is a comet session
  I am not fully kosher with this yet, still need to think about this 
some more. a possibility is to have CometEvent.releaseHttpSession(), 
will `--accessCount`


It should be ok when activity checking is enabled: endAccess will only 
be called when recycling the request object.



9. The similar problem will have to be worked out for last accessed time


Bleh, -1. Normally, it's still the beginning of the session access, so 
the beginning of the request.


10. Session replication, currently session replication is triggered 
through a valve at the end of each request,
   I will have to adjust clustering to support periodic replication or 
add some other mechanism to make this work.

   Still need to think this through.


So this would be done in a container side Comet event filter ;) I would 
not even bother with doing session replication when there's no client 
activity (I think anything which goes to the session when there's no 
client input comes from the server side, and thus can be res

Kerberos Delegation w/ ISAPI?

2006-09-07 Thread Michael B Allen 
I have a Kerberos delegation issue caused by the separation of IIS worker
processes and the Tomcat server on Windows.

Specifically, the customer is running Tomcat through ISAPI on Windows with
ISS using Integrated Windows Authentication (Kerberos). Authentication
is working. The getRemoteUser method returns the user's expected
identity. Delegation is working. An ASP can use the clients credentials to
request another protected page on a second IIS server. Note, impersonation
is not used in any way shape or form (nor would it work).

I put together a Kerberos capable HTTP client and tried to invoke it
through the IIS authenticated Servlet. This does not work. The JGSS
routines cannot find the delegated ticket (TGT).

I believe this is because Windows' credential caches are per logon
session and IIS creates a new logon session for each authentication [1].

So, my question is, does Tomcat's ISAPI dll provide any mechainsm
that might assist in getting delegated Kerberos credentials of clients
authenticated using IIS's IWA?

Has anyone encountered this issue before?

Has anyone considered using GSSContext.export() and
GSSManager.createContext() to export the Kerberos ticket and transfer
it to the Tomcat worker? Or one might call LsaGetLogonSessionData [2]
directly to make things as effecient as possible.

This would be a nice feature as there are many pure MS SSO shops that
don't like the idea of running Tomcat stand alone.

Any comments are greatly appreciated.

Mike

[1] Actually I'm not entirely certain about the logon session partitioning
in the IIS scenario but it suffices to say Tomcat cannot access that
logon session.

[2] The MIT kfw source is a good reference for directly querying the
Windows credential cache.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Proposal - Comet changes

2006-09-07 Thread Filip Hanik - Dev Lists 
ok, I've had a chance to think about it, and let me try to summarize our 
ideas, my goal here is to simplify the implementation


1. CometEvent would be an interface, in such a way that we could reuse 
the objects in the backend, and also provide a facade to hide server 
details from the servlet


2. As suggested, if servlet instanceof CometProcessor && comet.support 
invoke servlet.event(CometEvent) instead of servlet.service(), otherwise 
invoke service()
  This is excellent, cause it will give the implementor a fall back 
option if comet support is not available, he can do the logic blocking, 
ala Future.waitForCompletion style

  This will guarantee that a comet servlet remains portable, nice thinking!

3. Servlet filters should be respected and used exact same way as a 
servlet, at the end CometEvent.getRequest/CometEvent.getResponse should 
return the same objects as the servlet would have received in its 
service method. Hence in the ApplicationFilterChain object will do the 
check for (isCometProcess && hasCometSupport).
  In a similar manner, this object would also make sure that 
CometEvent.getRequest delivers the wrapper to the servlet implementation 
if a wrapper has been added.
  I don't see a need to break away from the standard filters, or not 
use them.

  For example, a StandardCometEvent implementation would have
getHttpRequest - returns the request for the servlet, could be a 
request wrapper, exposed through CometEvent
getInternalRequest - returns the request object from the connector, 
not exposed through the interface


4. For interception, I think the existing valves and filters 
could/should remain untouched. Interception will/should only be done at 
the activation of the request
  Sequential event method (such as READ) would not go through the 
interceptors, just like it is today. This is essential as we can have 
filters/valves that modify both incoming and outgoing content.


5. StandardCometEvent could be a zero GC object if need be, if the 
SecurityManager is enabled, a non reusable facade should be used


6. CometServlet removal - good idea.

7. The servlet should have a way of gracefully ending the session, such 
as CometEvent.close() instead of just letting it timeout


8. Session timeouts/invalidations. An active comet session should not 
invalidate the HttpSession based on inactive time.

  getAccessCount() would return >0 if there is a comet session
  I am not fully kosher with this yet, still need to think about this 
some more. a possibility is to have CometEvent.releaseHttpSession(), 
will `--accessCount`


9. The similar problem will have to be worked out for last accessed time

10. Session replication, currently session replication is triggered 
through a valve at the end of each request,
   I will have to adjust clustering to support periodic replication or 
add some other mechanism to make this work.

   Still need to think this through.

The interface can be viewed at
http://people.apache.org/~fhanik/CometEvent.java



Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:
my proposal is a little delayed, had a slight Fedora Core meltdown, 
still recovering


I thought about it a bit, and I think we could do the following (with 
an event method):
- If the "servlet" implements CometProcessor and the connector 
supports Comet, then don't call the service method, instead call a 
begin event
- Otherwise, do the normal processing (and a regular service method 
remains in the servlet)

- Remove CometServlet
- An interception mechanism (similar to valves) could be a good idea 
(not sure, though); I think the valves could maybe be extended a 
little bit to do that


So I'll be away next week. I think the biggest priority is that you 
should come up and submit a real plan for adding clustering.


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39704] - context with privileged="true" do not setup properly inner loaders

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39704





--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 11:29 ---
Did set useSystemClassLoaderAsParent="false" on the custom loader? Without this
you will see the old behaviour.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39704] - context with privileged="true" do not setup properly inner loaders

2006-09-07 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39704





--- Additional Comments From [EMAIL PROTECTED]  2006-09-07 08:45 ---
(In reply to comment #17)
> A better fix has just been commited. See
> http://marc.theaimsgroup.com/?l=tomcat-dev&m=115759391916655&w=2

The WTP case still fails to load the context with the custom classloader for me.

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

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441022 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:36:15 2006
New Revision: 441022

URL: http://svn.apache.org/viewvc?view=rev&rev=441022
Log:
Require at least native 1.1.4 version

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?view=diff&rev=441022&r1=441021&r2=441022
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
Thu Sep  7 01:36:15 2006
@@ -52,7 +52,7 @@
 
 protected static final int REQUIRED_MAJOR = 1;
 protected static final int REQUIRED_MINOR = 1;
-protected static final int REQUIRED_PATCH = 2;
+protected static final int REQUIRED_PATCH = 4;
 
 
 // -- LifecycleListener Methods



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441021 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:35:20 2006
New Revision: 441021

URL: http://svn.apache.org/viewvc?view=rev&rev=441021
Log:
Require at least native 1.1.4 version

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?view=diff&rev=441021&r1=441020&r2=441021
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
 Thu Sep  7 01:35:20 2006
@@ -52,7 +52,7 @@
 
 protected static final int REQUIRED_MAJOR = 1;
 protected static final int REQUIRED_MINOR = 1;
-protected static final int REQUIRED_PATCH = 3;
+protected static final int REQUIRED_PATCH = 4;
 
 
 // -- LifecycleListener Methods



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441020 - /tomcat/tc6.0.x/trunk/res/tomcat.nsi

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:33:20 2006
New Revision: 441020

URL: http://svn.apache.org/viewvc?view=rev&rev=441020
Log:
Use native 1.1.4 version

Modified:
tomcat/tc6.0.x/trunk/res/tomcat.nsi

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?view=diff&rev=441020&r1=441019&r2=441020
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Sep  7 01:33:20 2006
@@ -191,11 +191,11 @@
 
   SectionIn 3
 
-  NSISdl::download /TIMEOUT=3 
http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll 
$INSTDIR\bin\tcnative-1.dll
+  NSISdl::download /TIMEOUT=3 
http://tomcat.heanet.ie/native/1.1.4/binaries/win32/tcnative-1.dll 
$INSTDIR\bin\tcnative-1.dll
   Pop $0
   StrCmp $0 success success
 SetDetailsView show
-DetailPrint "download failed from 
http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll: $0"
+DetailPrint "download failed from 
http://tomcat.heanet.ie/native/1.1.4/binaries/win32/tcnative-1.dll: $0"
   success:
 
   ClearErrors



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441019 - /tomcat/build/tc5.5.x/tomcat.nsi

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:31:38 2006
New Revision: 441019

URL: http://svn.apache.org/viewvc?view=rev&rev=441019
Log:
Use native 1.1.4 version

Modified:
tomcat/build/tc5.5.x/tomcat.nsi

Modified: tomcat/build/tc5.5.x/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?view=diff&rev=441019&r1=441018&r2=441019
==
--- tomcat/build/tc5.5.x/tomcat.nsi (original)
+++ tomcat/build/tc5.5.x/tomcat.nsi Thu Sep  7 01:31:38 2006
@@ -203,11 +203,11 @@
 
   SectionIn 3
 
-  NSISdl::download /TIMEOUT=3 
http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll 
$INSTDIR\bin\tcnative-1.dll
+  NSISdl::download /TIMEOUT=3 
http://tomcat.heanet.ie/native/1.1.4/binaries/win32/tcnative-1.dll 
$INSTDIR\bin\tcnative-1.dll
   Pop $0
   StrCmp $0 success success
 SetDetailsView show
-DetailPrint "download failed from 
http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll: $0"
+DetailPrint "download failed from 
http://tomcat.heanet.ie/native/1.1.4/binaries/win32/tcnative-1.dll: $0"
   success:
 
   ClearErrors



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441018 - in /tomcat/connectors/trunk/jni/native: include/tcn_version.h os/win32/libtcnative.rc

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:28:19 2006
New Revision: 441018

URL: http://svn.apache.org/viewvc?view=rev&rev=441018
Log:
Update trunk version to 1.1.5-dev.

Modified:
tomcat/connectors/trunk/jni/native/include/tcn_version.h
tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc

Modified: tomcat/connectors/trunk/jni/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/include/tcn_version.h?view=diff&rev=441018&r1=441017&r2=441018
==
--- tomcat/connectors/trunk/jni/native/include/tcn_version.h (original)
+++ tomcat/connectors/trunk/jni/native/include/tcn_version.h Thu Sep  7 
01:28:19 2006
@@ -68,13 +68,13 @@
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   4
+#define TCN_PATCH_VERSION   5
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#undef TCN_IS_DEV_VERSION
+#define TCN_IS_DEV_VERSION
 
 
 /** The formatted string of APU's version */

Modified: tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc?view=diff&rev=441018&r1=441017&r2=441018
==
--- tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc Thu Sep  7 
01:28:19 2006
@@ -19,7 +19,7 @@
 "specific language governing permissions and " \
 "limitations under the License."
 
-#define TCN_VERISON "1.1.4"
+#define TCN_VERISON "1.1.5"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,4,0
- PRODUCTVERSION 1,1,4,0
+ FILEVERSION 1,1,5,0
+ PRODUCTVERSION 1,1,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r441017 - /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_4/

2006-09-07 Thread mturk 
Author: mturk
Date: Thu Sep  7 01:24:58 2006
New Revision: 441017

URL: http://svn.apache.org/viewvc?view=rev&rev=441017
Log:
Tag Native 1.1.4

Added:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_4/
  - copied from r441016, tomcat/connectors/trunk/


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]