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

[remm]

Author: remm
Date: Thu Aug  3 01:34:21 2006
New Revision: 428282

URL: http://svn.apache.org/viewvc?rev=428282&view=rev
Log:
- Unfortunately, the JMX removal does not work (parent is null if used from 
JMX), so I'm reverting to using JMX for now.

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

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=428282&r1=428281&r2=428282&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu 
Aug  3 01:34:21 2006
@@ -33,6 +33,7 @@
 import java.util.Stack;
 import java.util.TreeMap;
 
+import javax.management.AttributeNotFoundException;
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanNotificationInfo;
 import javax.management.MBeanRegistrationException;
@@ -4168,16 +4169,18 @@
 }
 
 // Initialize annotation processor
-if (ok && !getIgnoreAnnotations() && annotationProcessor == null) {
-if (isUseNaming() && namingContextListener != null) {
-annotationProcessor = 
-new 
DefaultAnnotationProcessor(namingContextListener.getEnvContext());
-} else {
-annotationProcessor = new DefaultAnnotationProcessor(null);
+if (ok && !getIgnoreAnnotations()) {
+if (annotationProcessor == null) {
+if (isUseNaming() && namingContextListener != null) {
+annotationProcessor = 
+new 
DefaultAnnotationProcessor(namingContextListener.getEnvContext());
+} else {
+annotationProcessor = new DefaultAnnotationProcessor(null);
+}
 }
+getServletContext().setAttribute
+(Globals.ANNOTATION_PROCESSOR_ATTR, annotationProcessor);
 }
-getServletContext().setAttribute
-(Globals.ANNOTATION_PROCESSOR_ATTR, annotationProcessor);
 
 // Standard container startup
 if (log.isDebugEnabled())
@@ -5246,7 +5249,12 @@
 // Add the main configuration listener
 LifecycleListener config = null;
 try {
-String configClassName = ((Host)getParent()).getConfigClass();
+String configClassName = null;
+try {
+configClassName = 
String.valueOf(mserver.getAttribute(parentName, "configClass"));
+} catch (AttributeNotFoundException e) {
+// Ignore, it's normal a host may not have this optional 
attribute
+}
 if (configClassName != null) {
 Class clazz = Class.forName(configClassName);
 config = (LifecycleListener) clazz.newInstance();
@@ -5263,7 +5271,8 @@
 log.debug("AddChild " + parentName + " " + this);
 }
 try {
-((Host)getParent()).addChild(this);
+mserver.invoke(parentName, "addChild", new Object[] { this },
+new String[] {"org.apache.catalina.Container"});
 } catch (Exception e) {
 destroy();
 throw e;



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

DO NOT REPLY [Bug 36852] - Custom Webapp loaders don't correctly honor context's privileged="true" attribute

[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=36852





--- Additional Comments From [EMAIL PROTECTED]  2006-08-03 09:16 ---
Created an attachment (id=18673)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18673&action=view)
Patch for Sysdeo's DevLoader.java

I tried to use the Sysdeo classloader to add maven dependencies to the webapp
context, and I got stumped.
Next, I found a glue in the javadoc for WebappClassLoader
http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
that puzzled me. Apparently, a Webapp classloader cannot contain the servlet
api classes.

This patch solved the problem for me, but it's rather unelegant (it arbitrarily
checks the jar pathname, it should try and find the exact classes)

Recompile with the following command from the server\classes dir:

javac -classpath
.;..\lib\catalina.jar;..\..\common\lib\servlet-api.jar;%JRE_DIR%\lib\rt.jar
org\apache\catalina\loader\DevLoader.java

Hope this helps
Angelo Turetta

-- 
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 40177] New: - RequestDumperValve causes getCharacterEncoding to be called

[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=40177

   Summary: RequestDumperValve causes getCharacterEncoding to be
called
   Product: Tomcat 5
   Version: 5.5.15
  Platform: PC
   URL: http://nicolas-delsaux.is-a-
geek.net/wordpress/?p=759&lp_lang_view=en
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When RequestDumperValve is activated, getParameterNames is called (from http://
www.koders.com/java/
fid998CD923F9D6A959FE5FB7880A26ADB808D36118.aspx?s=requestdumpervalve it is 
called at line 124). Thus, any further call to setCharacterEncoding is useless 
and the whole application must use the RequestDumperValve (which is, 
unfortunatly for any i18n application, ISO-8859-1).
A possible workaround would be to do a deep clone of the request to be used by 
RequestDumperValve. Obviously, it implies a perforrmance leak, but since it is 
a debug valve, it may seem acceptable.

-- 
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 40177] - RequestDumperValve causes getCharacterEncoding to be called

[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=40177


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|normal  |enhancement




--- Additional Comments From [EMAIL PROTECTED]  2006-08-03 10:57 ---
This is a known, documented 'feature' of the RequestDumperValve.

If you have a patch for consideration, that would be great.

-- 
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: r428400 - in /tomcat/tc6.0.x/trunk: ./ res/ webapps/docs/ webapps/docs/api/ webapps/docs/appdev/ webapps/docs/architecture/ webapps/docs/config/ webapps/docs/funcspecs/ webapps/examples/js

[remm]

Author: remm
Date: Thu Aug  3 06:18:30 2006
New Revision: 428400

URL: http://svn.apache.org/viewvc?rev=428400&view=rev
Log:
- Build the docs webapp.
- Docs webapps fixes.
- Small NSIS update to version 2.18.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/api/index.html
tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/project.xml
tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=428400&r1=428399&r2=428400&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Aug  3 06:18:30 2006
@@ -59,9 +59,9 @@
 
commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz
 
 # - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.0
+nsis.home=${base.path}/nsis-2.18
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
-nsis.nsisdl.dll=${nsis.home}/Plugins/nsisdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis20.exe
+nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
+nsis.loc=${base-sf.loc}/nsis/nsis-2.18-setup.exe

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=428400&r1=428399&r2=428400&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Aug  3 06:18:30 2006
@@ -176,6 +176,7 @@
 
 
   
+
 
 
 
@@ -217,6 +218,7 @@
 
 
   
+
 
 
 
@@ -253,7 +255,142 @@
 
   
 
-  
+  
+
+
+  
+
+
+
+  
+  
+
+
+
+
+
+  
+
+  
+  
+
+
+
+
+   
+   
+   
+   
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+   
+   
+
+  
+
+
+
+  
+
+   
+
+
+  
+
+
+   
+
+
+
+   
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+
+  
 
 
 
@@ -275,11 +412,10 @@
   
 
 
-
+
 
   
 
-
 
 
 

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=428400&r1=428399&r2=428400&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Aug  3 06:18:30 2006
@@ -4,9 +4,7 @@
 
   ;Compression options
   CRCCheck on
-  SetCompress force
-  SetCompressor lzma
-  SetDatablockOptimize on
+  SetCompressor /SOLID lzma
 
   Name "Apache Tomcat"
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/api/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/api/index.html?rev=428400&r1=428399&r2=428400&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/api/index.html (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/api/index.html Thu Aug  3 06:18:30 2006
@@ -11,7 +11,7 @@
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat 
-http://jakarta.apache.org/tomcat/tomcat-6.0-doc/";>documentation 
bundle.
+http://tomcat.apache.org/tomcat-6.0-doc/";>documentation bundle.
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml
URL: 
http:/

DO NOT REPLY [Bug 40177] - RequestDumperValve causes getCharacterEncoding to be called

[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=40177





--- Additional Comments From [EMAIL PROTECTED]  2006-08-03 14:54 ---
The only workaround I am aware of for this issue is to wait until the *end* of
the request and *then* call getParameter*() APIs and output request parameter
information.  Doing so at any point prior to this can mess up the application by
prematurely consuming the input stream and/or locking the request character
encoding.

I wrote a servlet request filter to do such things, provide JMX access, run
across all servlet engines, etc -- and thus don't use RequestDumperValve any
more.  Further I suggest to all developers I work with to avoid it except for
light troubleshooting as it causes more troubles to shoot :-)

-- 
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 37084] - JspC from ant fails on JSPs that use custom taglib

[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=37084





--- Additional Comments From [EMAIL PROTECTED]  2006-08-03 15:29 ---
Regression is still present in 5.17

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

New release manager?

[Yoav Shapira]

Hola,
I'd like to ask if one of the current committers wants to be the
release manager for Tomcat.  I'm not asking because I'm tired of the
job or find it time-consuming: it only takes a couple of hours for
each release, so it's not a big deal time-wise.  But it's
enlightening, and since I've been doing it for a little more than two
years (since Tomcat 5.0.25, release May 2004), I wanted to give
someone else the chance.

If no one wants to, that's fine by me, as I said above I don't mind
continuing.  I'm also happy to help anyone who wants to wear the RM
hat but has questions about how to do it.

Yoav

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

Re: [TC6] Cluster and storeconfig

[Remy Maucherat]

Remy Maucherat wrote:

Hi,

I think it's the right time to add the storeconfig code, as well as a 
clustering implementation (so, which one ?).


Any new comments on this, 3 weeks later ?

I did put in place the necessary scripts and stuff for TC 6, so releases 
could be made in the relatively near future as long as this issue is 
resolved. I volunteer to do the release management, BTW.


Rémy

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

Re: New release manager?

[Filip Hanik - Dev Lists]

I'd be happy to accept this responsibility if you let my brainbugs suck 
your brain for a bit


Filip

Yoav Shapira wrote:

Hola,
I'd like to ask if one of the current committers wants to be the
release manager for Tomcat.  I'm not asking because I'm tired of the
job or find it time-consuming: it only takes a couple of hours for
each release, so it's not a big deal time-wise.  But it's
enlightening, and since I've been doing it for a little more than two
years (since Tomcat 5.0.25, release May 2004), I wanted to give
someone else the chance.

If no one wants to, that's fine by me, as I said above I don't mind
continuing.  I'm also happy to help anyone who wants to wear the RM
hat but has questions about how to do it.

Yoav

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

Re: New release manager?

[Yoav Shapira]

Hi,
Cool.  I saw that Remy volunteered for the first 6.0 releases, so
maybe you'll do 5.5 for now, and then we'll see how things go?

Thankfully the Tomcat release process is mostly automated.  You do
need to put your PGP key in the KEYS file and upload it to a key
server of your choice: these steps are manual.

The best way to do it is probably to "cut" a practice release, meaning
do all the steps except actually putting the release on the web site
and announcing it to users.  I'll be glad to walk you through this,
but let's use a more immediate communication medium, e.g. IM or IRC.

Yoav

On 8/3/06, Filip Hanik - Dev Lists <[EMAIL PROTECTED]> wrote:

I'd be happy to accept this responsibility if you let my brainbugs suck
your brain for a bit

Filip

Yoav Shapira wrote:
> Hola,
> I'd like to ask if one of the current committers wants to be the
> release manager for Tomcat.  I'm not asking because I'm tired of the
> job or find it time-consuming: it only takes a couple of hours for
> each release, so it's not a big deal time-wise.  But it's
> enlightening, and since I've been doing it for a little more than two
> years (since Tomcat 5.0.25, release May 2004), I wanted to give
> someone else the chance.
>
> If no one wants to, that's fine by me, as I said above I don't mind
> continuing.  I'm also happy to help anyone who wants to wear the RM
> hat but has questions about how to do it.
>
> Yoav
>
> -
> 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]




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

Re: [TC6] Cluster and storeconfig

[Filip Hanik - Dev Lists]

Here are my suggestions:

1. Incorporate modules/ha as the cluster solution into TC6

2. Keep modules/groupcom as a separate module
  The reason I suggest a separate module, is cause it is a fairly 
complex component and will have
  a fairly large documentation base, it might be better to keep it 
separate and have it
  release separately from the core. That way, a busted IO component, 
will not set back the tomcat release.


3. Storeconfig - this is Peter's baby and would be his choice.
  I personally would suggest a rewrite of it and have a storeconfig 
that is not dependent on the classes of tomcat,

  ie, storeconfig today has one class for every component in tomcat,
  so as soon as you swap out a component to a custom class,
  there is no saving for that component anymore.
  It could be equally easy to create a completely standalone 
configuration tool.

  But since I am not that familiar here,
  I'd prefer to leave that decision to Peter if he has time to maintain 
it in TC6.


Filip

Remy Maucherat wrote:

Remy Maucherat wrote:

Hi,

I think it's the right time to add the storeconfig code, as well as a 
clustering implementation (so, which one ?).


Any new comments on this, 3 weeks later ?

I did put in place the necessary scripts and stuff for TC 6, so 
releases could be made in the relatively near future as long as this 
issue is resolved. I volunteer to do the release management, BTW.


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]

Re: New release manager?

[Filip Hanik - Dev Lists]

cool, I'll take on 5.5 and 5.0.x(if there will be a need for more of 
these) while Remy does 6.

we'll touch base shortly

Filip


Yoav Shapira wrote:

Hi,
Cool.  I saw that Remy volunteered for the first 6.0 releases, so
maybe you'll do 5.5 for now, and then we'll see how things go?

Thankfully the Tomcat release process is mostly automated.  You do
need to put your PGP key in the KEYS file and upload it to a key
server of your choice: these steps are manual.

The best way to do it is probably to "cut" a practice release, meaning
do all the steps except actually putting the release on the web site
and announcing it to users.  I'll be glad to walk you through this,
but let's use a more immediate communication medium, e.g. IM or IRC.

Yoav

On 8/3/06, Filip Hanik - Dev Lists <[EMAIL PROTECTED]> wrote:

I'd be happy to accept this responsibility if you let my brainbugs suck
your brain for a bit

Filip

Yoav Shapira wrote:
> Hola,
> I'd like to ask if one of the current committers wants to be the
> release manager for Tomcat.  I'm not asking because I'm tired of the
> job or find it time-consuming: it only takes a couple of hours for
> each release, so it's not a big deal time-wise.  But it's
> enlightening, and since I've been doing it for a little more than two
> years (since Tomcat 5.0.25, release May 2004), I wanted to give
> someone else the chance.
>
> If no one wants to, that's fine by me, as I said above I don't mind
> continuing.  I'm also happy to help anyone who wants to wear the RM
> hat but has questions about how to do it.
>
> Yoav
>
> -
> 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]




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

