svn commit: r955920 - in /tomcat/trunk/webapps/docs: changelog.xml jndi-resources-howto.xml

[markt]

Author: markt
Date: Fri Jun 18 10:18:09 2010
New Revision: 955920

URL: http://svn.apache.org/viewvc?rev=955920&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49436
Correct default for UserDatabase's readonly attribute

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=955920&r1=955919&r2=955920&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 18 10:18:09 2010
@@ -67,6 +67,10 @@
 application to operate currently when running with a security manager.
 (markt)
   
+  
+49436: Correct documented default for readonly attribute of
+the UserDatabase component. (markt)
+  
 
   
 

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=955920&r1=955919&r2=955920&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Fri Jun 18 10:18:09 2010
@@ -378,7 +378,7 @@ writer.println("foo = " + bean.getFoo() 
 relative, it is relative to $CATALINA_BASE.
 
 The readonly attribute is optional and defaults to
-false if not supplied. If the XML is writeable then it will be
+true if not supplied. If the XML is writeable then it will be
 written to when Tomcat starts. WARNING: When the file is
 written it will inherit the default file permissions for the user Tomcat
 is running as. Ensure that these are appropriate to maintain the security



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

svn commit: r955925 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml jndi-resources-howto.xml

[markt]

Author: markt
Date: Fri Jun 18 10:37:16 2010
New Revision: 955925

URL: http://svn.apache.org/viewvc?rev=955925&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49436
Correct default for UserDatabase's readonly attribute

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml

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=955925&r1=955924&r2=955925&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jun 18 10:37:16 2010
@@ -48,6 +48,14 @@
   
 
   
+  
+
+  
+49436: Correct documented default for readonly attribute of
+the UserDatabase component. (markt)
+  
+
+  
 
 
   

Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=955925&r1=955924&r2=955925&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Fri Jun 18 
10:37:16 2010
@@ -378,7 +378,7 @@ writer.println("foo = " + bean.getFoo() 
 relative, it is relative to $CATALINA_BASE.
 
 The readonly attribute is optional and defaults to
-false if not supplied. If the XML is writeable then it will be
+true if not supplied. If the XML is writeable then it will be
 written to when Tomcat starts. WARNING: When the file is
 written it will inherit the default file permissions for the user Tomcat
 is running as. Ensure that these are appropriate to maintain the security



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

DO NOT REPLY [Bug 49436] Documented default for UserDatabase readonly attribute wrong

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED
Summary|Cannot use JMX to save  |Documented default for
   |changes to tomcat-users.xml |UserDatabase readonly
   ||attribute wrong

--- Comment #3 from Mark Thomas  2010-06-18 06:43:28 EDT ---
Docs updated for 7.0.x and 6.0.x. Fix will be included in 7.0.1 and 6.0.28
onwards.

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

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

svn commit: r955937 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/config/filter.xml webapps/docs/config/valve

[markt]

Author: markt
Date: Fri Jun 18 11:19:38 2010
New Revision: 955937

URL: http://svn.apache.org/viewvc?rev=955937&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
Use remoteIp... rather then remoteIP... consistently

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=955937&r1=955936&r2=955937&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Jun 
18 11:19:38 2010
@@ -64,7 +64,7 @@ import org.apache.juli.logging.LogFactor
  * If the incoming request.getRemoteAddr() matches the servlet 
filter's list of internal proxies :
  * 
  * Loop on the comma delimited list of IPs and hostnames passed by the 
preceding load balancer or proxy in the given request's Http
- * header named $remoteIPHeader (default value 
x-forwarded-for). Values are processed in right-to-left order.
+ * header named $remoteIpHeader (default value 
x-forwarded-for). Values are processed in right-to-left order.
  * For each ip/host of the list:
  * 
  * if it matches the internal proxies list, the ip/host is swallowed
@@ -89,7 +89,7 @@ import org.apache.juli.logging.LogFactor
  * Default Value
  * 
  * 
- * remoteIPHeader
+ * remoteIpHeader
  * Name of the Http Header read by this servlet filter that holds the list 
of traversed IP addresses starting from the requesting client
  * 
  * RemoteIPHeader
@@ -110,7 +110,7 @@ import org.apache.juli.logging.LogFactor
  * 
  * proxiesHeader
  * Name of the http header created by this servlet filter to hold the list 
of proxies that have been processed in the incoming
- * remoteIPHeader
+ * remoteIpHeader
  * RemoteIPProxiesHeader
  * Compliant http header name
  * x-forwarded-by
@@ -176,10 +176,10 @@ import org.apache.juli.logging.LogFactor
  *   
internalProxies192\.168\.0\.10,
 192\.168\.0\.11
  *
  *
- *   
remoteIPHeaderx-forwarded-for
+ *   
remoteIpHeaderx-forwarded-for
  *
  *
- *   
remoteIPProxiesHeaderx-forwarded-by
+ *   
remoteIpProxiesHeaderx-forwarded-by
  *
  *
  *   
protocolHeaderx-forwarded-proto
@@ -253,10 +253,10 @@ import org.apache.juli.logging.LogFactor
  *   
internalProxies192\.168\.0\.10,
 192\.168\.0\.11
  *
  *
- *   
remoteIPHeaderx-forwarded-for
+ *   
remoteIpHeaderx-forwarded-for
  *
  *
- *   
remoteIPProxiesHeaderx-forwarded-by
+ *   
remoteIpProxiesHeaderx-forwarded-by
  *
  *
  *   
trustedProxiesproxy1, 
proxy2
@@ -310,10 +310,10 @@ import org.apache.juli.logging.LogFactor
  *   
internalProxies192\.168\.0\.10,
 192\.168\.0\.11
  *
  *
- *   
remoteIPHeaderx-forwarded-for
+ *   
remoteIpHeaderx-forwarded-for
  *
  *
- *   
remoteIPProxiesHeaderx-forwarded-by
+ *   
remoteIpProxiesHeaderx-forwarded-by
  *
  *
  *   
trustedProxiesproxy1, 
proxy2
@@ -368,10 +368,10 @@ import org.apache.juli.logging.LogFactor
  *   
internalProxies192\.168\.0\.10,
 192\.168\.0\.11
  *
  *
- *   
remoteIPHeaderx-forwarded-for
+ *   
remoteIpHeaderx-forwarded-for
  *
  *
- *   

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

[markt]

Author: markt
Date: Fri Jun 18 11:31:53 2010
New Revision: 955945

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

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=955945&r1=955944&r2=955945&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 18 11:31:53 2010
@@ -150,4 +150,9 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?view=revision&revision=955190
   +1: kfujino
   -1: 
- 
\ No newline at end of file
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
+  Use remoteIpHeader rather then remoteIPHeader consistently
+  http://people.apache.org/~markt/patches/2010-06-18-bug49443-tc6.patch
+  +1: markt
+  -1: 



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

DO NOT REPLY [Bug 49443] RemoteIpValve : remoteIpHeader vs remoteIPHeader

[bugzilla]

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

--- Comment #1 from Mark Thomas  2010-06-18 07:33:22 EDT ---
Thanks for the report. I've cleaned the code and the docs up for 7.0.x and that
will be in 7.0.1 onwards. I have also proposed a patch to clean up 6.0.x.

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

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

DO NOT REPLY [Bug 49464] New: DefaultServlet and CharacterEncoding

[bugzilla]

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

   Summary: DefaultServlet and CharacterEncoding
   Product: Tomcat 6
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: felix.schumac...@internetallee.de


DefaultServlet doesn't set a character encoding. As per spec the encoding of
the page is asssumed to be iso-8859-1. 

If files are served with a different encoding, this can lead to display
problems in the browser.

The problem has been discussed in
http://old.nabble.com/DefaultServlet-doesn%27t-set-charset-td18893115.html#a18929527
In http://marc.info/?l=tomcat-user&m=127678462332564&w=2 another component was
added - namely mod_jk/httpd - which set a character encoding on its own, if no
character set was set previously.

There are at least three different solutions for this problem. 

One of them is extending DefaultServlet to be configurable to include a charset
in the response. A patch has been proposed by Markus Schönhaber (MKS) and can
be found at
  http://www.ddt-consult.de/sendCharset.patch

The two other solutions which were discussed are
 * configure httpd/mod_jk properly by adding AddDefaultCharset ENCODING to the
right location/host
 * Use a filter to set the character encoding

All in all I still think it would be a good idea to explicitly set the wanted
encoding in the first possible place, which is the DefaultServlet.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

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

[kkolinko]

Author: kkolinko
Date: Fri Jun 18 12:38:53 2010
New Revision: 955982

URL: http://svn.apache.org/viewvc?rev=955982&view=rev
Log:
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=955982&r1=955981&r2=955982&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jun 18 12:38:53 2010
@@ -154,5 +154,5 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
   Use remoteIpHeader rather then remoteIPHeader consistently
   http://people.apache.org/~markt/patches/2010-06-18-bug49443-tc6.patch
-  +1: markt
+  +1: markt, kkolinko
   -1: 



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

svn commit: r956082 - /tomcat/sandbox/tomcat-oacc/trunk/test/build.xml

[rjung]

Author: rjung
Date: Fri Jun 18 18:30:17 2010
New Revision: 956082

URL: http://svn.apache.org/viewvc?rev=956082&view=rev
Log:
Let's stick to ISO-8859-1 encoded sources as Tomcat
main line does. Actual files are ASCII at the moment.

Modified:
tomcat/sandbox/tomcat-oacc/trunk/test/build.xml

Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=956082&r1=956081&r2=956082&view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Fri Jun 18 18:30:17 2010
@@ -27,7 +27,6 @@



-   



@@ -68,7 +67,7 @@

 

-   
+   






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

How can I fetch the web application (context) at runtime?

[dB .]

I am trying to write a log4j appender that can put the application name in the 
log filename (I want a log per web application, without knowing the names of 
all the web applications upfront).

Is there a way to access the context / container / some variable that can give 
me the name of the web application (or something else unique per web 
application) at runtime from a far-reaching piece of code? I'd be happy with a 
solution that works only with a specific version of Tomcat (6).

Thx
dB.

dB. @ dblock.org
Moscow|Geneva|Seattle|New York

Re: How can I fetch the web application (context) at runtime?

[Mark Thomas]

On 18/06/2010 19:45, dB. wrote:
> I am trying to write a log4j appender that can put the application name in 
> the log filename (I want a log per web application, without knowing the names 
> of all the web applications upfront).
> 
> Is there a way to access the context / container / some variable that can 
> give me the name of the web application (or something else unique per web 
> application) at runtime from a far-reaching piece of code? I'd be happy with 
> a solution that works only with a specific version of Tomcat (6).

That would be a question for the users list.

Mark



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

svn commit: r956143 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: MembershipListener.java io/ListenCallback.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:02:40 2010
New Revision: 956143

URL: http://svn.apache.org/viewvc?rev=956143&view=rev
Log:
Fix missing last lines removed in r956142
due to sed script that didn't handle incomplete
lines correctly.

Modified:

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java?rev=956143&r1=956142&r2=956143&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/MembershipListener.java
 Fri Jun 18 23:02:40 2010
@@ -30,4 +30,4 @@ package org.apache.catalina.cluster;
 public interface MembershipListener {
 public void memberAdded(Member member);
 public void memberDisappeared(Member member);
-
+}

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java?rev=956143&r1=956142&r2=956143&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/io/ListenCallback.java
 Fri Jun 18 23:02:40 2010
@@ -44,4 +44,4 @@ public interface ListenCallback
   *
   */
  public void sendAck() throws java.io.IOException ;
-
+}



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

svn commit: r956144 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:04:46 2010
New Revision: 956144

URL: http://svn.apache.org/viewvc?rev=956144&view=rev
Log:
Fix javadoc.

Modified:

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=956144&r1=956143&r2=956144&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
 Fri Jun 18 23:04:46 2010
@@ -115,9 +115,6 @@ public class DeltaSession extends Standa
 
 /**
  * Construct a new Session associated with the specified Manager.
- * 
- * @param manager
- *The manager with which this Session is associated
  */
 public DeltaSession() {
 this(null);



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

svn commit: r956145 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:10:54 2010
New Revision: 956145

URL: http://svn.apache.org/viewvc?rev=956145&view=rev
Log:
Fix Javadoc.

CTR

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=956145&r1=956144&r2=956145&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
Fri Jun 18 23:10:54 2010
@@ -98,10 +98,7 @@ public class DeltaSession extends Standa
 // --- Constructors
 
 /**
- * Construct a new Session associated with the specified Manager.
- *
- * @param manager
- *The manager with which this Session is associated
+ * Construct a new Session.
  */
 public DeltaSession() {
 this(null);



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

svn commit: r956146 - /tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:12:58 2010
New Revision: 956146

URL: http://svn.apache.org/viewvc?rev=956146&view=rev
Log:
Fix Javadoc.

CTR

Modified:

tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java

Modified: 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java?rev=956146&r1=956145&r2=956146&view=diff
==
--- 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaSession.java
 Fri Jun 18 23:12:58 2010
@@ -95,10 +95,7 @@ public class DeltaSession extends Standa
 // --- Constructors
 
 /**
- * Construct a new Session associated with the specified Manager.
- *
- * @param manager
- *The manager with which this Session is associated
+ * Construct a new Session.
  */
 public DeltaSession() {
 this(null);



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

svn commit: r956147 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:14:46 2010
New Revision: 956147

URL: http://svn.apache.org/viewvc?rev=956147&view=rev
Log:
Javadoc fix. Addition to r956144.

Modified:

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=956147&r1=956146&r2=956147&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
 Fri Jun 18 23:14:46 2010
@@ -114,7 +114,7 @@ public class DeltaSession extends Standa
 // --- Constructors
 
 /**
- * Construct a new Session associated with the specified Manager.
+ * Construct a new Session.
  */
 public DeltaSession() {
 this(null);



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

svn commit: r956148 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:18:18 2010
New Revision: 956148

URL: http://svn.apache.org/viewvc?rev=956148&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.

Backport of r936777 (trunk), r942701 (TC6) and
r942703 (TC 5.5).

Modified:

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=956148&r1=956147&r2=956148&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 Fri Jun 18 23:18:18 2010
@@ -1601,10 +1601,9 @@ public class DeltaManager extends Cluste
 sendSessions(sender, currentSessions, findSessionTimestamp);
 } else {
 // send session at blocks
-int len = currentSessions.length < getSendAllSessionsSize() ? 
currentSessions.length : getSendAllSessionsSize();
-Session[] sendSessions = new Session[len];
 for (int i = 0; i < currentSessions.length; i += 
getSendAllSessionsSize()) {
-len = i + getSendAllSessionsSize() > currentSessions.length ? 
currentSessions.length - i : getSendAllSessionsSize();
+int len = i + getSendAllSessionsSize() > 
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+Session[] sendSessions = new Session[len];
 System.arraycopy(currentSessions, i, sendSessions, 0, len);
 sendSessions(sender, sendSessions,findSessionTimestamp);
 if (getSendAllSessionsWaitTime() > 0) {



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

svn commit: r956153 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java

[rjung]

Author: rjung
Date: Fri Jun 18 23:24:33 2010
New Revision: 956153

URL: http://svn.apache.org/viewvc?rev=956153&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717

When a node joins a cluster and it receives all the
current sessions, ensure the sessionCreated event is
fired if the Manager is configured to replicate session
events.

Backport of r928482 (trunk), r941511 (TC 6) and
r945773 (TC 5.5).

Modified:

tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java

Modified: 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=956153&r1=956152&r2=956153&view=diff
==
--- 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 (original)
+++ 
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 Fri Jun 18 23:24:33 2010
@@ -719,6 +719,9 @@ public class DeltaManager extends Cluste
 if (log.isWarnEnabled()) 
log.warn(sm.getString("deltaManager.loading.existing.session",session.getIdInternal()));
 }
 add(session);
+if (notifySessionListenersOnReplication) {
+session.tellNew();
+}
 }
 } catch (ClassNotFoundException e) {
 log.error(sm.getString("deltaManager.loading.cnfe", e), e);



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

DO NOT REPLY [Bug 49466] New: When boot tomcat in eclipse , the console standard out is red color

[bugzilla]

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

   Summary: When boot tomcat in eclipse , the console standard out
is red color
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: qq413881...@hotmail.com


Created an attachment (id=25615)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25615)
like this

this case occur in apache-tomcat-6.0.24 and apache-tomcat-6.0.26;whether i use
jdkjdk1.6.0_20 or jdk1.6.0_13、jdk1.6.0_18

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49466] When boot tomcat in eclipse , the console standard out is red color

[bugzilla]

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

--- Comment #1 from daizhongde  2010-06-18 21:03:15 
EDT ---
Created an attachment (id=25616)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25616)
eclipse windows->preferences->run/debug->console 

eclipse windows->preferences->run/debug->console set standard color is black,
error text color is red

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

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

DO NOT REPLY [Bug 49466] When boot tomcat in eclipse , the console standard out is red color

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Konstantin Kolinko  2010-06-18 
23:23:13 EDT ---
There is no error there. See how Tomcat logging is configured. The cause behind
it is that the java.util.logging.ConsoleHandler class of JDK prints its
messages to System.err, as documented

http://java.sun.com/javase/6/docs/api/java/util/logging/ConsoleHandler.html

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

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