Re: new year, new version? 6.0.16

2008-01-17 Thread Peter Rossbach

+1
Peter


Am 16.01.2008 um 23:26 schrieb Filip Hanik - Dev Lists:

could we get a target date for this? I believe there is enough  
community interest to push out a new release


Filip


Filip Hanik - Dev Lists wrote:
we have a lot of updates added in, I think it may be good to set a  
date for our next release and work towards that


Filip

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

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 00:41:44 2008
New Revision: 612758

URL: http://svn.apache.org/viewvc?rev=612758view=rev
Log:
Cast my vote

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612758r1=612757r2=612758view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 00:41:44 2008
@@ -33,12 +33,12 @@
 
 * Fix Windows installer issue that was including files when it should not
   http://svn.apache.org/viewvc?rev=611660view=rev
-  +1: markt, fhanik
+  +1: markt, fhanik, pero
   -1: 
 
 * Add global flag to turn off reverse DNS lookups, performance improvement for 
tribes
   http://svn.apache.org/viewvc?view=revrevision=612192
-  +1: fhanik, markt
+  +1: fhanik, markt, pero
   -1: 
 
 * Set correct sessionCounter at StandardManager after reload sessions
@@ -48,22 +48,22 @@
 
 * Improve release note wording on Java version
   http://svn.apache.org/viewvc?rev=612588view=rev
-  +1: markt
+  +1: markt, pero
   -1: 
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43173
   http://svn.apache.org/viewvc?rev=612622view=rev
-  +1: markt
+  +1: markt, pero
   -1: 
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468
   http://svn.apache.org/viewvc?rev=612632view=rev
   http://svn.apache.org/viewvc?rev=612647view=rev
   (less the build.properties changes)
-  +1: markt
+  +1: markt, pero
   -1:
 
 * http://issues.apache.org/bugzilla/show_bug.cgi?id=43515
   http://svn.apache.org/viewvc?rev=612636view=rev
-  +1: markt
+  +1: markt, pero
   -1:



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



svn commit: r612761 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/StandardManager.java webapps/docs/changelog.xml

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 00:48:45 2008
New Revision: 612761

URL: http://svn.apache.org/viewvc?rev=612761view=rev
Log:
Set correct StandardManager.sessionCounter after reload!

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612761r1=612760r2=612761view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 00:48:45 2008
@@ -41,11 +41,6 @@
   +1: fhanik, markt, pero
   -1: 
 
-* Set correct sessionCounter at StandardManager after reload sessions
-  http://svn.apache.org/viewvc?view=revrevision=612455
-  +1: pero, fhanik, markt
-  -1: 
-
 * Improve release note wording on Java version
   http://svn.apache.org/viewvc?rev=612588view=rev
   +1: markt, pero

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=612761r1=612760r2=612761view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java 
Thu Jan 17 00:48:45 2008
@@ -395,9 +395,10 @@
 session.setManager(this);
 sessions.put(session.getIdInternal(), session);
 session.activate();