svn commit: r428563 - in /tomcat/tc6.0.x/trunk: conf/server.xml dist.xml res/confinstall/server_1.xml res/confinstall/server_2.xml res/tomcat.nsi

[remm]

Author: remm
Date: Thu Aug  3 16:30:17 2006
New Revision: 428563

URL: http://svn.apache.org/viewvc?rev=428563&view=rev
Log:
- Cleanup the configuration (and fix the one used for the installer).
- Tweak a bit the installer packaging.

Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi

Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?rev=428563&r1=428562&r2=428563&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Thu Aug  3 16:30:17 2006
@@ -74,10 +74,8 @@
 -->
 
 
-
+
 

@@ -90,25 +88,22 @@
-->
 
 
+
 
 
 
-
+
 
 
 
 
 
 
-  
 
 

Modified: tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml?rev=428563&r1=428562&r2=428563&view=diff
==
--- tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml Thu Aug  3 16:30:17 2006
@@ -17,7 +17,7 @@
   
   
   
-  
+  
 
   
   
@@ -74,4 +74,4 @@
 -->
 
 
-http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml?rev=428563&r1=428562&r2=428563&view=diff
==
--- tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml Thu Aug  3 16:30:17 2006
@@ -1,7 +1,5 @@
-   maxHttpHeaderSize="8192"
-   maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-   enableLookups="false" redirectPort="8443" acceptCount="100"
-   connectionTimeout="2" disableUploadTimeout="true" />
+   maxThreads="150" connectionTimeout="2" 
+   redirectPort="8443" />
 

