DO NOT REPLY [Bug 39987] New: - getServletContext().getContext("/context/subcontext") does not give matching "subcontext"

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

   Summary: getServletContext().getContext("/context/subcontext")
does not give matching "subcontext"
   Product: Tomcat 5
   Version: 5.5.17
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


If there are 2 contexts declared with the path of the 2nd context is a subpath
of the 1nd context then getContext(subpath) within the 1st context does not give
the 2nd context.
For example:
c:/TOMCATHOME/conf/Catalina/localhost/context$sub.xml:



c:/TOMCATHOME/conf/Catalina/localhost/context.xml:



c:/TOMCATHOME/webapp2/context/test.jsp:

<% 

ServletContext self = getServletContext();
ServletContext sub_ctx = self.getContext("/context/sub");

if (self!=sub_ctx)
{ %>
ok: <%=  sub_ctx!=null?sub_ctx.getRealPath("/"):"null" %>

<% } else { %>
NOT ok: Should not be same context: <%= sub_ctx.getRealPath("/") %>

<% } %>



Directory c:/TOMCATHOME/webapp2/contextsub  exists...

Calling http://localhost:8080/context/test.jsp shows:
NOT ok: Should not be same context: c:\TOMCATHOME\webapps\..\webapp2\context\

It should show:
ok: c:\TOMCATHOME\webapps\..\webapp2\contextsub\

-- 
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 39987] - getServletContext().getContext("/context/subcontext") does not give matching "subcontext"

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





--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 08:10 ---
Created an attachment (id=18566)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18566&action=view)
testcase

Files for testing   
add to vanilla 5.5.17

bug is also present in 5.0.30

-- 
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 26978] - Add support for 'salt' to all Realms

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





--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 10:06 ---
Not salting passwords is clearly broken, interesting or not, as it opens up at
least one very juicy attack possibility - see
http://en.wikipedia.org/wiki/Rainbow_table. Quoting that page:

A rainbow table "contains statistically high chance of revealing a password
within a short period of time, generally less than a minute."

and: "A rainbow table is ineffective against one-way hashes that include salts."

-- 
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 39988] New: - mod_jk request logging issue

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

   Summary: mod_jk request logging  issue
   Product: Tomcat 5
   Version: Unknown
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Recently I've decided to configure mod_jk (v 1.2.15) requests logging to the 
file:

JkRequestLogFormat " (%V:%p/%w) [%r %s] %B %T"

Unfortunately I found out it adds an empty line following each request in the
log file, which  was quite annoying.

Someone has reported a simmilar problem here:
http://mail-archives.apache.org/mod_mbox/tomcat-users/200506.mbox/[EMAIL 
PROTECTED]

I've attached the patch for 1.2.15, which fixes the problem.

I didn't try to investigate too much - but it looks like apr_file_write does add
an empty line to each entry put to the file. 
Despite of that mod_jk adds end of line to the log format structure, during the
JkRequestLogFormat processing.
The fix is to remove this functionality from mod_jk.

-- 
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 39988] - mod_jk request logging issue

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





--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 11:56 ---
Created an attachment (id=18567)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18567&action=view)
Empty line mod_jk patch


-- 
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 39988] - mod_jk request logging issue

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 13:06 ---
This has already been fixed in subversion head and in the release candidate 
for 1.2.16. The new release will appear very soon.

-- 
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 39990] New: - Cewolf graphic makes connector behave strange

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

   Summary: Cewolf graphic makes connector behave strange
   Product: Tomcat 5
   Version: 5.5.15
  Platform: Other
OS/Version: Windows XP
Status: NEW
  Severity: minor
  Priority: P3
 Component: Native:JK
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Hi,

we are using CEWOLF to create charts. Works great if we talk to Tomcat directly.
But If we call Tomcat through Apache (2.0.55 with mod_jk 1.2.15 on Windows XP)
the Connector seems to pass wrong data to Apache, the image is broken and
afterwards the connector keeps sending trash (the Servlet looks like a real mess
until I restart tomcat).

I was not abled to find any information about it, and if you want more
information I'll do my best to provide it.

Regards,
S.Czymaj

-- 
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 39990] - Cewolf graphic makes connector behave strange

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





--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 13:36 ---
Created an attachment (id=18569)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18569&action=view)
Image returned when accessing Tomcat directly

Image returned when accessing Tomcat directly (via HTTP-connector)

-- 
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 39990] - Cewolf graphic makes connector behave strange

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





--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 13:37 ---
Created an attachment (id=18570)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18570&action=view)
Image returned when accessing via connector

Image returned when accessing via connector (I got the image using the wget
tool).

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

Built-in tools for implementing Container Managed Authentication

[Ferindo Middleton]

Are there plans to include built-in tools to better implement container
managed security? I'm a application developer that uses
*DataSourceRealm * realm
authentication of Tomcat to have form-based authentication for the
applications I build But my users have poor passwords and many of them
have been using the same password for over a year and there is no built-in
Tomcat subsystem to allow me to do such things as:

1) force users to change their passwords every now and then,
2) enforce some kind of complexity-requirement for the passwords users have
so people are using "strong" passwords that are hard to guess.

Are there plans to include built in tools like the above around the existing
Container Managed Authentication features of tomcat to allow for such things

as the above to be administered within the server with minimal user coding.
I'm just a user and don't know much about Tomcat internals. This would be a
really good improvement/feature for future releases.

Ferindo
--
Ferindo Middleton
Technical Lead - Research and AUI Infrastructure Development
Sleekcollar Software

svn commit: r419896 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport: AbstractSender.java nio/NioReceiver.java nio/NioReplicationThread.java nio/PooledPar

[fhanik]

Author: fhanik
Date: Fri Jul  7 07:28:08 2006
New Revision: 419896

URL: http://svn.apache.org/viewvc?rev=419896&view=rev
Log:
Minor adjustments

Modified:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java?rev=419896&r1=419895&r2=419896&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/AbstractSender.java
 Fri Jul  7 07:28:08 2006
