cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitterTest.java

2005-04-18 Thread fhanik 
fhanik  2005/04/18 07:34:56

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java
   modules/cluster/test/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitterTest.java
  Log:
  Fixed spelling errors
  
  Revision  ChangesPath
  1.32  +5 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
  
  Index: ReplicationTransmitter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- ReplicationTransmitter.java   16 Apr 2005 07:22:41 -  1.31
  +++ ReplicationTransmitter.java   18 Apr 2005 14:34:56 -  1.32
  @@ -425,7 +425,7 @@
   time = System.currentTimeMillis();
   }
   try {
  -byte[] data = serialze(message);
  +byte[] data = serialize(message);
   String key = getKey(member);
   IDataSender sender = (IDataSender) map.get(key);
   sendMessageData(message.getUniqueId(), data, sender);
  @@ -447,7 +447,7 @@
   time = System.currentTimeMillis();
   }
   try {
  -byte[] data = serialze(message);
  +byte[] data = serialize(message);
   IDataSender[] senders = getSenders();
   for (int i = 0; i  senders.length; i++) {
   
  @@ -751,13 +751,13 @@
   }
   
   /**
  - * serialze message and add timestamp
  + * serialize message and add timestamp
* @see GZIPOutputStream
* @param msg cluster message
* @return cluster message as byte array
* @throws IOException
*/
  -protected byte[] serialze(ClusterMessage msg) throws IOException {
  +protected byte[] serialize(ClusterMessage msg) throws IOException {
   msg.setTimestamp(System.currentTimeMillis());
   ByteArrayOutputStream outs = new ByteArrayOutputStream();
   ObjectOutputStream out;
  
  
  
  1.3   +2 -2  
jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java
  
  Index: ReplicationTransmitterTest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ReplicationTransmitterTest.java   17 Apr 2005 16:17:16 -  1.2
  +++ ReplicationTransmitterTest.java   18 Apr 2005 14:34:56 -  1.3
  @@ -36,7 +36,7 @@
   transmitter.setCompress(true);
   SessionMessageImpl message= new SessionMessageImpl();
   message.setUniqueId(test);
  -byte [] data = transmitter.serialze(message);
  +byte [] data = transmitter.serialize(message);
   assertTrue(200  data.length);
   Object myobj = getGZPObject(data);
   assertTrue(myobj instanceof SessionMessageImpl);
  
  
  

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

cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitterTest.java

2005-04-17 Thread pero 
pero2005/04/17 09:17:16

  Modified:modules/cluster/test/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitterTest.java
  Log:
  correct name change
  
  Revision  ChangesPath
  1.2   +2 -2  
jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java
  
  Index: ReplicationTransmitterTest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitterTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReplicationTransmitterTest.java   12 Apr 2005 18:56:07 -  1.1
  +++ ReplicationTransmitterTest.java   17 Apr 2005 16:17:16 -  1.2
  @@ -36,7 +36,7 @@
   transmitter.setCompress(true);
   SessionMessageImpl message= new SessionMessageImpl();
   message.setUniqueId(test);
  -byte [] data = transmitter.createMessageData(message);
  +byte [] data = transmitter.serialze(message);
   assertTrue(200  data.length);
   Object myobj = getGZPObject(data);
   assertTrue(myobj instanceof SessionMessageImpl);
  
  
  

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

cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitterTest.java

2005-04-12 Thread pero 
pero2005/04/12 11:56:07

  Modified:modules/cluster/src/share/org/apache/catalina/cluster
ClusterSender.java
   modules/cluster/src/share/org/apache/catalina/cluster/io
XByteBuffer.java
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
DataSender.java FastAsyncSocketSender.java
ReplicationTransmitter.java SimpleTcpCluster.java
TcpReplicationThread.java mbeans-descriptors.xml
   modules/cluster to-do.txt
  Added:   modules/cluster/test/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitterTest.java
  Log:
  Optimize cluster send message
  add some usefull mbean attributes
  Refactor ReplicationTransmitter
  
  Revision  ChangesPath
  1.7   +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java
  
  Index: ClusterSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ClusterSender.java10 Apr 2005 16:20:45 -  1.6
  +++ ClusterSender.java12 Apr 2005 18:56:07 -  1.7
  @@ -39,9 +39,9 @@
   
   public void backgroundProcess() ;
   
  -public void sendMessage(String messageId, byte[] indata, Member member) 
throws java.io.IOException;
  +public void sendMessage(ClusterMessage message, Member member) throws 
java.io.IOException;
   
  -public void sendMessage(String messageId, byte[] indata) throws 
java.io.IOException;
  +public void sendMessage(ClusterMessage message) throws 
java.io.IOException;
   
   public boolean isWaitForAck();
   public void setWaitForAck(boolean isWaitForAck);
  
  
  
  1.13  +2 -1  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
  
  Index: XByteBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XByteBuffer.java  5 Apr 2005 18:05:52 -   1.12
  +++ XByteBuffer.java  12 Apr 2005 18:56:07 -  1.13
  @@ -366,6 +366,7 @@
* @param indata - the message data to be contained within the package
* @param compress - compress message data or not
* @return - a full package (header,size,data,footer)
  + * @deprecated since 5.5.10
*/
   public static byte[] createDataPackage(byte[] indata, boolean compress)
   throws java.io.IOException {
  
  
  
  1.7   +18 -6 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
  
  Index: DataSender.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DataSender.java   10 Apr 2005 16:20:46 -  1.6
  +++ DataSender.java   12 Apr 2005 18:56:07 -  1.7
  @@ -17,10 +17,12 @@
   package org.apache.catalina.cluster.tcp;
   
   import java.io.IOException;
  +import java.io.OutputStream;
   import java.net.InetAddress;
   import java.net.Socket;
   import java.net.SocketException;
   
  +import org.apache.catalina.cluster.io.XByteBuffer;
   import org.apache.catalina.util.StringManager;
   
   /**
  @@ -47,7 +49,7 @@
   /**
* The descriptive information about this implementation.
*/
  -private static final String info = DataSender/1.4;
  +private static final String info = DataSender/2.0;
   
   /**
* receiver address
  @@ -227,6 +229,13 @@
   }
   
   /**
  + * @return Returns the avg totalBytes/nrOfRequests.
  + */
  +public double getAvgMessageSize() {
  +return ((double)totalBytes) / nrOfRequests;
  +}
  +
  +/**
* @return Returns the avg processingTime/nrOfRequests.
*/
   public double getAvgProcessingTime() {
  @@ -693,7 +702,7 @@
   openSocket();
   }
   try {
  -writeData(data);
  + writeData(data);
   } catch (java.io.IOException x) {
   // second try with fresh connection
   dataResendCounter++;
  @@ -724,8 +733,12 @@
* @throws IOException
*/
   protected void writeData(byte[] data) throws IOException {
  -socket.getOutputStream().write(data);
  -socket.getOutputStream().flush();
  +OutputStream out = socket.getOutputStream();
  +