@@ -14,25 +12,22 @@
-->
 
 
+
 
 
 
-
+
 
 
 
 
 
 
 

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=428563&r1=428562&r2=428563&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Aug  3 16:30:17 2006
@@ -293,15 +293,15 @@
 ;
 ;SectionEnd
 
-Section "Webapps" SecWebapps
-
-  SectionIn 3
-
-  SetOutPath $INSTDIR\webapps
-  File /nonfatal /r webapps\balancer
-  File /nonfatal /r webapps\webdav
-
-SectionEnd
+;Section "Webapps" SecWebapps
+;
+;  SectionIn 3
+;
+;  SetOutPath $INSTDIR\webapps
+;  File /nonfatal /r webapps\balancer
+;  File /nonfatal /r webapps\webdav
+;
+;SectionEnd
 
 ;Section "Compatibility" SecCompat
 ;
@@ -365,7 +365,7 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecAdmin} $(DESC_SecAdmin)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -653,13 +653,12 @@
   RMDir /r "$INSTDIR\lib"
   Delete "$INSTDIR\conf\*.dtd"
   RMDir "$INSTDIR\logs"
-  RMDir /r "$INSTDIR\webapps\balancer"
+;  RMDir /r "$INSTDIR\webapps\balancer"
   RMDir /r "$INSTDIR\webapps\docs"
   RMDir /r "$INSTDIR\webapps\examples"