@@ -113,11 +113,10 @@
  */
 public boolean keepalive() {
 boolean disconnect = false;
-   if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) disconnect = 
true;
-   else if ( keepAliveTime >= 0 && keepAliveTime> 
(System.currentTimeMillis()-connectTime) ) disconnect = true;
-   if ( disconnect ) disconnect();
-   return disconnect;
-
+if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) disconnect = 
true;
+else if ( keepAliveTime >= 0 && keepAliveTime> 
(System.currentTimeMillis()-connectTime) ) disconnect = true;
+if ( disconnect ) disconnect();
+return disconnect;
 }
 
 protected void setConnected(boolean connected){

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=419896&r1=419895&r2=419896&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java
 Fri Jul  7 07:28:08 2006
@@ -160,14 +160,16 @@
 }
 
 public static void cancelledKey(SelectionKey key) {
-try {
-key.cancel();
-key.channel().close();
-key.attach(null);
-} catch (IOException e) {
-if (log.isDebugEnabled()) log.debug("", e);
-// Ignore
+ObjectReader reader = (ObjectReader)key.attachment();
+if ( reader != null ) {
+reader.setCancelled(true);
+reader.finish();
 }
+key.cancel(); 
+key.attach(null);
+try { ((SocketChannel)key.channel()).socket().close(); } catch 
(IOException e) { if (log.isDebugEnabled()) log.debug("", e); }
+try { key.channel().close(); } catch (IOException e) { if 
(log.isDebugEnabled()) log.debug("", e); }
+
 }
 
 protected void socketTimeouts() {
@@ -193,6 +195,9 @@
 long delta = now - ka.getLastAccess();
 if (delta > (long) getTimeout() && (!ka.isAccessed())) 
{
 log.warn("Channel key is registered, but has had 
no interest ops for the last "+getTimeout()+" ms. 
(cancelled:"+ka.isCancelled()+")");
+//
System.out.println("Interest:"+key.interestOps());
+//System.out.println("Ready Ops:"+key.readyOps());
+//System.out.println("Valid:"+key.isValid());
 ka.setLastAccess(now);
 //key.interestOps(SelectionKey.OP_READ);
 }//end if

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java?rev=419896&r1=419895&r2=419896&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java
 Fri Jul  7 07:28:08 2006
@@ -77,11 +77,13 @@
 if (key == null) {
 co

svn commit: r419897 - in /tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test: channel/TestRemoteProcessException.java io/TestSenderConnections.java membership/TestTcpF

[fhanik]

Author: fhanik
Date: Fri Jul  7 07:28:49 2006
New Revision: 419897

URL: http://svn.apache.org/viewvc?rev=419897&view=rev
Log:
Modified test cases, and added a test case for connection testing

Added:

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/io/TestSenderConnections.java
Modified:

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/transport/SocketNioSend.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=419897&r1=419896&r2=419897&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 Fri Jul  7 07:28:49 2006
@@ -74,6 +74,7 @@
 System.err.println("FAILURES:" + errCnt);
 System.err.println("TOTAL:" + errCnt+noErrCnt);
 }
+throw new IllegalArgumentException();
 } else {
 noErrCnt++;
 if ( (noErrCnt % 100) == 0) {

Added: 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/io/TestSenderConnections.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/io/TestSenderConnections.java?rev=419897&view=auto
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/io/TestSenderConnections.java
 (added)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/io/TestSenderConnections.java
 Fri Jul  7 07:28:49 2006
@@ -0,0 +1,112 @@
+package org.apache.catalina.tribes.test.io;
+
+import java.util.ArrayList;
+
+import org.apache.catalina.tribes.Channel;
+import org.apache.catalina.tribes.ManagedChannel;
+import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.MembershipListener;
+import org.apache.catalina.tribes.group.GroupChannel;
+import junit.framework.TestCase;
+import org.apache.catalina.tribes.ChannelListener;
+import java.io.Serializable;
+import java.util.Random;
+import java.util.HashMap;
+import org.apache.catalina.tribes.transport.ReplicationTransmitter;
+
+public class TestSenderConnections extends TestCase {
+private static int count = 2;
+private ManagedChannel[] channels = new ManagedChannel[count];
+private TestMsgListener[] listeners = new TestMsgListener[count];
+
+protected void setUp() throws Exception {
+super.setUp();
+for (int i = 0; i < channels.length; i++) {
+channels[i] = new GroupChannel();
+channels[i].getMembershipService().setPayload( ("Channel-" + (i + 
1)).getBytes("ASCII"));
+listeners[i] = new TestMsgListener( ("Listener-" + (i + 1)));
+channels[i].addChannelListener(listeners[i]);
+channels[i].start(Channel.SND_RX_SEQ|Channel.SND_TX_SEQ);
+
+}
+}
+
+public void clear() {
+}
+
+public void sendMessages(long delay, long sleep) throws Exception {
+Member local = channels[0].getLocalMember(true);
+Member dest = channels[1].getLocalMember(true);
+int n = 3;
+System.out.println("Sending " + n + " messages from [" + 
local.getName() + "] to [" + dest.getName() + "]");
+for (int i = 0; i < n; i++) {
+channels[0].send(new Member[] {dest}, new TestMsg(), 0);
+if ( delay > 0 ) Thread.sleep(delay);
+}
+System.out.println("Messages sent. Sleeping for "+(sleep/1000)+" 
seconds to inspect connections");
+if ( sleep > 0 ) Thread.sleep(sleep);
+
+}
+
+public void testConnectionLinger() throws Exception {
+sendMessages(0,15000);
+}
+
+public void testKeepAliveCount() throws Exception {
+System.out.println("Setting keep alive count to 0");
+for (int i = 0; i < channels.length; i++) {
+ReplicationTransmitter t = 
(ReplicationTransmitter)channels[0].getChannelSender();
+t.getTransport().setKeepAliveCount(0);
+}
+sendMessages(1000,15000);
+}
+
+public void testKeepAliveTime() throws Exception {
+System.out.println("Setti

svn commit: r419910 - in /tomcat/container/tc5.5.x/modules/groupcom: ./ src/share/org/apache/catalina/tribes/membership/ test/java/org/apache/catalina/tribes/test/transport/

[fhanik]

Author: fhanik
Date: Fri Jul  7 08:38:14 2006
New Revision: 419910

URL: http://svn.apache.org/viewvc?rev=419910&view=rev
Log:
Larger package for multicast
Throw an error if package is too large

Modified:
tomcat/container/tc5.5.x/modules/groupcom/VERSION

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=419910&r1=419909&r2=419910&view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Fri Jul  7 08:38:14 2006
@@ -1,3 +1,6 @@
+0.9.4.9

+  - max multicast packet is no roughly 64k instead of 8k

+  - tribes throws an illegal argument exception if the payload added is too 
large  

 0.9.4.8

   - fix bug in the NIO sender, it should use flip instead of rewind

 0.9.4.7


Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=419910&r1=419909&r2=419910&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
 Fri Jul  7 08:38:14 2006
@@ -44,6 +44,8 @@
 {
 private static org.apache.commons.logging.Log log =
 org.apache.commons.logging.LogFactory.getLog( McastService.class );
+
+protected static int MAX_PACKET_SIZE = 65535;
 /**
  * Internal flag used for the listen thread that listens to the 
multicasting socket.
  */
@@ -149,10 +151,10 @@
 this.service = service;
 this.sendFrequency = sendFrequency;
 setupSocket();
-sendPacket = new DatagramPacket(new byte[8192],8192);
+sendPacket = new DatagramPacket(new 
byte[MAX_PACKET_SIZE],MAX_PACKET_SIZE);
 sendPacket.setAddress(address);
 sendPacket.setPort(port);
-receivePacket = new DatagramPacket(new byte[8192],8192);
+receivePacket = new DatagramPacket(new 
byte[MAX_PACKET_SIZE],MAX_PACKET_SIZE);
 receivePacket.setAddress(address);
 receivePacket.setPort(port);
 membership = new Membership(member);
@@ -272,11 +274,13 @@
 public void receive() throws IOException {
 try {
 socket.receive(receivePacket);
-byte[] data = new byte[receivePacket.getLength()];
-System.arraycopy(receivePacket.getData(), 
receivePacket.getOffset(), data, 0, data.length);
-final MemberImpl m = MemberImpl.getMember(data);
-if (log.isDebugEnabled())
-log.debug("Mcast receive ping from member " + m);
+if(receivePacket.getLength() > MAX_PACKET_SIZE) {
+log.error("Multicast packet received was too long, dropping 
package:"+receivePacket.getLength());
+} else {
+byte[] data = new byte[receivePacket.getLength()];
+System.arraycopy(receivePacket.getData(), 
receivePacket.getOffset(), data, 0, data.length);
+final MemberImpl m = MemberImpl.getMember(data);
+if (log.isTraceEnabled()) log.trace("Mcast receive ping from 
member " + m);
 Thread t = null;
 if (Arrays.equals(m.getCommand(), Member.SHUTDOWN_PAYLOAD)) {
 if (log.isDebugEnabled()) log.debug("Member has shutdown:" 
+ m);
@@ -294,7 +298,8 @@
 }
 };
 } //end if
-if ( t != null ) t.start();
+if ( t != null ) t.start();
+}
 } catch (SocketTimeoutException x ) { 
 //do nothing, this is normal, we don't want to block forever
 //since the receive thread is the same thread

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java?rev=419910&r1=419909&r2=419910&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java
 (original)
+++ 
tomca

svn commit: r419938 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: group/ io/ tipis/ transport/nio/

[fhanik]

Author: fhanik
Date: Fri Jul  7 10:53:35 2006
New Revision: 419938

URL: http://svn.apache.org/viewvc?rev=419938&view=rev
Log:
Added trace and fixed remote processing exceptions

Modified:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java?rev=419938&r1=419937&r2=419938&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 Fri Jul  7 10:53:35 2006
@@ -39,6 +39,8 @@
 import org.apache.catalina.tribes.UniqueId;
 import org.apache.catalina.tribes.Heartbeat;
 import org.apache.catalina.tribes.io.BufferPool;
+import java.io.IOException;
+import org.apache.catalina.tribes.RemoteProcessException;
 
 /**
  * The default implementation of a Channel.
@@ -231,7 +233,9 @@
 public void messageReceived(ChannelMessage msg) {
 if ( msg == null ) return;
 try {
-
+if ( log.isTraceEnabled() ) {
+log.trace("GroupChannel received msg id:"+new 
UniqueId(msg.getUniqueId()));
+}
 Serializable fwd = null;
 if ( (msg.getOptions() & SEND_OPTIONS_BYTE_MESSAGE) == 
SEND_OPTIONS_BYTE_MESSAGE ) {
 fwd = new ByteMessage(msg.getMessage().getBytes());
@@ -255,8 +259,13 @@
 //but none was given, send back an immediate one
 sendNoRpcChannelReply((RpcMessage)fwd,source);
 }
+if ( log.isTraceEnabled() ) {
+log.trace("GroupChannel delivered["+rx+"] id:"+new 
UniqueId(msg.getUniqueId()));
+}
+
 } catch ( Exception x ) {
-log.error("Unable to deserialize channel message.",x);
+if ( log.isDebugEnabled() ) log.error("Unable to process 
channel:IOException.",x);
+throw new RemoteProcessException("IOException:"+x.getMessage(),x);
 }
 }
 

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java?rev=419938&r1=419937&r2=419938&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/io/ObjectReader.java
 Fri Jul  7 10:53:35 2006
@@ -69,10 +69,12 @@
 
 public synchronized void access() {
 this.accessed = true;
+this.lastAccess = System.currentTimeMillis();
 }
 
 public synchronized void finish() {
 this.accessed = false;
+this.lastAccess = System.currentTimeMillis();
 }
 
 public boolean isAccessed() {

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=419938&r1=419937&r2=419938&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Fri Jul  7 10:53:35 2006
@@ -255,14 +255,21 @@
  * be replicated
  */
 public void replicate(Object key, boolean complete) {
+if ( log.isTraceEnabled() )
+log.trace("Replicate invoked on key:"+key);
 MapEntry entry = (MapEntry)super.get(key);
 if ( !entry.isSerializable() ) return;
 if (entry != null && entry.isPrimary() && entry.getBackupNodes()!= 
null && entry.getBackupNodes().length > 0) {
 Object value = entry.getValue(

svn commit: r419939 - /tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

[fhanik]

Author: fhanik
Date: Fri Jul  7 10:53:51 2006
New Revision: 419939

URL: http://svn.apache.org/viewvc?rev=419939&view=rev
Log:
Updated test case to properly work

Modified:

tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=419939&r1=419938&r2=419939&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/test/java/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
 Fri Jul  7 10:53:51 2006
@@ -7,6 +7,7 @@
 import org.apache.catalina.tribes.ChannelListener;
 import org.apache.catalina.tribes.Member;
 import org.apache.catalina.tribes.group.GroupChannel;
+import java.io.PrintStream;
 
 /**
  * Title:  
@@ -53,6 +54,8 @@
 assertEquals("Checking failure messages.",errC,listener1.errCnt);
 assertEquals("Checking success messages.",nerrC,listener1.noErrCnt);
 assertEquals("Checking all 
messages.",msgCount,listener1.noErrCnt+listener1.errCnt);
+System.out.println("Listener 1 stats:");
+listener1.printStats(System.out);
 }
 
 public static class Listener implements ChannelListener {
@@ -70,21 +73,23 @@
 if (d.error) {
 errCnt++;
 if ( (errCnt % 100) == 0) {
-System.err.println("NORMAL:" + noErrCnt);
-System.err.println("FAILURES:" + errCnt);
-System.err.println("TOTAL:" + errCnt+noErrCnt);
+printStats(System.err);
 }
 throw new IllegalArgumentException();
 } else {
 noErrCnt++;
 if ( (noErrCnt % 100) == 0) {
-System.err.println("NORMAL:" + noErrCnt);
-System.err.println("FAILURES:" + errCnt);
-System.err.println("TOTAL:" + errCnt+noErrCnt);
+printStats(System.err);
 }
 }
 }
 }
+
+public void printStats(PrintStream stream) {
+stream.println("NORMAL:" + noErrCnt);
+stream.println("FAILURES:" + errCnt);
+stream.println("TOTAL:" + (errCnt+noErrCnt));
+}
 }
 
 public static class Data implements Serializable {
@@ -102,6 +107,7 @@
 d.key = (byte)i;
 d.data = new byte[length];
 Arrays.fill(d.data,d.key);
+d.error = error;
 return d;
 }
 



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

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

[fhanik]

Author: fhanik
Date: Fri Jul  7 11:51:07 2006
New Revision: 419954

URL: http://svn.apache.org/viewvc?rev=419954&view=rev
Log:
added debug statement

Modified:

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

Modified: 
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/BackupManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/BackupManager.java?rev=419954&r1=419953&r2=419954&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/BackupManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/ha/src/share/org/apache/catalina/ha/session/BackupManager.java
 Fri Jul  7 11:51:07 2006
@@ -198,8 +198,9 @@
 
 public String getMapName() {
 CatalinaCluster catclust = (CatalinaCluster)cluster;
-Member local = catclust.getLocalMember();
-return catclust.getManagerName(getName(),this)+"-"+"";
+String name = catclust.getManagerName(getName(),this)+"-"+"";
+if ( log.isDebugEnabled() ) log.debug("Backup manager, Setting map 
name to:"+name);
+return name;
 }
 
 /**



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

svn commit: r419953 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

[fhanik]

Author: fhanik
Date: Fri Jul  7 11:50:41 2006
New Revision: 419953

URL: http://svn.apache.org/viewvc?rev=419953&view=rev
Log:
Added trace statements

Modified:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=419953&r1=419952&r2=419953&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Fri Jul  7 11:50:41 2006
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -45,6 +44,7 @@
 import org.apache.catalina.tribes.membership.MemberImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.catalina.tribes.util.Arrays;
 
 /**
  * Title: 
@@ -138,6 +138,7 @@
 log.warn("Unable to encode mapContextName[" + mapContextName + "] 
using getBytes(" + chset +") using default getBytes()", x);
 this.mapContextName = mapContextName.getBytes();
 }
+if ( log.isTraceEnabled() ) log.trace("Created Lazy Map with 
name:"+mapContextName+", bytes:"+Arrays.toString(this.mapContextName));
 
 //create an rpc channel and add the map as a listener
 this.rpcChannel = new RpcChannel(this.mapContextName, channel, this);
@@ -517,10 +518,13 @@
 }
 
 public boolean accept(Serializable msg, Member sender) {
+if ( log.isTraceEnabled() ) log.trace("Map accepting"+msg);
+boolean result = false;
 if (msg instanceof MapMessage) {
-return Arrays.equals(mapContextName, ( (MapMessage) 
msg).getMapId());
+result = Arrays.equals(mapContextName, ( (MapMessage) 
msg).getMapId());
 }
-return false;
+if ( log.isTraceEnabled() ) log.trace("Msg 
accepted["+result+"]"+msg);
+return result;
 }
 
 public void mapMemberAdded(Member member) {



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

Re: mod_jk 1.2.16 release candidate: ready to test

[Jim Jagielski]

+1


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

svn commit: r419974 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes: group/ChannelCoordinator.java group/GroupChannel.java transport/nio/NioReplicationThread.java

[fhanik]

Author: fhanik
Date: Fri Jul  7 13:36:05 2006
New Revision: 419974

URL: http://svn.apache.org/viewvc?rev=419974&view=rev
Log:
Added tracers for messages, outbound and inbound

Added:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/util/Logs.java
Modified:

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/NioReplicationThread.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=419974&r1=419973&r2=419974&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Fri Jul  7 13:36:05 2006
@@ -28,6 +28,9 @@
 import org.apache.catalina.tribes.membership.McastService;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
 import org.apache.catalina.tribes.Channel;
+import org.apache.catalina.tribes.util.Logs;
+import org.apache.catalina.tribes.UniqueId;
+import org.apache.catalina.tribes.util.Arrays;
 
 
 /**
@@ -72,6 +75,9 @@
 public void sendMessage(Member[] destination, ChannelMessage msg, 
InterceptorPayload payload) throws ChannelException {
 if ( destination == null ) destination = 
membershipService.getMembers();
 clusterSender.sendMessage(msg,destination);
+if ( Logs.MESSAGES.isTraceEnabled() ) {
+Logs.MESSAGES.trace("ChannelCoordinator - Sent msg:" + new 
UniqueId(msg.getUniqueId()) + " at " +new 
java.sql.Timestamp(System.currentTimeMillis())+ " to 
"+Arrays.toNameString(destination));
+}
 }
 
 
@@ -230,6 +236,9 @@
 }
 
 public void messageReceived(ChannelMessage msg) {
+if ( Logs.MESSAGES.isTraceEnabled() ) {
+Logs.MESSAGES.trace("ChannelCoordinator - Received msg:" + new 
UniqueId(msg.getUniqueId()) + " at " +new 
java.sql.Timestamp(System.currentTimeMillis())+ " from 
"+msg.getAddress().getName());
+}
 super.messageReceived(msg);
 }
 

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java?rev=419974&r1=419973&r2=419974&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 Fri Jul  7 13:36:05 2006
@@ -41,6 +41,8 @@
 import org.apache.catalina.tribes.io.BufferPool;
 import java.io.IOException;
 import org.apache.catalina.tribes.RemoteProcessException;
+import org.apache.catalina.tribes.util.Logs;
+import org.apache.catalina.tribes.util.Arrays;
 
 /**
  * The default implementation of a Channel.
@@ -212,6 +214,11 @@
 payload.setErrorHandler(handler);
 }
 getFirstInterceptor().sendMessage(destination, data, payload);
+if ( Logs.MESSAGES.isTraceEnabled() ) {
+Logs.MESSAGES.trace("GroupChannel - Sent msg:" + new 
UniqueId(data.getUniqueId()) + " at " +new 
java.sql.Timestamp(System.currentTimeMillis())+ " to 
"+Arrays.toNameString(destination));
+Logs.MESSAGES.trace("GroupChannel - Send Message:" + new 
UniqueId(data.getUniqueId()) + " is " +msg);
+}
+
 return new UniqueId(data.getUniqueId());
 }catch ( Exception x ) {
 if ( x instanceof ChannelException ) throw (ChannelException)x;
@@ -233,15 +240,20 @@
 public void messageReceived(ChannelMessage msg) {
 if ( msg == null ) return;
 try {
-if ( log.isTraceEnabled() ) {
-log.trace("GroupChannel received msg id:"+new 
UniqueId(msg.getUniqueId()));
+if ( Logs.MESSAGES.isTraceEnabled() ) {
+Logs.MESSAGES.trace("GroupChannel - Received msg:" + new 
UniqueId(msg.getUniqueId()) + " at " +new 
java.sql.Timestamp(System.currentTimeMillis())+ " from 
"+msg.getAddress().getName());
 }
+
 Serializable fwd = null;
 if ( (msg.getOptions() & SEND_OPTIONS_BYTE_MESSAG

svn commit: r419976 - /tomcat/container/tc5.5.x/modules/groupcom/VERSION

[fhanik]

Author: fhanik
Date: Fri Jul  7 13:39:56 2006
New Revision: 419976

URL: http://svn.apache.org/viewvc?rev=419976&view=rev
Log:
tracers

Modified:
tomcat/container/tc5.5.x/modules/groupcom/VERSION

Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=419976&r1=419975&r2=419976&view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Fri Jul  7 13:39:56 2006
@@ -1,3 +1,5 @@
+0.9.5.0
+  - added message tracers
 0.9.4.9
   - max multicast packet is no roughly 64k instead of 8k
   - tribes throws an illegal argument exception if the payload added is too 
large  



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

svn commit: r420002 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java

[remm]

Author: remm
Date: Fri Jul  7 15:35:25 2006
New Revision: 420002

URL: http://svn.apache.org/viewvc?rev=420002&view=rev
Log:
- If there is a security manager, the map should be reset (otherwise, 
references could be kept).

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=420002&r1=420001&r2=420002&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java Fri 
Jul  7 15:35:25 2006
@@ -404,8 +404,12 @@
 requestedSessionId = null;
 requestedSessionURL = false;
 
-parameterMap.setLocked(false);
-parameterMap.clear();
+if (Constants.SECURITY) {
+parameterMap = new ParameterMap();
+} else {
+parameterMap.setLocked(false);
+parameterMap.clear();
+}
 
 mappingData.recycle();
 



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

svn commit: r420003 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java

[remm]

Author: remm
Date: Fri Jul  7 15:35:57 2006
New Revision: 420003

URL: http://svn.apache.org/viewvc?rev=420003&view=rev
Log:
- Remove the spare threads attributes.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=420003&r1=420002&r2=420003&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
Fri Jul  7 15:35:57 2006
@@ -246,10 +246,6 @@
 writer.print("");
 writer.print(" Max threads: ");
 writer.print(mBeanServer.getAttribute(tpName, "maxThreads"));
-writer.print(" Min spare threads: ");
-writer.print(mBeanServer.getAttribute(tpName, "minSpareThreads"));
-writer.print(" Max spare threads: ");
-writer.print(mBeanServer.getAttribute(tpName, "maxSpareThreads"));
 writer.print(" Current thread count: ");
 writer.print(mBeanServer.getAttribute(tpName, 
"currentThreadCount"));
 writer.print(" Current thread busy: ");
@@ -318,8 +314,6 @@
 
 writer.write("");



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

svn commit: r420004 - in /tomcat/tc6.0.x/trunk: KEYS RELEASE-NOTES dist.xml

[remm]

Author: remm
Date: Fri Jul  7 15:37:03 2006
New Revision: 420004

URL: http://svn.apache.org/viewvc?rev=420004&view=rev
Log:
- Start work on a dist script (that I will keep separate to avoid having a 
bloated main script).

Added:
tomcat/tc6.0.x/trunk/KEYS   (with props)
tomcat/tc6.0.x/trunk/RELEASE-NOTES
tomcat/tc6.0.x/trunk/dist.xml   (with props)

Added: tomcat/tc6.0.x/trunk/KEYS
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/KEYS?rev=420004&view=auto
==
--- tomcat/tc6.0.x/trunk/KEYS (added)
+++ tomcat/tc6.0.x/trunk/KEYS Fri Jul  7 15:37:03 2006
@@ -0,0 +1,294 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers: 
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong <[EMAIL PROTECTED]>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT
+ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZ
+X9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56N
+oKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kj
+wEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obE
+AxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAIC
+B/0eHkYQ0Rv6s21TgpOzRBon+rQAv9ka0PlC7bj2eYWsCOBib8K7qO8hND0sW59p
+0uFQ01X7kC7L/4Ls1HTk0chEZMV0UrGAOKXHY1QFlxrNtFi5U3pTPITXDDfy+g/G
+6FTX3PLnGGvwXbtaiAq5UjQ6iXm03lh0BW6Q+kPtm8swPPfqfjYv0rrT+I8Ic3p2
+HplWKR2bpi3wqCSKB/AaTQJwTbh2x2+2cPVONPodgjZSJ9eQkErejkNSvqbumlTx
+dB81eoGa0Lo2xE7N+DNlCnILGE0X4hPMdj+N5fmyEbyx0WOB8crvCuODGGEQnXs/
+zbVO7FP+rj7YWjRh5pVD3bGiiQBMBBgRAgAMBQI7QFrlBRsMAAoJEGo60/Ty
+LE/tj/QAoOFNFa7rbAy+eT6mRNb7XztfcAbWAKD6Gd6S/7lEJU0k2TS5tozt4jMl
+vw==
+=/91Q
+-END PGP PUBLIC KEY BLOCK-
+
+Type Bits/KeyIDDate   User ID
+pub  1024D/86867BA6 2001-11-22 Jean-Frederic Clere (jfclere) <[EMAIL 
PROTECTED]>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.0.5 (GNU/Linux)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDv9Gx8RBADclmKwDLcibNVipQnhYW+bFIpuQjQnRrqRwn3gXM+/luzzJYJ4
+bbWpw13zjX0EkrAJ8qH2A/d0EIU1eZ0zHrLgRvMUfLGFUX7FFFw18JKFLTVGhG4/
+8sSl3ydHSA2Kd1PF6xjBP7iM7sg5dJfEkyMzvK5H4F0ZpTqy3087wsg1wwCgitRy
+Zg4x3lWZSkOwBj472qaO9GkD/2q6kyWfAK6XFe3GuB5AAs3poMfN1eqW+duM4TA8
+zUiWK0Wxx4JXJbL7n0i4d+JdXJsrjSjF++KKfelcxsrSxoUIBegez25MUSvHe09D
+R3nqkY8CVO+viEtzRBqkSgCMbUjAtfkQ+vp2jDnWSmmkNfY0OYAzt+KRyJKcjUSJ
+gvOOA/45+DN9wuTELoFTvsXh1JgOL/QvW1fmQ2HrcQk94BkzIsfVGWClCiig5gNw
+LCxTbfgA5htpI8U7vPR9/5gH7U8Wy3HR6xQUZxcbttMeYit2VbDEJzF5r5S0pJvD
+vyk3n1kiKU7r49sjhxGgE8J/VvDpO6YcIsDs8LoULwuJTg0DTrRDSmVhbi1GcmVk
+ZXJpYyBDbGVyZSAoamZjbGVyZSkgPEpGcmVkZXJpYy5DbGVyZUBmdWppdHN1LXNp
+ZW1lbnMuY29tPohXBBMRAgAXBQI7/RsfBQsHCgMEAxUDAgMWAgECF4AACgkQ0+/m
+toaGe6amGQCeJU5VZ8QCi8+PY0QJHPA63e5uPyoAmgOWIwFm8A/xmW8qjEvVAWtb
+TjZxuQENBDv9GyMQBACCbFlSF+udW/Qz2oknDen8Hoql4Q1Q7CUQTbPjoQAcYgZg
+LrsR6hc9aCIf3Kt4qZBgQ1Oe9M/AemOFhU04UNp3dgHk91EYRvx80Rua992p/8V7
+QOhwIBVb2XE8as5nL2j8w6Jz7eSs/bivxm9yD0AH/I5H01RAJivRbOTsUgSkDwAD
+BQP5ARlW2Nqc0U17asQsmMYvT1UMiOiyBwUD/DIEG2Xy1hlEvdljg8WU26jcjpGq
+MrT69T4Z+eZ2oVyiRQTW4qMUBKc0Nbz89hL0qv9K41ExxxH+JgE1csRVvmwAT8Iy
+lnhof7TJLRBtvan3+p21Kxl1uQ7MbmLT875u+vc+J098fIiIRgQYEQIABgUCO/0b
+IwAKCRDT7+a2hoZ7pn9UAJ9f0TK0QQOtjQBvxAissopYhDKHGACePZg0k9sj69yw
+nVWrBS9fvFC9jcA=
+=BTiM
+-END PGP PUBLIC KEY BLOCK-
+
+Type Bits/KeyIDDate   User ID
+pub  1024D/E86E29AC 2002-02-13 kevin seguin <[EMAIL PROTECTED]>
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.0.6 (MingW32)
+Comment: For info see http://www.gnupg.org
+
+mQGiBDxqtR8RBACbySxGrtf+flbowryS1Hj4z3zzEXD4CAEq6RjSGMtIraCDRJfp
+6Gexs+lQ6IhpdC4GfX70SUMjXXvT5suhXYeGOM4iJHqUsksgzEKjUqcfj1l3qmOs
+/doE8lcGGHcYbMplBcfuop+shZYiv9GEJ3gutwn/dNnhs/QA9bCdIj03lwCgvAcy
+QpT5JdTym2p2

svn commit: r420006 [4/17] - in /tomcat/tc6.0.x/trunk: res/ res/deployer/ webapps/docs/ webapps/docs/META-INF/ webapps/docs/WEB-INF/ webapps/docs/api/ webapps/docs/appdev/ webapps/docs/appdev/sample/

[remm]

Added: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup.xml?rev=420006&view=auto
==
--- tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,57 @@
+
+
+]>
+
+
+  &project;
+
+  
+Yoav Shapira
+Startup
+  
+
+
+
+
+
+
+
+This page describes how the Tomcat server starts up.  There are several
+different ways to start tomcat, including:
+
+  From the command line.
+  From a Java program as an embedded server.
+  Automatically as a Windows service.
+
+
+
+
+
+A text description of the startup procedure is available
+here.
+
+
+
+
+
+A UML sequence diagram of the startup procedure is available
+here.
+
+
+
+
+
+The startup process can be customized in many ways, both
+by modifying Tomcat code and by implementing your own
+LifecycleListeners which are then registered in the server.xml
+configuration file.
+
+
+
+
+
+
+
+
+

Propchange: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup.xml
--
svn:eol-style = native

Added: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.pdf
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.pdf?rev=420006&view=auto
==
Binary file - no diff available.

Propchange: 
tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.pdf
--
svn:mime-type = application/pdf

Added: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=420006&view=auto
==
--- tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt 
(added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt 
Fri Jul  7 15:40:04 2006
@@ -0,0 +1,136 @@
+Tomcat 5 Startup Sequence
+
+Sequence 1. Start from Command Line
+Class: org.apache.catalina.startup.Bootstrap
+What it does:
+   a) Set up classloaders 
+   commonLoader (common)-> System Loader
+   sharedLoader (shared)-> commonLoader -> System Loader
+   catalinaLoader(server) -> commonLoader -> System Loader
+   b) Load startup class (reflection)
+   org.apache.catalina.startup.Catalina
+   setParentClassloader -> sharedLoader
+   Thread.contextClassloader -> catalinaLoader
+   c) Bootstrap.daemon.init() complete
+   
+Sequence 2. Process command line argument (start, startd, stop, stopd)
+Class: org.apache.catalina.startup.Bootstrap (assume command->start)
+What it does: 
+   a) Catalina.setAwait(true);
+   b) Catalina.load()
+   b1) initDirs() -> set properties like 
+ catalina.home
+ catalina.base == catalina.home (most cases)
+   b2) initNaming
+   
setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
+   
org.apache.naming.java.javaURLContextFactory ->default)
+   b3) createStartDigester() 
+   Configures a digester for the main server.xml elements 
like
+   org.apache.catalina.core.StandardServer (can change of 
course :)
+   org.apache.catalina.deploy.NamingResources
+   Stores naming resources in the J2EE JNDI tree
+   org.apache.catalina.LifecycleListener
+   implements events for start/stop of major 
components
+   org.apache.catalina.core.StandardService
+   The single entry for a set of connectors,
+   so that a container can listen to multiple 
connectors
+   ie, single entry
+   org.apache.coyote.tomcat5.CoyoteConnector
+   Connectors to listen for incoming requests only
+   It also adds the following rulesets to the digester
+   NamingRuleSet
+   EngineRuleSet
+   HostRuleSet
+   ContextRuleSet
+   b4) Load the server.xml and parse it using the digester
+   Parsing the server.xml using the digester is an automatic
+   XML-object mapping tool, that will create the objects 
defined in server.xml
+ 

svn commit: r420006 [2/17] - in /tomcat/tc6.0.x/trunk: res/ res/deployer/ webapps/docs/ webapps/docs/META-INF/ webapps/docs/WEB-INF/ webapps/docs/api/ webapps/docs/appdev/ webapps/docs/appdev/sample/

[remm]

Added: tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml?rev=420006&view=auto
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml Fri Jul  7 15:40:04 2006
@@ -0,0 +1,306 @@
+
+
+]>
+
+
+  &project;
+
+  
+Craig R. McClanahan
+Source Organization
+  
+
+
+
+
+
+
+
+The description below uses the variable name $CATALINA_HOME
+to refer to the directory into which you have installed Tomcat 5,
+and is the base directory against which most relative paths are
+resolved.  However, if you have configured Tomcat 5 for multiple
+instances by setting a CATALINA_BASE directory, you should use
+$CATALINA_BASE instead of $CATALINA_HOME for each of these
+references.
+
+
+A key recommendation of this manual is to separate the directory
+hierarchy containing your source code (described in this section) from
+the directory hierarchy containing your deployable application
+(described in the preceding section).  Maintaining this separation has
+the following advantages:
+
+The contents of the source directories can be more easily administered,
+moved, and backed up if the "executable" version of the application
+is not intermixed.
+
+Source code control is easier to manage on directories that contain
+only source files.
+
+The files that make up an installable distribution of your
+application are much easier to select when the deployment
+hierarchy is separate.
+
+
+As we will see, the ant development tool makes the creation
+and processing of such directory hierarchies nearly painless.
+
+The actual directory and file hierarchy used to contain the source code
+of an application can be pretty much anything you like.  However, the
+following organization has proven to be quite generally applicable, and is
+expected by the example build.xml configuration file that
+is discussed below.  All of these components exist under a top level
+project source directory for your application:
+
+docs/ - Documentation for your application, in whatever
+format your development team is using.
+src/ - Java source files that generate the servlets,
+beans, and other Java classes that are unique to your application.
+If your source code is organized in packages (highly
+recommended), the package hierarchy should be reflected as a directory
+structure underneath this directory.
+web/ - The static content of your web site (HTML pages,
+JSP pages, JavaScript files, CSS stylesheet files, and images) that will
+be accessible to application clients.  This directory will be the
+document root of your web application, and any subdirectory
+structure found here will be reflected in the request URIs required to
+access those files.
+web/WEB-INF/ - The special configuration files required
+for your application, including the web application deployment descriptor
+(web.xml, defined in the 
+http://java.sun.com/products/servlet";>Servlet Specification), 
+tag library descriptors for custom tag libraries
+you have created, and other resource files you wish to include within
+your web application.  Even though this directory appears to be a
+subdirectory of your document root, the Servlet Specification
+prohibits serving the contents of this directory (or any file it contains)
+directly to a client request.  Therefore, this is a good place to store
+configuration information that is sensitive (such as database connection
+usernames and passwords), but is required for your application to
+operate successfully.
+
+
+During the development process, two additional directories will be
+created on a temporary basis:
+
+build/ - When you execute a default build
+(ant), this directory will contain an exact image
+of the files in the web application archive for this application.
+Tomcat 5 allows you to deploy an application in an unpacked
+directory like this, either by copying it to the
+$CATALINA_HOME/webapps directory, or by installing
+it via the "Manager" web application.  The latter approach is very
+useful during development, and will be illustrated below.
+
+dist/ - When you execute the ant dist
+target, this directory will be created.  It will create an exact image
+of the binary distribution for your web application, including an license
+information, documentation, and README files that you have prepared.
+
+
+Note that these two directories should NOT be archived in
+your source code control system, because they are deleted and recreated (from
+scratch) as needed during development.  For that reason, you should not edit
+any source files in these directories if you want to maintain a permanent
+record of the changes, because t

svn commit: r420006 [11/17] - in /tomcat/tc6.0.x/trunk: res/ res/deployer/ webapps/docs/ webapps/docs/META-INF/ webapps/docs/WEB-INF/ webapps/docs/api/ webapps/docs/appdev/ webapps/docs/appdev/sample/

[remm]

Added: tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml?rev=420006&view=auto
==
--- tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,870 @@
+
+
+]>
+
+
+  &project;
+
+  
+Craig McClanahan
+Amy Roh
+Tomcat MBean Names
+$Id: mbean-names.xml 303281 2004-09-27 16:00:31Z yoavs 
$
+  
+
+
+
+
+
+
+We will be using JMX MBeans as the technology for
+implementing manageability of Tomcat.
+
+One of the key concepts of JMX (and JSR-77) is that each management
+bean has a unique name in the MBeanServer's registry, and that
+management applications can utilize these names to retrieve the MBean
+of interest to them for a particular management operation.
+This document proposes a naming convention for MBeans that allows easy
+calculation of the name for a particular MBean.  For background
+information on JMX MBean names, see the Java Management Extensions
+Instrumentation and Agent Specification, version 1.0, section 6.
+In particular, we will be discussing the String Representation of
+ObjectName instances.
+
+
+
+
+
+Tomcat's servlet container implementation, called Catalina, can be
+represented as a hierarchy of objects that contain references to each other.
+The object hierarchy can be represented as a tree, or (isomorphically) based
+on the nesting of configuration elements in the conf/server.xml
+file that is traditionally used to configure Tomcat stand-alone.
+
+The valid component nestings for Catalina are depicted in the following
+table, with columns that contain the following values:
+
+Pattern - Nesting pattern of XML elements (in the
+conf/server.xml file) used to configure this component.
+Cardinality - Minimum and maximum number of occurrences of
+this element at this nesting position, which also corresponds to the
+minimum and maximum number of Catalina components.
+Identifier - Name of the JavaBeans property of this component
+that represents the unique identifier (within the nested hierarchy),
+if any.
+MBean ObjectName - The portion of the MBean object name that
+appears after the domain name.  For now, it should be
+assumed that all of these MBeans appear in the default JMX domain.
+
+
+In the MBean ObjectName descriptions, several types of symbolic
+expressions are utilized to define variable text that is replaced by
+corresponding values:
+
+${GROUP} - One of the standard MBean names of the specified
+"group" category.  For example, the expression ${REALM}
+represents the values like JDBCRealm and 
JAASRealm
+that identify the various MBeans for possible Realm 
components.
+${name} - Replaced by the value of property name
+from the current component.
+${parent.name} - Replaced by the value of property
+name from a parent of the current component, with the
+parent's type identified by parent.
+${###} - An arbitrary numeric identifier that preserves
+order but has no other particular meaning.  In general, the server will
+assign numeric values to existing instances with large gaps into which
+new items can be configured if desired.
+
+
+
+
+  
+Pattern
+Cardinality
+Identifier
+MBean ObjectName
+  
+
+  
+Server
+1..1
+(none)
+type=${SERVER}
+  
+
+  
+Server / Listener
+0..n
+(none)
+type=${LISTENER}, sequence=${###}
+  
+
+  
+Server / Service
+1..n
+name
+type=${SERVICE}, name=${name}
+  
+
+  
+Server / Service / Connector
+1..n
+address, port
+type=${CONNECTOR}, service=${service}, port=${port},
+address=${address}
+  
+
+  
+Server / Service / Connector / Factory
+0..1
+(none)
+(Only defined explicitly for an SSL connector, but can be treated
+as part of the connector component)
+  
+
+  
+Server / Service / Connector / Listener
+0..n
+(none)
+type=${LISTENER}, sequence=${###}, service=${service},
+port=${connector.port}, address=${connector.address}
+  
+
+  
+Server / Service / Engine
+1..1
+(none)
+type=${ENGINE}, service=${service.name}
+  
+
+  
+Server / Service / Engine / DefaultContext
+0..1
+(none)
+type=${DEFAULT-CONTEXT}, service=${service.name}
+  
+
+
+
+  
+Server / Service / Engine / Host
+1..n
+name
+type=${HOST}, host=${name},
+service=${service.name}
+  
+
+  
+Server / Service / Engine / Host / Context
+1..n
+path
+type=${CONTEXT}, path=${path}, host=${host.name},
+service=${service.name}
+  
+
+  
+Server / Service / Engine / Host / Context / InstanceListener
+0..n
+(none)
+type=${INSTANCE-LISTENER}, sequence=${###}, path=${c

svn commit: r420006 [17/17] - in /tomcat/tc6.0.x/trunk: res/ res/deployer/ webapps/docs/ webapps/docs/META-INF/ webapps/docs/WEB-INF/ webapps/docs/api/ webapps/docs/appdev/ webapps/docs/appdev/sample/

[remm]

Added: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=420006&view=auto
==
--- tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Fri Jul  7 
15:40:04 2006
@@ -0,0 +1,352 @@
+
+
+]>
+
+
+&project;
+
+
+  Mladen Turk
+  Windows service HOW-TO
+
+
+
+ 
+
+
+This section of the documentation applies to procrun 1.0, and is now 
obsolete.
+
+
+
+
+Tomcat5 is a service application for running Tomcat5 as NT service.
+
+
+
+
+Tomcat5w is a GUI application for monitoring and configuring Tomcat
+services.
+
+The available command line options are:
+ 
+
+//ES//
+Edit service configuration
+This is the default operation. It is called if the no option is
+provided but the executable is renamed to 
servicenameW.exe
+
+//MS//
+Monitor service
+Put the icon in the system try
+
+
+
+
+
+
+Each command line directive is in the form of //XX//ServiceName
+
+The available command line options are:
+ 
+
+//TS//
+Run the service as console application
+This is the default operation. It is called if the no option is
+provided. The ServiceName is the name of the executable without
+exe sufix, meaning Tomcat5
+
+//RS//
+Run the service
+Called only from ServiceManager
+
+//SS//
+Stop the service
+
+
+//US//
+Update service parameters
+
+
+//IS//
+Install service
+
+
+//DS//
+Delete service
+Stops the service if running
+
+
+ 
+
+
+
+Each command parameter is prefixed with --.
+If the command line is prefixed with ++ then it's value will
+be appended to the existing option.
+If the environment variable with the same name as command line parameter 
but
+prefixed with PR_ exists it will take precedence.
+For example:
+set PR_CLASSPATH=xx.jar
+
+is equivalent to providing
+--Classpath=xx.jar
+
+ as command line parameter.
+ 
+
+
+ParameterName
+   Default
+   Description
+
+
+--Description
+
+Service name description (maximum 1024 characters)
+
+
+--DisplayName
+ServiceName
+Service display name
+
+
+--Install
+procrun.exe //RS//ServiceName
+Install image
+
+
+--Startup
+manual
+Service startup mode can be either auto or manual
+
+
+--DependsOn
+
+List of services that this service depend on. Dependent services
+are separated using either # or ; characters
+
+
+--Environment
+
+List of environment variables that will be provided to the service
+in the form key=value. They are separated using either
+# or ; characters
+
+
+--User
+
+User account used for running executable. It is used only for
+   StartMode java or exe and enables running applications
+   as service under account without LogonAsService privilege.
+
+
+--Password
+
+Password for user account set by --User parameter
+
+
+--JavaHome
+JAVA_HOME
+Set a different JAVA_HOME then defined by JAVA_HOME environment
+variable
+
+
+--Jvm
+auto
+Use either auto or specify the full path to the jvm.dll.
+You can use the environment variable expansion here.
+
+
+--JvmOptions
+-Xrs
+List of options in the form of -D or -X that will be
+passed to the JVM. The options are separated using either
+# or ; characters.
+
+
+--Classpath
+
+Set the Java classpath
+
+
+--JvmMs
+
+Initial memory pool size in MB
+
+
+--JvmMx
+
+Maximum memory pool size in MB
+
+
+--JvmSs
+
+Thread stack size in KB
+
+
+
+--StartImage
+
+Executable that will be run.
+
+
+--StartPath
+
+Working path for the start image executable.
+
+
+--StartClass
+
+Class that will be used for startup.
+
+
+--StartParams
+
+List of parameters that will be passed to either StartImage or
+StartClass. Parameters are separated using either # or
+; character.
+
+
+--StartMethod
+Main
+Method name if differs then main
+
+
+--StartMode
+executable
+Can one of jvm java or exe
+
+--StopImage
+
+Executable that will be run on Stop service signal.
+
+
+--StopPath
+
+Working path for the stop image executable.
+
+
+--StopClass
+
+Class that will be used on Stop service signal.
+

svn commit: r420008 - /tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java

[remm]

Author: remm
Date: Fri Jul  7 15:42:46 2006
New Revision: 420008

URL: http://svn.apache.org/viewvc?rev=420008&view=rev
Log:
- Should improve handling of the root logger (sorry, I don't know who submitted 
this, it was a while
  ago).

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=420008&r1=420007&r2=420008&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Fri 
Jul  7 15:42:46 2006
@@ -51,14 +51,15 @@
  * weak hashmap is used to ensure no classloader reference is leaked from 
  * application redeployment.
  */
-protected final Map classLoaderLoggers = new WeakHashMap();
+protected final Map classLoaderLoggers = 
+new WeakHashMap();
 
 
 /**
  * This prefix is used to allow using prefixes for the properties names
  * of handlers and their subcomponents.
  */
-protected ThreadLocal prefix = new ThreadLocal();
+protected ThreadLocal prefix = new ThreadLocal();
 
 
 // - Public Methods
@@ -179,7 +180,7 @@
  * Get an enumeration of the logger names currently defined in the 
  * classloader local configuration.
  */
-public synchronized Enumeration getLoggerNames() {
+public synchronized Enumeration getLoggerNames() {
 ClassLoader classLoader = Thread.currentThread()
 .getContextClassLoader();
 return 
Collections.enumeration(getClassLoaderInfo(classLoader).loggers.keySet());
@@ -334,12 +335,12 @@
 }
 ClassLoaderLogInfo info = 
 new ClassLoaderLogInfo(new LogNode(null, localRootLogger));
-info.loggers.put("", localRootLogger);
 classLoaderLoggers.put(classLoader, info);
 
 if (is != null) {
 readConfiguration(is, classLoader);
 }
+addLogger(localRootLogger);
 
 }
 
@@ -472,7 +473,8 @@
 protected static final class LogNode {
 Logger logger;
 
-protected final Map children = new HashMap();
+protected final Map children = 
+new HashMap();
 
 protected final LogNode parent;
 
@@ -487,6 +489,9 @@
 
 LogNode findNode(String name) {
 LogNode currentNode = this;
+if (logger.getName().equals(name)) {
+return this;
+}
 while (name != null) {
 final int dotIndex = name.indexOf('.');
 final String nextName;
@@ -538,8 +543,8 @@
 
 protected static final class ClassLoaderLogInfo {
 final LogNode rootNode;
-final Map loggers = new HashMap();
-final Map handlers = new HashMap();
+final Map loggers = new HashMap();
+final Map handlers = new HashMap();
 final Properties props = new Properties();
 
 ClassLoaderLogInfo(final LogNode rootNode) {



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

svn commit: r420015 - in /tomcat/container/tc5.5.x/modules/groupcom: ./ src/share/org/apache/catalina/tribes/group/ src/share/org/apache/catalina/tribes/membership/

[fhanik]

Author: fhanik
Date: Fri Jul  7 16:53:44 2006
New Revision: 420015

URL: http://svn.apache.org/viewvc?rev=420015&view=rev
Log:
Fix in trace, and added a protocol around multicast packets as well

Modified:
tomcat/container/tc5.5.x/modules/groupcom/VERSION

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=420015&r1=420014&r2=420015&view=diff
==
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Fri Jul  7 16:53:44 2006
@@ -1,3 +1,6 @@
+0.9.5.1
+  - create a protocol around the multicast packages, so that we can go to nio 
eventually
+  - corrected tracing
 0.9.5.0
   - added message tracers
 0.9.4.9

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java?rev=420015&r1=420014&r2=420015&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/GroupChannel.java
 Fri Jul  7 16:53:44 2006
@@ -257,10 +257,12 @@
 //get the actual member with the correct alive time
 Member source = msg.getAddress();
 boolean rx = false;
+boolean delivered = false;
 for ( int i=0; ihttp://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java?rev=420015&r1=420014&r2=420015&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/Constants.java
 Fri Jul  7 16:53:44 2006
@@ -17,6 +17,8 @@
 
 package org.apache.catalina.tribes.membership;
 
+import org.apache.catalina.tribes.util.Arrays;
+
 
 /**
  * Manifest constants for the 
org.apache.catalina.tribes.membership
@@ -24,10 +26,14 @@
  *
  * @author Peter Rossbach
  * @version $Revision: 303950 $ $Date: 2005-06-09 15:38:30 -0500 (Thu, 09 Jun 
2005) $
+ * @author Filip Hanik
  */
 
 public class Constants {
 
 public static final String Package = 
"org.apache.catalina.tribes.membership";
-
+public static void main(String[] args) throws Exception {
+System.out.println(Arrays.toString("TRIBES-B".getBytes()));
+System.out.println(Arrays.toString("TRIBES-E".getBytes()));
+}
 }

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=420015&r1=420014&r2=420015&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
 Fri Jul  7 16:53:44 2006
@@ -338,8 +338,8 @@
 //ignore if we haven't started the sender
 //if ( (startLevel&Channel.MBR_TX_SEQ) != Channel.MBR_TX_SEQ ) return;
 member.inc();
-if(log.isDebugEnabled())
-log.debug("Mcast send ping from member " + member);
+if(log.isTraceEnabled())
+log.trace("Mcast send ping from member " + member);
 byte[] data = member.getData();
 DatagramPacket p = new DatagramPacket(data,data.length);
 p.setAddress(address);

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/MemberImpl.java?rev=420015&r1=420014&r2=420015&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tr

DO NOT REPLY [Bug 39987] - getServletContext().getContext("/context/subcontext") does not give matching "subcontext"

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

Version|5.5.17  |5.0.31




--- Additional Comments From [EMAIL PROTECTED]  2006-07-07 23:52 ---
This is a duplicate of bug 13040 and has been fixed for the 5.5.x branch
including 5.5.17.

It looks like your contexts are not correctly configured. You should use #
rather than $ when defining context.xml files for sub-contexts so your file
should be called context#sub.xml

I have just re-tested 5.5.x and the behaviour is correct in this version.

I previuosly fixed 13040 in 4.1.x and 5.5.x but not 5.0.x so this bug is valid
for 5.0.x only. I have changed the version accordingly. Please be aware that
further development of the 5.0.x branch is unlikely.

-- 
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: r420041 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Jul  7 19:56:48 2006
New Revision: 420041

URL: http://svn.apache.org/viewvc?rev=420041&view=rev
Log:
Fix typo (bug 39876). Patch supplied by Takayoshi Kimura

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=420041&r1=420040&r2=420041&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jul  7 19:56:48 2006
@@ -283,7 +283,7 @@
   
   
 Allow using a custom ContextConfig when using JMX embedding of Tomcat, 
as
-is doen by the regular deployer. (remm)
+is done by the regular deployer. (remm)
   
   
 Add JMX serverInfo attribute to Server MBean, that we can identify



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

DO NOT REPLY [Bug 39876] - Typo in webapps/docs/changelog.xml

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-07-08 02:55 ---
Patch applied. 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]

Ever wonder why you keep getting jk2 questions?

[William A. Rowe, Jr.]

Someone might want to review the 2nd to last paragraph here;

http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/

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

svn commit: r420058 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[mturk]

Author: mturk
Date: Fri Jul  7 23:44:25 2006
New Revision: 420058

URL: http://svn.apache.org/viewvc?rev=420058&view=rev
Log:
If all endpoints are dead or closed by the Tomcat, then try to reconnect if 
timeouts are set. This fixes the cases when connect_timeout is set for load 
balancer.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=420058&r1=420057&r2=420058&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Jul  7 
23:44:25 2006
@@ -1218,22 +1218,29 @@
  * If we failed to reuse a connection, try to reconnect.
  */
 if (ae->sd < 0) {
-
-if (err) {
+/* If we the previous connection was in error
+ * try to reconnect only if timeouts are set
+ */
+if (err && ae->worker->connect_timeout == 0 &&
+   ae->worker->socket_timeout == 0) {
 /* XXX: If err is set, the tomcat is either dead or disconnected */
 jk_log(l, JK_LOG_INFO,
"All endpoints are disconnected or dead");
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
-/* no need to handle cping/cpong here since it should be at connection 
time */
-
+/* Connect to the backend.
+ * This can be either uninitalized connection or a reconnect.
+ */
 if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
 /*
  * After we are connected, each error that we are going to
  * have is probably unrecoverable
  */
 if (ajp_connection_tcp_send_message(ae, op->request, l) != 
JK_TRUE) {
+/* Close the socket if unable to send request */
+jk_close_socket(ae->sd);
+ae->sd = -1;
 jk_log(l, JK_LOG_INFO,
"Error sending request on a fresh connection");
 JK_TRACE_EXIT(l);
@@ -1245,7 +1252,7 @@
 jk_close_socket(ae->sd);
 ae->sd = -1;
 jk_log(l, JK_LOG_INFO,
-   "Error connecting to the Tomcat process.");
+   "Error connecting to the backend server.");
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
@@ -1273,6 +1280,9 @@
 postlen = op->post->len;
 if (postlen > AJP_HEADER_LEN) {
 if (ajp_connection_tcp_send_message(ae, op->post, l) != JK_TRUE) {
+/* Close the socket if unable to send request */
+jk_close_socket(ae->sd);
+ae->sd = -1;
 jk_log(l, JK_LOG_ERROR, "Error resending request body (%d)",
postlen);
 JK_TRACE_EXIT(l);
@@ -1290,6 +1300,9 @@
 
 if (postlen > AJP_HEADER_LEN) {
 if (ajp_connection_tcp_send_message(ae, s->reco_buf, l) != 
JK_TRUE) {
+/* Close the socket if unable to send request */
+jk_close_socket(ae->sd);
+ae->sd = -1;
 jk_log(l, JK_LOG_ERROR,
"Error resending request body (lb mode) (%d)",
postlen);
@@ -1337,6 +1350,9 @@
 
 s->content_read = len;
 if (ajp_connection_tcp_send_message(ae, op->post, l) != JK_TRUE) {
+/* Close the socket if unable to send request */
+jk_close_socket(ae->sd);
+ae->sd = -1;
 jk_log(l, JK_LOG_ERROR, "Error sending request body");
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -2246,6 +2262,3 @@
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
-
-
-



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

svn commit: r420059 - /tomcat/connectors/trunk/jk/native/common/jk_connect.c

[mturk]

Author: mturk
Date: Fri Jul  7 23:46:06 2006
New Revision: 420059

URL: http://svn.apache.org/viewvc?rev=420059&view=rev
Log:
Use socket fake lingering only if we can set the socket timeout. It fixes the 
Solaris 8 minutes default
socket closing when Tomcat does not catch the FIN packet.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?rev=420059&r1=420058&r2=420059&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Fri Jul  7 23:46:06 
2006
@@ -488,6 +488,7 @@
 unsigned char dummy[512];
 int nbytes;
 int ttl = 0;
+int rc = 0;
 #if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
 int tmout = SECONDS_TO_LINGER * 1000;
 if (s == INVALID_SOCKET)
@@ -504,19 +505,21 @@
 return jk_close_socket(s);
 }
 #if defined(WIN32)  || (defined(NETWARE) && defined(__NOVELL_LIBC__))
-setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
-   (const char *) &tmout, sizeof(int));
+if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
+   (const char *) &tmout, sizeof(int)) == 0)
+rc = 1;
 #elif defined(SO_RCVTIMEO) && defined(USE_SO_RCVTIMEO)
 tv.tv_sec  = SECONDS_TO_LINGER;
 tv.tv_usec = 0;
-setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
-   (const void *) &tv, sizeof(tv));
+if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
+   (const void *) &tv, sizeof(tv)))
+rc = 1;
 #endif
 /* Read all data from the peer until we reach "end-of-file" (FIN
  * from peer) or we've exceeded our overall timeout. If the client does
- * not send us bytes within12 second, close the connection.
+ * not send us bytes within 12 second, close the connection.
  */
-while (1) {
+while (rc) {
 nbytes = jk_tcp_socket_recvfull(s, dummy, sizeof(dummy));
 if (nbytes <= 0)
 break;
@@ -659,7 +662,7 @@
 saved_errno = errno;
 soblock(sd);
 if (rd == -1 && saved_errno == EWOULDBLOCK) {
-errno = 0;
+errno = 0;
 return 1;
 }
 else {



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

svn commit: r420062 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[mturk]

Author: mturk
Date: Fri Jul  7 23:51:13 2006
New Revision: 420062

URL: http://svn.apache.org/viewvc?rev=420062&view=rev
Log:
Remove duplicate lockings for the status worker.
Fixes the problem reported for 1.2.16 on Tomcat users list.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=420062&r1=420061&r2=420062&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Fri Jul  7 23:51:13 
2006
@@ -755,13 +755,9 @@
 i = status_bool("wd", s->query_string);
 j = status_bool("ws", s->query_string);
 if (wr->s->is_disabled!=i || wr->s->is_stopped!=j) {
-/* lock shared memory */
-jk_shm_lock();
 wr->s->is_disabled = i;
 wr->s->is_stopped = j;
 reset_lb_values(lb, l);
-/* unlock the shared memory */
-jk_shm_unlock();
 if (i+j==0) {
 jk_log(l, JK_LOG_INFO,
"worker %s restarted in status worker"
@@ -771,12 +767,8 @@
 }
 i = status_int("wx", s->query_string, wr->s->distance);
 if (wr->s->distance!=i) {
-/* lock shared memory */
-jk_shm_lock();
 wr->s->distance = i;
 reset_lb_values(lb, l);
-/* unlock the shared memory */
-jk_shm_unlock();
 }
 i = status_int("wf", s->query_string, wr->s->lb_factor);
 if (i > 0 && wr->s->lb_factor != i) {



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

svn commit: r420063 - /tomcat/connectors/trunk/jk/native/common/jk_version.h

[mturk]

Author: mturk
Date: Fri Jul  7 23:52:09 2006
New Revision: 420063

URL: http://svn.apache.org/viewvc?rev=420063&view=rev
Log:
Increment the version to 1.2.17

Modified:
tomcat/connectors/trunk/jk/native/common/jk_version.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?rev=420063&r1=420062&r2=420063&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Fri Jul  7 23:52:09 
2006
@@ -25,8 +25,8 @@
 /** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   16
-#define JK_VERSTRING"1.2.16"
+#define JK_VERFIX   17
+#define JK_VERSTRING"1.2.17"
 
 /* Beta number */
 #define JK_VERBETA  0



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

svn commit: r420064 - in /tomcat/connectors/trunk/jk/native: common/portable.h.sample configure.in iis/installer/isapi-redirector-win32-msi.ism iis/isapi_redirect.rc

[mturk]

Author: mturk
Date: Fri Jul  7 23:55:01 2006
New Revision: 420064

URL: http://svn.apache.org/viewvc?rev=420064&view=rev
Log:
Increment the version to 1.2.17

Modified:
tomcat/connectors/trunk/jk/native/common/portable.h.sample
tomcat/connectors/trunk/jk/native/configure.in

tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc

Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?rev=420064&r1=420063&r2=420064&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Fri Jul  7 
23:55:01 2006
@@ -90,4 +90,4 @@
 #define USE_SO_SNDTIMEO 1
 
 /* Version number of package */
-#define VERSION "1.2.16"
+#define VERSION "1.2.17"

Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=420064&r1=420063&r2=420064&view=diff
==
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Fri Jul  7 23:55:01 2006
@@ -11,7 +11,7 @@
 
 dnl package and version. (synchronization with common/jk_version.h ?)
 PACKAGE=mod_jk
-VERSION=1.2.16
+VERSION=1.2.17
 
 AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
 

Modified: 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=420064&r1=420063&r2=420064&view=diff
==
--- 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism 
(original)
+++ 
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism 
Fri Jul  7 23:55:01 2006
@@ -3288,7 +3288,7 @@
ProductIDnone
ProductLanguage1033
ProductNameJakarta Isapi 
Redirector
-   ProductVersion1.2.16
+   ProductVersion1.2.17
ProgressType0install
ProgressType1Installing
ProgressType2installed

Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?rev=420064&r1=420063&r2=420064&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Fri Jul  7 23:55:01 
2006
@@ -14,13 +14,13 @@
 "specific language governing permissions and " \
 "limitations under the License."
 
-#define JK_VERSION_STR  "1.2.16"
+#define JK_VERSION_STR  "1.2.17"
 #define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
 
 
 1 VERSIONINFO
- FILEVERSION 1,2,16,0
- PRODUCTVERSION 1,2,16,0
+ FILEVERSION 1,2,17,0
+ PRODUCTVERSION 1,2,17,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x01L



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

Re: Ever wonder why you keep getting jk2 questions?

[Mladen Turk]

William A. Rowe, Jr. wrote:

Someone might want to review the 2nd to last paragraph here;

http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/



He he :)
Seems like old copy/paste policy is in place for years :)

Regards,
Mladen.

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