+sessionCounter++;
 }
 } catch (ClassNotFoundException e) {
-  log.error(sm.getString(standardManager.loading.cnfe, e), e);
+log.error(sm.getString(standardManager.loading.cnfe, e), e);
 if (ois != null) {
 try {
 ois.close();
@@ -408,7 +409,7 @@
 }
 throw e;
 } catch (IOException e) {
-  log.error(sm.getString(standardManager.loading.ioe, e), e);
+log.error(sm.getString(standardManager.loading.ioe, e), e);
 if (ois != null) {
 try {
 ois.close();

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612761r1=612760r2=612761view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 00:48:45 2008
@@ -91,6 +91,9 @@
   /subsection
   subsection name=Catalina
 changelog
+   fix
+ Set correct StandardManager.sessionCounter after reload/restart. 
(pero)
+  /fix
   fix
 bug42503/bug: ServletContext.getResourceAsStream() could return
 stale data. Patch provided by Arvind Srinivasan. (funkman/jim)



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



Re: new year, new version? 6.0.16

2008-01-17 Thread Remy Maucherat
On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
 could we get a target date for this? I believe there is enough community 
 interest to push out a new release

There are still a lot of pending patches.

Rémy



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



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

2008-01-17 Thread rjung
Author: rjung
Date: Thu Jan 17 02:51:24 2008
New Revision: 612791

URL: http://svn.apache.org/viewvc?rev=612791view=rev
Log:
Cast a vote.

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612791r1=612790r2=612791view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 02:51:24 2008
@@ -43,22 +43,24 @@
 
 * Improve release note wording on Java version
   http://svn.apache.org/viewvc?rev=612588view=rev
-  +1: markt, pero
+  +1: markt, pero, rjung
   -1: 
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43173
   http://svn.apache.org/viewvc?rev=612622view=rev
-  +1: markt, pero
+  +1: markt, pero, rjung
   -1: 
+  rjung: Although actually it's $CATALINA_BASE, but usually (unfortunately) we 
don't make
+ a difference between them in the docs
 
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468
   http://svn.apache.org/viewvc?rev=612632view=rev
   http://svn.apache.org/viewvc?rev=612647view=rev
   (less the build.properties changes)
-  +1: markt, pero
+  +1: markt, pero, rjung
   -1:
 
 * http://issues.apache.org/bugzilla/show_bug.cgi?id=43515
   http://svn.apache.org/viewvc?rev=612636view=rev
-  +1: markt, pero
+  +1: markt, pero, rjung
   -1:



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



Re: new year, new version? 6.0.16

2008-01-17 Thread Rainer Jung

Remy Maucherat wrote:

On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
could we get a target date for this? I believe there is enough community 
interest to push out a new release


There are still a lot of pending patches.

Rémy


All entries in the STATUS file now carry at least three positive votes, 
except for the first entry, which is not critical, because it's only a 
patch to a test case.


If we don't add further entries, it should be possible to get all those 
included. Note: none of the 7 entries seems to be critical.


Regards,

Rainer



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



DO NOT REPLY [Bug 44223] - Tomcat ignores the javax.net.ssl.trustStoreType system property

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44223.
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=44223


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WONTFIX |




--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 04:12 ---
(In reply to comment #2)
 Tomcat ignores any of the SSL configuration system properties.

But this statement is not true. Tomcat already consults the 
javax.net.ssl.trustStore and javax.net.ssl.trustStorePassword properties, 
only it was ignoring the third one, javax.net.ssl.trustStoreType. I am not 
asking for a new feature here, this bug is about the inconsistent 
implementation of an existing feature. Look at the 
JSSESocketFactory.getTrustStore() method to see what's going on.

 I was going to say it has always been this way, I didn't know why and if you
 provided a patch that addressed all of them it would be considered.

Well this patch completes the addressing of all of them. Only 2 out of 3 trust 
store related properties are being taken into account at the moment, and this 
patch adds support for the 3rd one. Either this inconsistency should be fixed, 
or else remove support for ALL trust store properties. The current situation is 
inconsistent and leads to maddening configuration issues (i.e. any reasonable 
person would assume that since 2 trust store properties appear supported the 
third one would be also, and then scratch their head when a non-descriptive 
JSSE exception hits them).

 However, my brain is now in gear and the problem seems obvious. When using
 system properties for configuration then everything is fine until two 
components
 require conflicting settings. In a container environment this pretty much a
 given. We had a similar issue with logging which is why Remy wrote JULI.
 
 Therefore, I am marking this as a WONTFIX on the grounds I see it causing more
 problems than it solves.

While I agree with your reasoning about container environments, I disagree with 
the WONTFIX assessment. Currently you have partial support for an arbitrary 
subset of trust store properties, which is the worst of both worlds.  Either 
support all of them or none of them.


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



RE: new year, new version? 6.0.16

2008-01-17 Thread Christophe Pierret
Maybe some patches could be prioritized and planned to different releases 
(6.0.17, ...), the amount of available pending patches should not prevent from 
delivering a much awaited release.
In my case, it is very much awaited, I am currently using unofficial 6.0.15 for 
my product , despite the negative vote, because, for the parts I use, I found 
6.0.15 of better quality than 6.0.14 !

Christophe

-Message d'origine-
De : Remy Maucherat [mailto:[EMAIL PROTECTED] 
Envoyé : jeudi 17 janvier 2008 11:27
À : Tomcat Developers List
Objet : Re: new year, new version? 6.0.16

On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
 could we get a target date for this? I believe there is enough community 
 interest to push out a new release

There are still a lot of pending patches.

Rémy



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



Re: new year, new version? 6.0.16

2008-01-17 Thread Rainer Jung

Remy Maucherat wrote:

On Thu, 2008-01-17 at 07:56 -0700, Filip Hanik - Dev Lists wrote:

Remy Maucherat wrote:

On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
  
could we get a target date for this? I believe there is enough community 
interest to push out a new release


There are still a lot of pending patches.
  

that's alright, shouldn't prevent us from setting a date


I could use the same date as the 5.5 release.


+1



Rémy


Rainer

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



Re: new year, new version? 6.0.16

2008-01-17 Thread Remy Maucherat
On Thu, 2008-01-17 at 07:56 -0700, Filip Hanik - Dev Lists wrote:
 Remy Maucherat wrote:
  On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:

  could we get a target date for this? I believe there is enough community 
  interest to push out a new release
  
 
  There are still a lot of pending patches.

 that's alright, shouldn't prevent us from setting a date

I could use the same date as the 5.5 release.

Rémy



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



Re: new year, new version? 6.0.16

2008-01-17 Thread Filip Hanik - Dev Lists

Remy Maucherat wrote:

On Thu, 2008-01-17 at 07:56 -0700, Filip Hanik - Dev Lists wrote:
  

Remy Maucherat wrote:


On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
  
  
could we get a target date for this? I believe there is enough community 
interest to push out a new release



There are still a lot of pending patches.
  
  

that's alright, shouldn't prevent us from setting a date



I could use the same date as the 5.5 release.
  

+1

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 year, new version? 6.0.16

2008-01-17 Thread Mark Thomas

Filip Hanik - Dev Lists wrote:

Remy Maucherat wrote:

On Thu, 2008-01-17 at 07:56 -0700, Filip Hanik - Dev Lists wrote:
 

Remy Maucherat wrote:
   

On Wed, 2008-01-16 at 15:26 -0700, Filip Hanik - Dev Lists wrote:
   
could we get a target date for this? I believe there is enough 
community interest to push out a new release


There are still a lot of pending patches.


that's alright, shouldn't prevent us from setting a date



I could use the same date as the 5.5 release.
  

+1


+1. The one patch I do want to get into 6.0.16 and 5.5.26 is the update to 
commons-pool 1.4 which will fix 
http://issues.apache.org/bugzilla/show_bug.cgi?id=43552


I was going to do it last night but the archive hadn't sync'd. It looks 
like it is there now so I'll propose the patch now.


Mark


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



DO NOT REPLY [Bug 43173] - Logging documentation says to put logging.properties in common/classes

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=43173.
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=43173


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 11:27 ---
Fix in svn and will be included in 6.0.16 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: r612943 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/docs/logging.xml

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:27:34 2008
New Revision: 612943

URL: http://svn.apache.org/viewvc?rev=612943view=rev
Log:
Fix typo on logging properties location.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/logging.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612943r1=612942r2=612943view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:27:34 2008
@@ -36,13 +36,6 @@
   +1: fhanik, markt, pero
   -1: 
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43173
-  http://svn.apache.org/viewvc?rev=612622view=rev
-  +1: markt, pero, rjung
-  -1: 
-  rjung: Although actually it's $CATALINA_BASE, but usually (unfortunately) we 
don't make
- a difference between them in the docs
-
 * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468
   http://svn.apache.org/viewvc?rev=612632view=rev
   http://svn.apache.org/viewvc?rev=612647view=rev

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612943r1=612942r2=612943view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:27:34 2008
@@ -218,6 +218,10 @@
   subsection name=Webapps
 changelog
   fix
+bug43173/bug: Fix typo in logging documentation regarding location
+of logging.properties. (markt)
+  /fix
+  fix
 bug43344/bug: Fix typo in if.jsp example. Patch provided by Tim
 Nowaczyk. (markt)
   /fix

Modified: tomcat/tc6.0.x/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/logging.xml?rev=612943r1=612942r2=612943view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/logging.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/logging.xml Thu Jan 17 11:27:34 2008
@@ -214,7 +214,7 @@
 /ul
   /p
   p
-Example logging.properties file to be placed in common/classes:
+Example logging.properties file to be placed in $CATALINA_HOME/conf:
 source
 handlers = 1catalina.org.apache.juli.FileHandler, 
2localhost.org.apache.juli.FileHandler, \
3manager.org.apache.juli.FileHandler, 
4admin.org.apache.juli.FileHandler, \



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



svn commit: r612936 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:20:49 2008
New Revision: 612936

URL: http://svn.apache.org/viewvc?rev=612936view=rev
Log:
Fix installer issue that included to many files due to use of 'File /r xxx' 
rather than 'File /r xxx\*.*'

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612936r1=612935r2=612936view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:20:49 2008
@@ -31,11 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
 
-* Fix Windows installer issue that was including files when it should not
-  http://svn.apache.org/viewvc?rev=611660view=rev
-  +1: markt, fhanik, pero
-  -1: 
-
 * Add global flag to turn off reverse DNS lookups, performance improvement for 
tribes
   http://svn.apache.org/viewvc?view=revrevision=612192
   +1: fhanik, markt, pero

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=612936r1=612935r2=612936view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Jan 17 11:20:49 2008
@@ -136,20 +136,26 @@
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
-  File /r lib
-  File /nonfatal /r logs
-  File /nonfatal /r work
-  File /nonfatal /r temp
+  SetOutPath $INSTDIR\lib
+  File /r lib\*.*
+  SetOutPath $INSTDIR\logs
+  File /nonfatal /r logs\*.*
+  SetOutPath $INSTDIR\work
+  File /nonfatal /r work\*.*
+  SetOutPath $INSTDIR\temp
+  File /nonfatal /r temp\*.*
   SetOutPath $INSTDIR\bin
   File bin\bootstrap.jar
   File bin\tomcat-juli.jar
   File bin\*.exe
   SetOutPath $INSTDIR\conf
   File conf\*.*
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\ROOT
-  File /r webapps\host-manager
-  File /r webapps\manager
+  SetOutPath $INSTDIR\webapps\ROOT
+  File /r webapps\ROOT\*.*
+  SetOutPath $INSTDIR\webapps\host-manager
+  File /r webapps\host-manager\*.*
+  SetOutPath $INSTDIR\webapps\manager
+  File /r webapps\manager\*.*
 
   Call configure
   Call findJavaPath
@@ -285,8 +291,8 @@
 Section Documentation SecDocs
 
   SectionIn 1 3
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\docs
+  SetOutPath $INSTDIR\webapps\docs
+  File /r webapps\docs\*.*
 
 SectionEnd
 
@@ -295,8 +301,8 @@
   SectionIn 3
 
   SetOverwrite on
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\examples
+  SetOutPath $INSTDIR\webapps\examples
+  File /r webapps\examples\*.*
 
 SectionEnd
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612936r1=612935r2=612936view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:20:49 2008
@@ -87,6 +87,11 @@
   fix
 Cookie parsing of $Version regression from 6.0.15 has been fixed
   /fix
+  fix
+The script that builds the windows installer was including additional
+files due to the way it processes recurrsive file selectors. The
+selectors have been modified to only include the intended files. 
(markt)
+  /fix
 /changelog
   /subsection
   subsection name=Catalina



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



svn commit: r612950 - /tomcat/trunk/build.properties.default

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:45:42 2008
New Revision: 612950

URL: http://svn.apache.org/viewvc?rev=612950view=rev
Log:
Update: native to 1.1.12; commons-pool to 1.4; locations for commons downloads.

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=612950r1=612949r2=612950view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jan 17 11:45:42 2008
@@ -43,12 +43,12 @@
 compile.target=1.5
 compile.debug=true
 
-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
 base-tomcat.loc=http://archive.apache.org/dist/tomcat
 
 # - Commons Logging, version 1.1 or later -
 commons-logging-version=1.1.1
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
 
 # - Webservices -
 
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -61,25 +61,25 @@
 
jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.1.10
+tomcat-native.home=${base.path}/tomcat-native-1.1.12
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.10-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz
 
 # - Commons DBCP, version 1.1 or later -
 commons-dbcp.version=1.2.2
 commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
 
 # - Commons Pool, version 1.1 or later -
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
 
 # - Commons Collections, version 2.0 or later -
 commons-collections.home=${base.path}/commons-collections-3.2-src
 commons-collections.lib=${commons-collections.home}
 commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
 
commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
 
 # - NSIS, version 2.0 or later -
 nsis.home=${base.path}/nsis-2.34
@@ -93,5 +93,5 @@
 commons-daemon.home=${base.path}/commons-daemon-1.0.1
 commons-daemon.lib=${commons-daemon.home}
 commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
 commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz



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



DO NOT REPLY [Bug 43515] - Small bug in org.apache.catalina.manager.HTMLManagerServlet

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=43515.
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=43515


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 11:39 ---
This has been fixed in svn and will be included in 6.0.16 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: r612948 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/HTMLManagerServlet.java webapps/docs/changelog.xml

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:38:25 2008
New Revision: 612948

URL: http://svn.apache.org/viewvc?rev=612948view=rev
Log:
Fix bug 43515. Bug in listing contexts. Patch provided by Lucas Galfaso.

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612948r1=612947r2=612948view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:38:25 2008
@@ -35,8 +35,3 @@
   http://svn.apache.org/viewvc?view=revrevision=612192
   +1: fhanik, markt, pero
   -1: 
-
-* http://issues.apache.org/bugzilla/show_bug.cgi?id=43515
-  http://svn.apache.org/viewvc?rev=612636view=rev
-  +1: markt, pero, rjung
-  -1:

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612948r1=612947r2=612948view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
Thu Jan 17 11:38:25 2008
@@ -382,7 +382,7 @@
 
 Map.Entry entry = (Map.Entry) iterator.next();
 String displayPath = (String) entry.getKey();
-String contextPath = (String) entry.getKey();
+String contextPath = (String) entry.getValue();
 Context context = (Context) host.findChild(contextPath);
 if (displayPath.equals()) {
 displayPath = /;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612948r1=612947r2=612948view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:38:25 2008
@@ -230,6 +230,10 @@
 application. (markt)
   /fix
   fix
+bug43515/bug: Fix bug in Manager application that may have caused
+problems when listing contexts. Patch provided by Lucas Galfaso. 
(markt)
+  /fix 
+  fix
 bug43611/bug: Provide an error message if user tries to upload a 
war
 for a context defined in server.xml rather than failing silently.
 (markt/jim)



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



svn commit: r612944 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:32:30 2008
New Revision: 612944

URL: http://svn.apache.org/viewvc?rev=612944view=rev
Log:
Fix bug 43468. Possible NPE listing contexts in manager.

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612944r1=612943r2=612944view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:32:30 2008
@@ -36,13 +36,6 @@
   +1: fhanik, markt, pero
   -1: 
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468
-  http://svn.apache.org/viewvc?rev=612632view=rev
-  http://svn.apache.org/viewvc?rev=612647view=rev
-  (less the build.properties changes)
-  +1: markt, pero, rjung
-  -1:
-
 * http://issues.apache.org/bugzilla/show_bug.cgi?id=43515
   http://svn.apache.org/viewvc?rev=612636view=rev
   +1: markt, pero, rjung

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612944r1=612943r2=612944view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
Thu Jan 17 11:32:30 2008
@@ -38,6 +38,7 @@
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
 import org.apache.catalina.manager.util.BaseSessionComparator;
 import org.apache.catalina.manager.util.ReverseComparator;
@@ -440,7 +441,13 @@
  /html/expire?path= + displayPath);
 args[9] = appsExpire;
 args[10] = sm.getString(htmlManagerServlet.expire.explain);
-args[11] = new 
Integer(context.getManager().getMaxInactiveInterval()/60);
+Manager manager = context.getManager();
+if (manager == null) {
+args[11] = sm.getString(htmlManagerServlet.noManager);
+} else {
+args[11] = new Integer(
+context.getManager().getMaxInactiveInterval()/60);
+}
 args[12] = sm.getString(htmlManagerServlet.expire.unit);
 
 args[13] = highlightColor;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612944r1=612943r2=612944view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
Thu Jan 17 11:32:30 2008
@@ -46,6 +46,7 @@
 htmlManagerServlet.list=List Applications
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=-
 htmlManagerServlet.serverJVMVendor=JVM Vendor
 htmlManagerServlet.serverJVMVersion=JVM Version
 htmlManagerServlet.serverOSArch=OS Architecture

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612944r1=612943r2=612944view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:32:30 2008
@@ -226,6 +226,10 @@
 Nowaczyk. (markt)
   /fix
   fix
+bug43468/bug: Fix possible NPE when listing contexts in the Manager
+application. (markt)
+  /fix
+  fix
 bug43611/bug: Provide an error message if user tries to upload a 
war
 for a context defined in server.xml rather than failing silently.
 (markt/jim)



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



DO NOT REPLY [Bug 43468] - HTMLManagerServlet NullPointerException listing context

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=43468.
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=43468


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 11:32 ---
This has been fixed in svn and will be included in 6.0.16 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: r612951 - /tomcat/tc6.0.x/trunk/STATUS.txt

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 11:49:34 2008
New Revision: 612951

URL: http://svn.apache.org/viewvc?rev=612951view=rev
Log:
Propose library update for 6.0.16

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=612951r1=612950r2=612951view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:49:34 2008
@@ -35,3 +35,8 @@
   http://svn.apache.org/viewvc?view=revrevision=612192
   +1: fhanik, markt, pero
   -1: 
+
+* Update: native to 1.1.12; commons-pool to 1.4; commons archive locations.
+  http://svn.apache.org/viewvc?rev=612950view=rev
+  +1: markt
+  -1:



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



Re: new year, new version? 6.0.16

2008-01-17 Thread David Jencks
Would this be from trunk or from a previous 6.0.x branch?  I seem to  
recall some concerns about including the annotation processing  
changes that are now in trunk in a 6.0.x release and some thought  
that a version number more like 6.1 would be more appropriate.


thanks
david jencks

On Jan 4, 2008, at 10:20 AM, Filip Hanik - Dev Lists wrote:

we have a lot of updates added in, I think it may be good to set a  
date for our next release and work towards that


Filip

-
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 44261] - Restricted listeners property file not found message fix

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44261.
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=44261





--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 12:38 ---
Created an attachment (id=21403)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=21403action=view)
Missing file and bugfix


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

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 12:55:24 2008
New Revision: 612979

URL: http://svn.apache.org/viewvc?rev=612979view=rev
Log:
Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp for 
better remote JMX access.

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=612979r1=612978r2=612979view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 12:55:24 2008
@@ -40,3 +40,9 @@
   http://svn.apache.org/viewvc?rev=612950view=rev
   +1: markt
   -1:
+  
+* Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp 
for better
+  remote JMX access.
+  http://svn.apache.org/viewvc?rev=612971view=rev
+  +1: pero
+  -1:



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



Re: Restricted listeners property file not found

2008-01-17 Thread David Jencks
Sorry, this is my fault.  I attached a patch to fix it to http:// 
issues.apache.org/bugzilla/show_bug.cgi?id=44261.


thanks
david jencks

On Jan 17, 2008, at 5:01 AM, Peter Rossbach wrote:


Why this message was logged?

17.01.2008 13:57:45 org.apache.catalina.core.StandardEngine start
INFO: Starting Servlet Engine: Apache Tomcat/6.0.15-trunk-pero
17.01.2008 13:57:45 org.apache.catalina.core.DefaultInstanceManager  
init

SCHWERWIEGEND: Restricted listeners property file not found

Testet with current tomcat 6 trunk.

Regards
Peter


-
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 44261] New: - Restricted listeners property file not found message fix

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44261.
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=44261

   Summary: Restricted listeners property file not found message
fix
   Product: Tomcat 6
   Version: unspecified
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Attached is a patch to add the missing file and fix a small bug in its use.

-- 
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: r612971 - in /tomcat/trunk: java/org/apache/catalina/ha/session/mbeans-descriptors.xml java/org/apache/catalina/session/ManagerBase.java java/org/apache/catalina/session/mbeans-descriptors

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 12:43:43 2008
New Revision: 612971

URL: http://svn.apache.org/viewvc?rev=612971view=rev
Log:
Add getLastAccessedTimestamp and getCreationTimestamp for remote JMX Access.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=612971r1=612970r2=612971view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Thu 
Jan 17 12:43:43 2008
@@ -342,6 +342,22 @@
 description=Id of the session
 type=java.lang.String/
 /operation
+operation   name=getLastAccessedTimestamp
+  description=Get the last access timestamp
+   impact=ACTION
+   returnType=long
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
+operation   name=getCreationTimestamp
+  description=Get the creation timestamp
+   impact=ACTION
+   returnType=long
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
 operation
   name=expireAllLocalSessions
   description=Exipre all active local sessions and replicate the invalid 
sessions

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=612971r1=612970r2=612971view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Jan 17 
12:43:43 2008
@@ -1203,7 +1203,13 @@
 s.expire();
 }
 
-
+public long getLastAccessedTimestamp( String sessionId ) {
+Session s=(Session)sessions.get(sessionId);
+if(s== null)
+return -1 ;
+return s.getLastAccessedTime();
+}
+  
 public String getLastAccessedTime( String sessionId ) {
 Session s=(Session)sessions.get(sessionId);
 if( s==null ) {
@@ -1222,6 +1228,13 @@
 return ;
 }
 return new Date(s.getCreationTime()).toString();
+}
+
+public long getCreationTimestamp( String sessionId ) {
+Session s=(Session)sessions.get(sessionId);
+if(s== null)
+return -1 ;
+return s.getCreationTime();
 }
 
 //  JMX and Registration  

Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=612971r1=612970r2=612971view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Thu 
Jan 17 12:43:43 2008
@@ -160,6 +160,24 @@
  type=java.lang.String/
 /operation
 
+   operation   name=getLastAccessedTimestamp
+  description=Get the last access timestamp
+   impact=ACTION
+   returnType=long
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
+
+operation   name=getCreationTimestamp
+  description=Get the creation timestamp
+   impact=ACTION
+   returnType=long
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
+
   /mbean
 
   mbean name=PersistentManager
@@ -316,6 +334,24 @@
   description=Get the creation time
impact=ACTION
returnType=java.lang.String
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
+
+operation   name=getLastAccessedTimestamp
+  description=Get the last access timestamp
+   impact=ACTION
+   returnType=long
+  parameter name=sessionId
+  description=Id of the session
+ type=java.lang.String/
+/operation
+
+operation   name=getCreationTimestamp
+  description=Get the creation timestamp
+   impact=ACTION
+   returnType=long
   parameter name=sessionId
   

Re: new year, new version? 6.0.16

2008-01-17 Thread Filip Hanik - Dev Lists

David Jencks wrote:
Would this be from trunk or from a previous 6.0.x branch?  I seem to 
recall some concerns about including the annotation processing changes 
that are now in trunk in a 6.0.x release and some thought that a 
version number more like 6.1 would be more appropriate.
no release date set on trunk yet, there wont be until trunk moves to a 
6.x branch, and then we do releases from there.
I don't see this one in a while, 6.0 is still gaining momentum and is 
getting bugfixes done.

Filip



thanks
david jencks

On Jan 4, 2008, at 10:20 AM, Filip Hanik - Dev Lists wrote:

we have a lot of updates added in, I think it may be good to set a 
date for our next release and work towards that


Filip

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

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 13:47:24 2008
New Revision: 612992

URL: http://svn.apache.org/viewvc?rev=612992view=rev
Log:
Fix Restricted listeners property file not found message fix

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=612992r1=612991r2=612992view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 13:47:24 2008
@@ -52,3 +52,10 @@
   http://svn.apache.org/viewvc?rev=612988view=rev
   +1: pero
   -1:
+  
+* Fix Restricted listeners property file not found message fix
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=44261
+  http://svn.apache.org/viewvc?rev=612991view=rev
+  +1: pero
+  -1:
+  
\ No newline at end of file



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



DO NOT REPLY [Bug 44261] - Restricted listeners property file not found message fix

2008-01-17 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=44261.
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=44261


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2008-01-17 13:48 ---
Fix at tomcat 6 trunk (R612991) and hope we can add to next release
Many thanks.

-- 
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: r612991 - in /tomcat/trunk: java/org/apache/catalina/core/DefaultInstanceManager.java java/org/apache/catalina/core/RestrictedListeners.properties webapps/docs/changelog.xml

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 13:45:45 2008
New Revision: 612991

URL: http://svn.apache.org/viewvc?rev=612991view=rev
Log:
Fix Restricted listeners property file not found message fix

Added:
tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=612991r1=612990r2=612991view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu 
Jan 17 13:45:45 2008
@@ -88,7 +88,7 @@
 this.getClass().getClassLoader().getResourceAsStream
 
(org/apache/catalina/core/RestrictedListeners.properties);
 if (is != null) {
-restrictedFilters.load(is);
+restrictedListeners.load(is);
 } else {
 
catalinaContext.getLogger().error(sm.getString(defaultInstanceManager.restrictedListenersResources));
 }

Added: tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties?rev=612991view=auto
==
--- tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties 
Thu Jan 17 13:45:45 2008
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the License); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

Propchange: 
tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
--
svn:eol-style = native

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=612991r1=612990r2=612991view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 13:45:45 2008
@@ -46,6 +46,9 @@
   /subsection
   subsection name=Catalina
 changelog
+  fixbug44261/bug: Fix Restricted listeners property file not 
found message fix.  Patch provided by
+David Jencks. (pero)
+  /fix  
   fix
 Fix ManagerServlet.exipreSession throws Exceptions as iterate longer 
session lists at production servers (pero)
   /fix



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



svn commit: r612988 - in /tomcat/trunk: java/org/apache/catalina/manager/LocalStrings.properties java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 13:34:33 2008
New Revision: 612988

URL: http://svn.apache.org/viewvc?rev=612988view=rev
Log:
Fix ManagerServlet.exipreSession throws Exceptions as iterate longer session 
lists at production servers.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612988r1=612987r2=612988view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Thu 
Jan 17 13:34:33 2008
@@ -73,6 +73,7 @@
 managerServlet.noDirectory=FAIL - Non-directory document base for path {0}
 managerServlet.noDocBase=FAIL - Cannot undeploy document base for path {0}
 managerServlet.noGlobal=FAIL - No global JNDI resources are available
+managerServlet.noManager=FAIL - No manager exists for path {0}
 managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0}
 managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
 managerServlet.noRole=FAIL - User does not possess role {0}

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=612988r1=612987r2=612988view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Jan 
17 13:34:33 2008
@@ -47,6 +47,7 @@
 import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