-  RMDir /r "$INSTDIR\webapps\webdav"
+;  RMDir /r "$INSTDIR\webapps\webdav"
   RMDir /r "$INSTDIR\work"
   RMDir /r "$INSTDIR\temp"
-  RMDir /r "$INSTDIR\src"
   RMDir "$INSTDIR"
 
   IfSilent Removed 0



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

Fw: Problem with session cookie in Tomcat 5.5.17

[Wendy Gong]

Hi,

We are porting our application from Tomcat 4.1.24 to Tomcat 5.5.17 and noticed 
there is a change of behavior in Tomcat 5 which causes our OpenSTA testing 
scripts fail to run:

Tomcat 5 can send down more than one sessionIDs to the web client with the same 
path.

e.g. 

request.getSession().invalidate();
request.getSession();

will send down 2 "Set-Cookie" headers with the same context path. The first one 
contains the session ID created by the first "request.getSession()" and the 
second one contains the second session ID created by the second 
"request.getSession()".

OpenSTA appears to pick up the first session ID instead of the second one. This 
basically causes the subsequent requests containing the wrong session ID. 

Although we can argue that it is the client's responsibility to pick up the 
second sesson ID, it would be much more logical and robust for the server to 
send down only one session ID with the same path. Tomcat 4 seems to behave 
correctly and it works happily with OpenSTA.

I checked the source code "org.apache.catalina.connector.Request.java" and 
"doGetSession" method always add a new session cookie into the response once a 
new session is created, without checking if there is an existing session cookie 
with the same path in the response object.

One way to avoid this problem is to modify the application to ensure only one 
new session is created. Since we are using struts, the first new session is 
actually created in struts action class, we will have to manually remove the 
first "Set-Cookie" header in the response for the regression test to work. 

Since this is not reported in the bug list, we would like to know if the above 
behavior of Tomcat 5 is a problem or it is by design. If you think it is a bug, 
please let us know if you will be able to fix it in the near future.

Thanks
Wendy



Weihong Gong
Fujitsu Australia Software Technology
Address: 14 Rodborough Road, Frenchs Forest NSW 2086
Tel: +61 2 9452 9062
Fax: +61 2 9975 2899
Mobile: +61 407486297
Email: [EMAIL PROTECTED]
Web site: www.fastware.com
This is an email from Fujitsu Australia Software Technology Pty Ltd, ABN 27 003 
693 481. It is confidential to the ordinary user of the email address to which 
it was addressed and may contain copyright and/or legally privileged 
information. No one else may read, print, store, copy or forward all or any of 
it or its attachments. If you receive this email in error, please return to 
sender. Thank you.

If you do not wish to receive commercial email messages from Fujitsu Australia 
Software Technology Pty Ltd, please email [EMAIL PROTECTED]

DO NOT REPLY [Bug 40171] - Silent install of tomcat 4.1.32 beta fails on windows