+import org.apache.catalina.Manager;
 import org.apache.catalina.Role;
 import org.apache.catalina.Server;
 import org.apache.catalina.ServerFactory;
@@ -1115,8 +1116,14 @@
 RequestUtil.filter(displayPath)));
 return;
 }
+Manager manager = context.getManager() ;
+if(manager == null) {
+writer.println(sm.getString(managerServlet.noManager,
+RequestUtil.filter(displayPath)));
+return;   
+}
 int maxCount = 60;
-int maxInactiveInterval = 
context.getManager().getMaxInactiveInterval()/60;
+int maxInactiveInterval = manager.getMaxInactiveInterval()/60;
 int histoInterval = maxInactiveInterval / maxCount;
 if ( histoInterval * maxCount  maxInactiveInterval ) 
 histoInterval++;
@@ -1127,13 +1134,13 @@
 writer.println(sm.getString(managerServlet.sessions, 
displayPath));
 writer.println(sm.getString(managerServlet.sessiondefaultmax,
  + maxInactiveInterval));
-Session [] sessions = context.getManager().findSessions();
+Session [] sessions = manager.findSessions();
 int [] timeout = new int[maxCount];
 int notimeout = 0;
 int expired = 0;
 long now = System.currentTimeMillis();
 for (int i = 0; i  sessions.length; i++) {
-int time = (int)((now-sessions[i].getLastAccessedTime())/1000);
+int time = 
(int)((now-sessions[i].getLastAccessedTimeInternal())/1000);
 if (idle = 0  time = idle*60) {
 sessions[i].expire();
 idle++;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=612988r1=612987r2=612988view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 13:34:33 2008
@@ -46,6 +46,9 @@
   /subsection
   subsection name=Catalina
 changelog
+  fix
+Fix ManagerServlet.exipreSession throws Exceptions as iterate longer 
session lists at production servers (pero)
+  /fix
   add
 Add ManagerBase session getLastAccessedTimestamp and 
getCreationTimestamp for better
 remote JMX access. (pero)



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



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

2008-01-17 Thread pero
Author: pero
Date: Thu Jan 17 13:36:10 2008
New Revision: 612989

URL: http://svn.apache.org/viewvc?rev=612989view=rev
Log:
Fix ManagerServlet.expireSessions throws Exceptions as iterate longer session 
lists at production servers.

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=612989r1=612988r2=612989view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 13:36:10 2008
@@ -46,3 +46,9 @@
   http://svn.apache.org/viewvc?rev=612971view=rev
   +1: pero
   -1:
+
+* Fix ManagerServlet.expireSessions throws Exceptions as iterate longer 
session lists 
+  at production servers.
+  http://svn.apache.org/viewvc?rev=612988view=rev
+  +1: pero
+  -1:



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



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

2008-01-17 Thread David Jencks
I don't think this is relevant to the 6.0.x branch, it depends on the  
new DefaultInstanceManager class which AFAIK is only in trunk.


thanks
david jencks

On Jan 17, 2008, at 1:47 PM, [EMAIL PROTECTED] wrote:


Author: pero
Date: Thu Jan 17 13:47:24 2008
New Revision: 612992

URL: http://svn.apache.org/viewvc?rev=612992view=rev
Log:
Fix Restricted listeners property file not found message fix

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=612992r1=612991r2=612992view=diff
== 


--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 13:47:24 2008
@@ -52,3 +52,10 @@
   http://svn.apache.org/viewvc?rev=612988view=rev
   +1: pero
   -1:
+
+* Fix Restricted listeners property file not found message fix
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=44261
+  http://svn.apache.org/viewvc?rev=612991view=rev
+  +1: pero
+  -1:
+
\ No newline at end of file



-
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: r613004 - /tomcat/current/tc4.1.x/STATUS.txt

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 15:17:37 2008
New Revision: 613004

URL: http://svn.apache.org/viewvc?rev=613004view=rev
Log:
Add library update for tc4 and vote.

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=613004r1=613003r2=613004view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Thu Jan 17 15:17:37 2008
@@ -40,11 +40,18 @@
   TC 5.0/5.5/6.0 already can do this, and since commons-digester
   in TC 4.1 is recent enough, it's easy for TC 4.1 to.
   
http://people.apache.org/~rjung/patches/replace_system_properties_20071018a.patch
-  +1: rjung, yoavs
+  +1: rjung, yoavs, markt
   -1:
 
 * Update TC4 with the new Cookie handling code from TC6. Request/Response
   only.
   http://svn.apache.org/viewvc?view=revrevision=594968
   +1: markt, yoavs
+  -1:
+
+* Update to latest library versions (where possible). Tidy up build flags since
+  we require JDK 1.3+ to build. Update location of downloads for commons
+  libraries. Remove JNDI library since it is included in JDK 1.3+.
+  
http://http://people.apache.org/~markt/patches/2008-01-17-tc4-lib-updates.patch
+  +1: markt
   -1:



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



svn commit: r613006 - /tomcat/current/tc4.1.x/STATUS.txt

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 15:18:55 2008
New Revision: 613006

URL: http://svn.apache.org/viewvc?rev=613006view=rev
Log:
Fix silly url error

Modified:
tomcat/current/tc4.1.x/STATUS.txt

Modified: tomcat/current/tc4.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=613006r1=613005r2=613006view=diff
==
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Thu Jan 17 15:18:55 2008
@@ -52,6 +52,6 @@
 * Update to latest library versions (where possible). Tidy up build flags since
   we require JDK 1.3+ to build. Update location of downloads for commons
   libraries. Remove JNDI library since it is included in JDK 1.3+.
-  
http://http://people.apache.org/~markt/patches/2008-01-17-tc4-lib-updates.patch
+  http://people.apache.org/~markt/patches/2008-01-17-tc4-lib-updates.patch
   +1: markt
   -1:



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



svn commit: r613008 - /tomcat/current/tc5.5.x/STATUS.txt

2008-01-17 Thread markt
Author: markt
Date: Thu Jan 17 15:19:49 2008
New Revision: 613008

URL: http://svn.apache.org/viewvc?rev=613008view=rev
Log:
Propose pool update for 5.5

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613008r1=613007r2=613008view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jan 17 15:19:49 2008
@@ -65,3 +65,8 @@
   +1: pero, markt
   -1: 
 
+* Update commons-pool to 1.4
+  http://svn.apache.org/viewvc?rev=612950view=rev
+  (Note ppatch duplciates some of lib-updates patch)
+  +1: markt
+  -1:



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