[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=40171


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-08-04 01:42 ---
Thanks for the report. These issues have been fixed in SVN and will be included
in 4.1.33 and later.

-- 
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: r428588 - in /tomcat/container/branches/tc4.1.x: RELEASE-NOTES-4.1.txt tomcat.nsi

[markt]

Author: markt
Date: Thu Aug  3 18:45:04 2006
New Revision: 428588

URL: http://svn.apache.org/viewvc?rev=428588&view=rev
Log:
Fix 40171. Silent installation fails to install all files in the conf dir and 
doesn't add Tomcat to add/remove programs.

Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/tomcat.nsi

Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=428588&r1=428587&r2=428588&view=diff
==
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Thu Aug  3 18:45:04 
2006
@@ -598,6 +598,10 @@
  Clarify thay Verisign has different CAs for commercial and trial
  certificates
 
+[4.1.33] #40171
+ Windows Installer
+ Fix various issues with silent installation
+
 
 --
 Catalina Bug Fixes:

Modified: tomcat/container/branches/tc4.1.x/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/tomcat.nsi?rev=428588&r1=428587&r2=428588&view=diff
==
--- tomcat/container/branches/tc4.1.x/tomcat.nsi (original)
+++ tomcat/container/branches/tc4.1.x/tomcat.nsi Thu Aug  3 18:45:04 2006
@@ -59,6 +59,7 @@
 File LICENSE
 File /r /x *.exe bin
 File /r common
+File /r conf
 File /nonfatal /r shared
 File /nonfatal /r logs
 File /r server
@@ -74,6 +75,11 @@
 CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
 
 WriteUninstaller "$INSTDIR\uninst-tomcat4.exe"
+WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\4.1" "" 
$INSTDIR
+WriteRegStr HKLM 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1" \
+ "DisplayName" "Apache Tomcat 4.1 (remove only)"
+WriteRegStr HKLM 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 4.1" \
+ "UninstallString" '"$INSTDIR\uninst-tomcat4.exe"'
 
   SectionEnd
 
@@ -88,7 +94,7 @@
 File /oname=tomcat4.exe bin\tomcat4.exe
 File /oname=tomcat4w.exe bin\tomcat4w.exe
 
-ExecWait '"$INSTDIR\bin\tomcat4.exe" //IS//Tomcat4 --DisplayName "Apache 
Tomcat" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\tomcat4.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath 
"$INSTDIR"'
+ExecWait '"$INSTDIR\bin\tomcat4.exe" //IS//Tomcat4 --DisplayName "Apache 
Tomcat 4.1" --Description "Apache Tomcat @VERSION@ Server - 
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install 
"$INSTDIR\bin\tomcat4.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath 
"$INSTDIR"'
 
 ExecWait '"$INSTDIR\bin\tomcat4.exe" //US//Tomcat4 --Startup auto'
 
@@ -222,7 +228,7 @@
 
   Call findJavaPath
   Pop $1
-  MessageBox MB_OK "Using Java Development Kit found in $1"
+  MessageBox MB_OK "Using Java Development Kit found in $1" /SD IDOK
   
   InitPluginsDir
   File /oname=$PLUGINSDIR\config.ini config.ini
@@ -231,7 +237,7 @@
 
 
 Function .onInstSuccess
-
+  IfSilent +2
   ExecShell open '$SMPROGRAMS\Apache Tomcat 4.1'
 
 FunctionEnd
@@ -330,12 +336,6 @@
 ; and build the configuration files
 ;
 Function configure
-  SetOverwrite off
-  SetOutPath $INSTDIR\conf
-  File /oname=server.xml conf\server-noexamples.xml.config
-  SetOutPath $INSTDIR
-  File /r conf
-
   ; Output files needed for the configuration dialog
   SetOverwrite on
 
@@ -400,12 +400,6 @@
   RMDir /r "$TEMP\confinstall"
 
   Call startService
-
-  WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\4.1" "" $INSTDIR
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 4.1" \
-   "DisplayName" "Apache Tomcat 4.1 (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache 
Tomcat 4.1" \
-   "UninstallString" '"$INSTDIR\uninst-tomcat4.exe"'
 
   Sleep 500
   BringToFront



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

DO NOT REPLY [Bug 39623] - tomcat native library 1.1.3 didn't bind port 80 actually

[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=39623





--- Additional Comments From [EMAIL PROTECTED]  2006-08-04 06:10 ---
I have exprience the likely problem as you described on ubuntu linux. finnally 
I found it is caused by the openssl. To modify the /etc/openssl.conf to reset
the path of .rnd file and let the root and tomcat user have access prevelige on
the file will solve the problem. But still I found it is unstable for our
appilication. and  now I have to skip the native connector and wondering how to
make my server scalable to large amounts of connections. Hope this could do 
help!

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