You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/08/21 23:22:47 UTC

[23/51] [partial] incubator-geode git commit: GEODE-77 removing the old jgroups subproject

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.MessageProtocol
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.MessageProtocol b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.MessageProtocol
deleted file mode 100644
index 36c6e14..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.MessageProtocol
+++ /dev/null
@@ -1,422 +0,0 @@
-package JavaGroups.JavaStack.Protocols;
-
-import java.io.*;
-import java.util.*;
-import JavaGroups.*;
-import JavaGroups.JavaStack.*;
-
-
-
-class NakAckHeader implements Serializable {
-    public static final int NAK_MSG        = 1;  // asynchronous msg
-    public static final int ACK_MSG        = 2;  // synchronous msg
-    public static final int RETRANSMIT_MSG = 3;  // retransmit msg
-
-    int     type=0;
-    long    seqno=-1;
-    ViewId  vid=null;
-
-
-    
-    NakAckHeader(int type, long seqno, ViewId vid) {
-	this.type=type;
-	this.seqno=seqno;
-	this.vid=vid;
-    }
-
-
-
-
-    String Type2Str(int t) {
-	switch(t) {
-	case NAK_MSG: return "NAK_MSG";
-	case ACK_MSG: return "ACK_MSG";
-	case RETRANSMIT_MSG: return "RETRANSMIT_MSG";
-	default: return "<undefined>";
-	}
-    }
-
-    public String toString() {
-	return "[NAKACK: " + Type2Str(type) + ", seqno=" + seqno + ", vid=" + vid + "]";
-    }
-}
-
-
-
-
-
-/**
-   Combined NAK and ACK class. The layer contains a NAKer and an ACKer: depending on which
-   one is set, a message will be sent using a negative acknowldegment scheme (NAK) or regular
-   acknowledgement (ACK). Event SET_ACK_MODE switches between the 2 modes. The following
-   communication between 2 peers exists (left side is initiator, right side receiver):
-   <pre>
-
-      send_nak
-   -------------->       asynchronous
-
-
-      send_ack
-   ------------->>       synchronous
-   <--------------
-        ack
-
-
-      retransmit
-   <--------------       asynchronous
-
-
-   </pre>
-   
-   When using NAKs, a messages is just tagged with a sequence number (seqno) and
-   broadcast asynchronously. A receiver requests retransmissions (asynchronous) for gaps
-   between received messages. When ACKs are used, each message is broadcast to the current
-   membership synchronously and only when a response from each member has been received
-   (or a suspect notification) will the call return. If a response has not been received after
-   a timeout, the message will be retransmitted to the corresponding member. If the response
-   is not received after n retries, and no suspect notification has been received, the member
-   will be suspected.
-   
-   When a message is sent, it will contain a header describing the type of the message, and containing
-   additional data, such as sequence number etc. When a message is received, it is fed into either
-   the ACKer or NAKer, depending on the header's type.
-*/
-public class NAKACK extends MessageProtocol {
-    LosslessTransmission  naker=new NAKer();             // 
-    LosslessTransmission  acker=new ACKer();             // 
-    LosslessTransmission  transmitter=naker;             // NAK is default
-    long                  seqno=0;                       // current message sequence number
-    Hashtable             received_msgs=new Hashtable(); // ordered by sender -> NakReceiverWindow
-    Hashtable             sent_msgs=new Hashtable();     // ordered by seqno (sent by me !)
-    ViewId                vid=null;
-    View                  view=null;
-
-
-    //Object                myaddr=null;
-
-
-    
-    class LosslessTransmission implements NakReceiverWindow.RetransmitCommand {
-
-
-	void Reset() {
-	    NakReceiverWindow win;
-
-	    sent_msgs.clear();	    
-	    for(Enumeration e=received_msgs.elements(); e.hasMoreElements();) {
-		win=(NakReceiverWindow)e.nextElement();
-		win.Reset();
-	    }
-	    received_msgs.clear();
-	}
-
-
-
-	void Send(long id, Message msg) {
-
-	}
-
-
-
-	void Receive(long id, Message msg) {
-	    Object             sender=msg.GetSrc();
-	    NakReceiverWindow  win=(NakReceiverWindow)received_msgs.get(sender);
-	    Message            msg_to_deliver;
-
-	    if(win == null) {
-		win=new NakReceiverWindow(sender, this, 0);
-		received_msgs.put(sender, win);
-	    }
-
-	    System.out.println("RECV #" + id);
-	    
-	    win.Add(id, msg);
-
-	    while(true) {
-		msg_to_deliver=win.Remove();
-		if(msg_to_deliver != null)
-		    PassUp(new Event(Event.MSG, msg_to_deliver));
-		else
-		    break;
-	    }
-	}
-
-
-
-
-
-	/** Called by retransmission thread when gap is detected. Sends retr. request
-	    to originator of msg */
-	public void Retransmit(long seqno, Object sender, int num_tries) {
-	    System.out.println("--> Retransmit(" + seqno + ") to " + sender);
-	    
-	    NakAckHeader hdr=new NakAckHeader(NakAckHeader.RETRANSMIT_MSG, seqno, vid);
-	    Message      retransmit_msg=new Message(sender, null, null);
-
-	    retransmit_msg.AddHeader(hdr);
-	    try {
-		SendMessage(retransmit_msg, GroupRequest.GET_NONE, 0); // non-blocking request
-	    }
-	    catch(Exception e) {
-		System.err.println("NAKACK.NAKer.Retransmit(): " + e);
-	    }
-	}
-
-
-
-
-	// Retransmit from sent-table
-	void Retransmit(Object dest, long id) {
-	    Message m=(Message)sent_msgs.get(new Long(id)), retr_msg;
-
-	    if(m == null) {
-		System.err.println("NAKACK.LosslessTransmission.Retransmit(): message with " +
-				   "seqno=" + id + " not found !");
-		return;
-	    }
-	    
-	    retr_msg=m.Copy();
-	    retr_msg.SetDest(dest);
-	    
-	    try {
-		SendMessage(retr_msg, GroupRequest.GET_NONE, 0);  // non-blocking
-	    }
-	    catch(Exception e) {
-		System.err.println("NAKACK.LosslessTransmission.Retransmit(): " +e);
-	    }
-
-	}
-
-
-	void Stable(long id) {}
-    }
-    
-
-
-
-
-    
-    class NAKer extends LosslessTransmission {
-
-
-	void Send(long id, Message msg) {
-	    Message copy;
-
-	    if(vid == null) {
-		System.err.println("NAKACK.NAKer.Send(): vid is null !");
-		return;
-	    }
-
-
-
-	    msg.AddHeader(new NakAckHeader(NakAckHeader.NAK_MSG, id, vid));
-	    
-	    copy=msg.Copy();
-	    sent_msgs.put(new Long(id), copy);
-
-	    System.out.println("SEND #" + id + ", msg is " + msg);
-
-
-
-	    //  	    if(id % 7 == 0) {
-	    //transmitter.Retransmit(id, myaddr, 0);
-	    //return;
-  	    //}
-
-
-
-	    CastMessage(view.GetMembers(), msg, GroupRequest.GET_NONE, 0); // don't wait for rsps
-
-
-	}
-
-
-    }
-    
-
-
-
-    
-    class ACKer extends LosslessTransmission {
-	// contains sent_table
-
-
-
-
-	void Send(long id, Message msg) {
-
-	    if(vid == null) {
-		System.err.println("NAKACK.ACKer.Send(): vid is null !");
-		return;
-	    }
-
-
-
-	    // +++ Send reliably (with ACKs)
-
-	    
-//  	    msg.AddHeader(new NakAckHeader(NakAckHeader.ACK_MSG, id, vid));
-
-	    // sent_msgs.put(new Long(id), msg);
-
-
-//  	    System.out.println("NAKer: sending message #" + id + " --> " + msg);
-
-//  	    PassDown(new Event(Event.MSG, msg));
-
-	}
-
-
-
-
-	
-    }
-    
-
-
-
-
-    
-    private long    GetNextSeqno()  {return seqno++;}
-    public  String  GetName()       {return "NAKACK";}
-
-
-
-
-    /**
-       <b>Callback</b>. Called when a request for this protocol layer is received.
-     */
-    public Object Handle(Message req) {
-	Object         obj;
-	NakAckHeader   hdr;
-	int            rc;
-
-	obj=req.PeekHeader();
-	if(obj == null || !(obj instanceof NakAckHeader)) {
-	    System.err.println("NAKACK.Handle(): message does not contain a NakAckHeader !");
-	    return null;
-	}
-	    
-	hdr=(NakAckHeader)req.RemoveHeader();
-	if(vid != null) {
-	    if(hdr.vid == null) {
-		System.err.println("NAKACK.Handle(): message's view is null ! " +
-				   "Cannot check against our own view !");
-	    }
-	    else {
-		rc=hdr.vid.Compare(vid);
-		if(rc == 0) {               // same vid -> OK
-		    ;
-		}
-		else if(rc < 0) {           // message sent in prev. view -> discard !
-		    System.err.println("NAKACK.Handle(): message's vid is smaller than " +
-				       "current vid: message is discarded !");
-		    return null;
-		}
-		else if(rc > 0) {
-		    System.out.println("NAKACK.Handle(): message's vid is bigger than " +
-				       "current vid: message is queued !");
-		    
-
-		    // +++ Implement: queue message
-
-
-		}
-		else {
-		    System.err.println("NAKACK.Handle(): comparison of message's vid with ours " +
-				       "yielded " + rc);
-		}
-	    }
-	}
-	else
-	    System.err.println("NAKACK.Handle(): our vid is not available ! "+
-			      "Cannot check against message's vid !");
-
-	
-	    
-	switch(hdr.type) {
-	case NakAckHeader.NAK_MSG:
-	case NakAckHeader.ACK_MSG:
-	    transmitter.Receive(hdr.seqno, req);
-	    break;
-	case NakAckHeader.RETRANSMIT_MSG:
-	    transmitter.Retransmit(req.GetSrc(), hdr.seqno);
-	    break;
-	default:
-	    System.err.println("NAKACK.HandleUpEvent(): NakAck header type " +
-			       hdr.type + " not known !");
-	    break;
-	}
-	
-	return null;
-    }
-
-
-
-    
-    /**
-       <b>Callback</b>. Called by superclass when event may be handled.<p>
-       <b>Do not use <code>PassUp</code> in this method as the event is passed up
-       by default by the superclass after this method returns !</b>
-       @return boolean Defaults to true. If false, event will not be passed up the stack.
-     */
-    public boolean HandleUpEvent(Event evt) {
-//    	switch(evt.GetType()) {
-//    	case Event.SET_LOCAL_ADDRESS:
-//    	    myaddr=evt.GetArg();
-//    	    break;
-//    	}
-	return true;
-    }
-
-
-    /**
-       <b>Callback</b>. Called by superclass when event may be handled.<p>
-       <b>Do not use <code>PassDown</code> in this method as the event is passed down
-       by default by the superclass after this method returns !</b>
-       @return boolean Defaults to true. If false, event will not be passed down the stack.
-    */
-    public boolean HandleDownEvent(Event evt) {
-	Message msg;
-
-	switch(evt.GetType()) {
-	case Event.MSG:
-	    msg=(Message)evt.GetArg();
-	    if(msg.GetDest() != null && !((Address)msg.GetDest()).IsMulticastAddress())
-		return true; // unicast address: not null and not mcast, pass down unchanged
-	    transmitter.Send(GetNextSeqno(), msg);
-	    return false;    // don't pass down the stack, transmitter does this for us !
-
-	case Event.VIEW_CHANGE:
-	    view=(View)evt.GetArg();
-	    vid=new ViewId((Address)view.GetCreator(), view.GetId());
-
-	    seqno=0;  // reset sequence number
-
-	    transmitter.Reset();
-
-
-	    // ++ Implement: if there are any queued messages that were previously 
-	    //               sent for this vid, add those that match the new vid now !
-
-
-
-
-	    break;
-
-	case Event.SWITCH_NAK:
-	    transmitter=naker;
-	    break;
-
-	case Event.SWITCH_ACK:
-	    transmitter=acker;
-	    break;
-	}
-
-
-	return true;
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.separate
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.separate b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.separate
deleted file mode 100644
index a74c48d..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NAKACK.java.separate
+++ /dev/null
@@ -1,484 +0,0 @@
-package JavaGroups.JavaStack.Protocols;
-
-import java.io.*;
-import java.util.*;
-import JavaGroups.*;
-import JavaGroups.JavaStack.*;
-
-
-
-class NakAckHeader implements Serializable {
-    public static final int NAK_MSG        = 1;  // asynchronous msg
-    public static final int ACK_MSG        = 2;  // synchronous msg
-    public static final int RETRANSMIT_MSG = 3;  // retransmit msg
-    public static final int ACK_RSP        = 4;  // ack to ACK_MSG, seqno contains ACKed
-
-    int     type=0;
-    long    seqno=-1;      // either reg. ACK_MSG or first_seqno in retransmissions
-    long    last_seqno=-1; // used for retransmissions
-    ViewId  vid=null;
-
-
-    
-    NakAckHeader(int type, long seqno, ViewId vid) {
-	this.type=type;
-	this.seqno=seqno;
-	this.vid=vid;
-    }
-
-
-
-
-    String Type2Str(int t) {
-	switch(t) {
-	case NAK_MSG: return "NAK_MSG";
-	case ACK_MSG: return "ACK_MSG";
-	case RETRANSMIT_MSG: return "RETRANSMIT_MSG";
-	case ACK_RSP: return "ACK_RSP";
-	default: return "<undefined>";
-	}
-    }
-
-    public String toString() {
-	return "[NAKACK: " + Type2Str(type) + ", seqno=" + seqno + ", last_seqno=" + last_seqno +
-	    ", vid=" + vid + "]";
-    }
-}
-
-
-
-
-
-/**
-   Combined NAK and ACK class. The layer contains a NAKer and an ACKer: depending on
-   which one is set, a message will be sent using a negative acknowldegment scheme
-   (NAK) or regular acknowledgement (ACK). Event SET_ACK_MODE switches between the 2
-   modes. The following communication between 2 peers exists (left side is initiator,
-   right side receiver): <pre>
-
-      send_nak
-   -------------->       asynchronous
-
-
-      send_ack
-   ------------->>       synchronous
-   <--------------
-        ack
-
-
-      retransmit
-   <--------------       asynchronous
-
-
-   </pre>
-   
-   When using NAKs, a messages is just tagged with a sequence number (seqno) and
-   broadcast asynchronously. A receiver requests retransmissions (asynchronous) for
-   gaps between received messages. When ACKs are used, each message is broadcast to
-   the current membership synchronously and only when a response from each member has
-   been received (or a suspect notification) will the call return. If a response has
-   not been received after a timeout, the message will be retransmitted to the
-   corresponding member. If the response is not received after n retries, and no
-   suspect notification has been received, the member will be suspected.
-   
-   When a message is sent, it will contain a header describing the type of the
-   message, and containing additional data, such as sequence number etc. When a
-   message is received, it is fed into either the ACKer or NAKer, depending on the
-   header's type.  */
-public class NAKACK extends Protocol {
-    NAKer                 naker=new NAKer();
-    ACKer                 acker=new ACKer();
-    LosslessTransmission  transmitter=naker;             // NAK is default
-    long                  nak_seqno=0;                   // current message sequence number for NAK msgs
-    long                  ack_seqno=0;                   // current message sequence number for ACK msgs
-    Hashtable             received_msgs=new Hashtable(); // ordered by sender -> NakReceiverWindow
-    Hashtable             sent_msgs=new Hashtable();     // ordered by seqno (sent by me !)
-    AckMcastSenderWindow  ackwin=null;
-    ViewId                vid=null;
-    View                  view=null;
-
-
-
-
-    
-    class LosslessTransmission implements NakReceiverWindow.RetransmitCommand {
-
-	void Start() {}
-	void Stop()  {}
-
-
-	void Reset() {
-	    NakReceiverWindow win;
-
-	    sent_msgs.clear();	    
-	    for(Enumeration e=received_msgs.elements(); e.hasMoreElements();) {
-		win=(NakReceiverWindow)e.nextElement();
-		win.Reset();
-	    }
-	    received_msgs.clear();
-	}
-
-
-
-	void Send(Message msg) {
-	    ;
-	}
-
-
-
-	void Receive(long id, Message msg) {
-	    ;
-	}
-
-
-
-
-
-
-	/** Called by retransmission thread when gap is detected. Sends retr. request
-	    to originator of msg */
-	public void Retransmit(long first_seqno, long last_seqno, Object sender) {
-	    System.out.println("NAKer --> Retransmit([" + first_seqno + ", " + last_seqno + "]) to " + 
-			       sender);
-	    
-	    NakAckHeader hdr=new NakAckHeader(NakAckHeader.RETRANSMIT_MSG, first_seqno, vid);
-	    Message      retransmit_msg=new Message(sender, null, null);
-
-	    hdr.last_seqno=last_seqno;
-	    retransmit_msg.AddHeader(hdr);
-	    try {
-		PassDown(new Event(Event.MSG, retransmit_msg));
-	    }
-	    catch(Exception e) {
-		System.err.println("NAKACK.NAKer.Retransmit(): " + e);
-	    }
-	}
-
-
-
-
-	// Retransmit from sent-table
-	void Retransmit(Object dest, long first_seqno, long last_seqno) {
-	    Message m, retr_msg;
-
-	    for(long i=first_seqno; i <= last_seqno; i++) {
-		m=(Message)sent_msgs.get(new Long(i));
-  		if(m == null) {
-  		    System.err.println("NAKACK.LosslessTransmission.Retransmit(): message with " +
-  				       "seqno=" + i + " not found !");
-  		    continue;
-  		}
-		
-		retr_msg=m.Copy();
-		retr_msg.SetDest(dest);
-		
-		try {
-		    PassDown(new Event(Event.MSG, retr_msg));
-		}
-		catch(Exception e) {
-		    System.err.println("NAKACK.LosslessTransmission.Retransmit(): " + e);
-		}
-	    }
-
-	}
-
-
-
-    }
-    
-
-
-
-
-    
-    class NAKer extends LosslessTransmission {
-
-
-	void Send(Message msg) {
-	    Message  copy;
-	    long     id;
-
-	    if(vid == null) {
-		System.err.println("NAKACK.NAKer.Send(): vid is null !");
-		return;
-	    }
-
-	    id=nak_seqno++;
-	    msg.AddHeader(new NakAckHeader(NakAckHeader.NAK_MSG, id, vid));
-	    
-	    copy=msg.Copy();  // save a copy for retransmission requests by receivers
-	    sent_msgs.put(new Long(id), copy);
-
-	    System.out.println("NAKer: SEND #" + id);
-	    PassDown(new Event(Event.MSG, msg));
-	}
-
-
-
-
-	void Receive(long id, Message msg) {
-	    Object             sender=msg.GetSrc();
-	    NakReceiverWindow  win=(NakReceiverWindow)received_msgs.get(sender);
-	    Message            msg_to_deliver;
-
-
-	    if(win == null) {
-		win=new NakReceiverWindow(sender, this, 0);
-		received_msgs.put(sender, win);
-	    }
-
-	    System.out.println("NAKer: RECV #" + id + "\n");
-	    
-	    win.Add(id, msg);
-
-	    while(true) {
-		msg_to_deliver=win.Remove();
-		if(msg_to_deliver != null)
-		    PassUp(new Event(Event.MSG, msg_to_deliver));
-		else
-		    break;
-	    }
-	}
-
-
-
-
-    }
-    
-
-
-
-
-
-    
-    class ACKer extends LosslessTransmission implements AckMcastSenderWindow.RetransmitCommand {
-
-	public ACKer() {
-	    if(ackwin == null)
-		ackwin=new AckMcastSenderWindow(this);
-	}
-
-	void Start() {
-	    if(ackwin == null)
-		ackwin=new AckMcastSenderWindow(this);
-	    ackwin.Start();
-	}
-
-	void Stop() {
-	    if(ackwin != null)
-		ackwin.Stop();
-	}
-
-
-
-	void Send(Message msg) {
-	    long    id;
-
-	    if(vid == null) {
-		System.err.println("NAKACK.ACKer.Send(): vid is null !");
-		return;
-	    }
-
-	    id=ack_seqno++;
-
-	    // Send reliably (with ACKs)
-	    if(ackwin == null)
-		ackwin=new AckMcastSenderWindow(this);
-	   
-	    ackwin.Add(id, msg, view.GetMembers());  // msg is copied, will not be modified by code below
-  	    msg.AddHeader(new NakAckHeader(NakAckHeader.ACK_MSG, id, vid));
-
-	    System.out.println("ACKer: SEND #" + id);
-	    PassDown(new Event(Event.MSG, msg));
-	}
-
-
-
-
-	void Receive(long id, Message msg) {
-
-	    System.out.println("ACKer: RECV #" + id + "\n");
-
-	    Message      ack_msg=new Message(msg.GetSrc(), null, null);
-	    NakAckHeader hdr=new NakAckHeader(NakAckHeader.ACK_RSP, id, vid);
-	    ack_msg.AddHeader(hdr);
-	    System.out.println("==> ACK #" + id);
-	    PassDown(new Event(Event.MSG, ack_msg));
-	}
-
-
-
-
-	void ReceiveAck(long id, Object sender) {
-	    if(ackwin == null) {
-		System.err.println("NAKACK.ACKer.ReceiveAck(): ack window is null !");
-		return;
-	    }
-	    ackwin.Ack(id, sender);
-	}
-
-
-
-	/**
-	   Called by retransmission thread of AckMcastSenderWindow. <code>msg</code> is already
-	   a copy, so does not need to be copied again.
-	 */
-	public void Retransmit(long seqno, Message msg, Object dest) {
-	    NakAckHeader hdr=new NakAckHeader(NakAckHeader.ACK_MSG, seqno, vid);
-
-	    msg.SetDest(dest);
-	    msg.AddHeader(hdr);
-	    PassDown(new Event(Event.MSG, msg));
-	}
-
-
-	
-    }
-    
-
-
-
-    
-    public  String  GetName()       {return "NAKACK";}
-
-
-    
-    /**
-       <b>Callback</b>. Called by superclass when event may be handled.<p>
-       <b>Do not use <code>PassUp</code> in this method as the event is passed up
-       by default by the superclass after this method returns !</b>
-       @return boolean Defaults to true. If false, event will not be passed up the stack.
-     */
-    public void Up(Event evt) {
-	Object        obj;
-	NakAckHeader  hdr;
-	Message       msg;
-	int           rc;
-
-  	switch(evt.GetType()) {
-
-	case Event.MSG:
-	    msg=(Message)evt.GetArg();
-	    obj=msg.PeekHeader();
-
-	    if(obj == null || !(obj instanceof NakAckHeader))
-		break;  // pass up
-	    
-	    hdr=(NakAckHeader)msg.RemoveHeader();
-	    if(vid != null) {
-		if(hdr.vid == null) {
-		    System.err.println("NAKACK.Up(): message's view is null ! " +
-				       "Cannot check against our own view !");
-		}
-		else {
-		    rc=hdr.vid.Compare(vid);
-		    if(rc == 0) {               // same vid -> OK
-			;
-		    }
-		    else if(rc < 0) {           // message sent in prev. view -> discard !
-			System.err.println("NAKACK.Up(): message's vid is smaller than " +
-					   "current vid: message is discarded !");
-			return;
-		    }
-		    else if(rc > 0) {           // message is sent in next view -> store !
-			System.out.println("NAKACK.Up(): message's vid is bigger than " +
-					   "current vid: message is queued !");
-			
-			
-			// +++ Implement: queue message
-			
-			
-		    }
-		    else {
-			System.err.println("NAKACK.Up(): comparison of message's vid with ours " +
-					   "yielded " + rc);
-		    }
-		}
-	    }
-	    else
-		System.err.println("NAKACK.Up(): our vid is not available ! "+
-				   "Cannot check against message's vid !");
-	    
-	    switch(hdr.type) {
-	    case NakAckHeader.NAK_MSG:
-		naker.Receive(hdr.seqno, msg);
-		return;        // transmitter passes message up for us !
-	    case NakAckHeader.ACK_MSG:
-		acker.Receive(hdr.seqno, msg);
-		return;        // transmitter passes message up for us !
-	    case NakAckHeader.RETRANSMIT_MSG:
-		transmitter.Retransmit(msg.GetSrc(), hdr.seqno, hdr.last_seqno);
-		return;
-	    case NakAckHeader.ACK_RSP:
-		System.out.println("<== ACK # " + hdr.seqno);
-		acker.ReceiveAck(hdr.seqno, msg.GetSrc());
-		return;        // discard, no need to pass up
-	    default:
-		System.err.println("NAKACK.Up(): NakAck header type " +
-				   hdr.type + " not known !");
-		break;
-	    }
-	    
-  	}
-
-	PassUp(evt);
-    }
-
-
-
-
-
-
-
-    /**
-       <b>Callback</b>. Called by superclass when event may be handled.<p>
-       <b>Do not use <code>PassDown</code> in this method as the event is passed down
-       by default by the superclass after this method returns !</b>
-       @return boolean Defaults to true. If false, event will not be passed down the stack.
-    */
-    public void Down(Event evt) {
-	Message msg;
-
-	switch(evt.GetType()) {
-	case Event.MSG:
-	    msg=(Message)evt.GetArg();
-	    if(msg.GetDest() != null && !((Address)msg.GetDest()).IsMulticastAddress())
-		break; // unicast address: not null and not mcast, pass down unchanged
-	    transmitter.Send(msg);
-	    return;    // don't pass down the stack, transmitter does this for us !
-
-	case Event.VIEW_CHANGE:
-	    view=(View)evt.GetArg();
-	    vid=new ViewId((Address)view.GetCreator(), view.GetId());
-
-	    nak_seqno=0;  // reset sequence number
-	    ack_seqno=0;  // reset sequence number
-
-	    transmitter.Reset();
-
-
-	    // ++ Implement: if there are any queued messages that were previously 
-	    //               sent for this vid, add those that match the new vid now !
-
-
-
-
-	    break;
-
-	case Event.SWITCH_NAK:
-	    acker.Stop();
-	    transmitter=naker;
-	    return;              // don't pass down any further
-
-	case Event.SWITCH_ACK:
-	    transmitter=acker;
-	    acker.Start();
-	    return;              // don't pass down any further
-	}
-
-	PassDown(evt);
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NakAckHeader.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NakAckHeader.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NakAckHeader.java
deleted file mode 100644
index 8d9fe85..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/NakAckHeader.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: NakAckHeader.java,v 1.4 2004/07/05 14:17:15 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-import com.gemstone.org.jgroups.Address;
-import com.gemstone.org.jgroups.Header;
-import com.gemstone.org.jgroups.ViewId;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Vector;
-
-
-
-public class NakAckHeader extends Header {
-    public static final int NAK_MSG          = 1;  // asynchronous msg
-    public static final int NAK_ACK_MSG      = 2;  // synchronous msg
-    public static final int WRAPPED_MSG      = 3;  // a wrapped msg, needs to be ACKed
-    public static final int RETRANSMIT_MSG   = 4;  // retransmit msg
-    public static final int NAK_ACK_RSP      = 5;  // ack to NAK_ACK_MSG, seqno contains ACKed
-    public static final int OUT_OF_BAND_MSG  = 6;  // out-of-band msg
-    public static final int OUT_OF_BAND_RSP  = 7;  // ack for out-of-band msg
-
-    int     type=0;
-    long    seqno=-1;          // either reg. NAK_ACK_MSG or first_seqno in retransmissions
-    long    last_seqno=-1;     // used for retransmissions
-    ViewId  vid=null;
-
-    // the messages from this sender can be deleted safely (OutOfBander). Contains seqnos (Longs)
-    Vector  stable_msgs=null;
-    Address sender=null;       // In case of WRAPPED_MSG: the address to which an ACK has to be sent
-
-
-
-    public NakAckHeader() {}
-    
-
-
-    public NakAckHeader(int type, long seqno, ViewId vid) {
-	this.type=type;
-	this.seqno=seqno;
-	this.vid=vid;
-    }
-
-
-    @Override // GemStoneAddition
-    public long size(short version) {
-	return 512;
-    }
-
-
-    public void writeExternal(ObjectOutput out) throws IOException {
-	out.writeInt(type);
-	out.writeLong(seqno);
-	out.writeLong(last_seqno);
-	out.writeObject(vid);
-	out.writeObject(stable_msgs);
-	out.writeObject(sender);
-    }
-
-
-
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-	type=in.readInt();
-	seqno=in.readLong();
-	last_seqno=in.readLong();
-	vid=(ViewId)in.readObject();
-	stable_msgs=(Vector)in.readObject();
-	sender=(Address)in.readObject();
-    }
-
-
-    public NakAckHeader copy() {
-	NakAckHeader ret=new NakAckHeader(type, seqno, vid);
-	ret.last_seqno=last_seqno;
-	ret.stable_msgs=stable_msgs != null ? (Vector)stable_msgs.clone() : null;
-	ret.sender=sender;
-	return ret;
-    }
-
-
-    public static String type2Str(int t) {
-	switch(t) {
-	case NAK_MSG:          return "NAK_MSG";
-	case NAK_ACK_MSG:      return "NAK_ACK_MSG";
-	case WRAPPED_MSG:      return "WRAPPED_MSG";
-	case RETRANSMIT_MSG:   return "RETRANSMIT_MSG";
-	case NAK_ACK_RSP:      return "NAK_ACK_RSP";
-	case OUT_OF_BAND_MSG:  return "OUT_OF_BAND_MSG";
-	case OUT_OF_BAND_RSP:  return "OUT_OF_BAND_RSP";
-	default:               return "<undefined>";
-	}
-    }
-
-    @Override // GemStoneAddition
-    public String toString() {
-	StringBuffer ret=new StringBuffer();
-	ret.append("[NAKACK: " + type2Str(type) + ", seqno=" + seqno + ", last_seqno=" + last_seqno +
-		   ", vid=" + vid );
-	if(type == WRAPPED_MSG)
-	    ret.append(", sender=" + sender);
-	ret.append(']');
-
-	return ret.toString();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PARTITIONER.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PARTITIONER.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PARTITIONER.java
deleted file mode 100644
index 872dc02..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PARTITIONER.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PARTITIONER.java,v 1.5 2005/05/30 14:31:07 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-
-import com.gemstone.org.jgroups.Address;
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Header;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.stack.Protocol;
-import com.gemstone.org.jgroups.util.ExternalStrings;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-
-
-
-/**
- * This layer can be put on top of the bottommost layer and is useful to simulate partitions.
- * It simply adds a header with its partition number and discards Messages with other partition numbers.<br>
- * If it receives an Event of type Event.SET_PARTITIONS it sends a Header of type COMMAND with the Hashtable
- * contained in the Event argument to set the partitions of ALL processes (not just processes of the current view but
- * every process with the same group address that receives the message.
- */
-
-public class PARTITIONER extends Protocol  {
-    final Vector   members=new Vector();
-    Address  local_addr=null;
-    int      my_partition=1;
-
-    /** All protocol names have to be unique ! */
-    @Override // GemStoneAddition  
-    public String  getName() {return "PARTITIONER";}
-
-
-    @Override // GemStoneAddition  
-    public boolean setProperties(Properties props) {
-//        String     str; GemStoneAddition
-
-        super.setProperties(props);
-        if(props.size() > 0) {
-            log.error(ExternalStrings.PARTITIONER_EXAMPLESETPROPERTIES_THESE_PROPERTIES_ARE_NOT_RECOGNIZED__0, props);
-
-            return false;
-        }
-        return true;
-    }
-
-
-    /** Just remove if you don't need to reset any state */
-    public void reset() {}
-
-
-    /**
-     * Discards Messages with the wrong partition number and sets local partition number if
-     * it receives a COMMAND Header
-     */
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-        Message msg;
-        Integer num;
-        PartitionerHeader partHead=null;
-
-        switch(evt.getType()) {
-
-        case Event.SET_LOCAL_ADDRESS:
-	    local_addr=(Address) evt.getArg();
-	     if(log.isInfoEnabled()) log.info(ExternalStrings.PARTITIONER_LOCAL_ADDRESS_IS__0, local_addr);
-	    break;
-
-        case Event.MSG:
-            msg=(Message)evt.getArg();
-            partHead=(PartitionerHeader) msg.removeHeader(getName());
-            if (partHead.type == PartitionerHeader.COMMAND) {
-		num = (Integer) partHead.Destinations.get(local_addr);
-		if (num == null) return;
-		 if(log.isInfoEnabled()) log.info(ExternalStrings.PARTITIONER_NEW_PARTITION___0, num);
-		my_partition =num.intValue();
-		return;
-            }
-            if (partHead.type == PartitionerHeader.NORMAL && partHead.partition != my_partition ) return;
-            break;
-        }
-
-        passUp(evt);            // Pass up to the layer above us
-    }
-
-
-
-
-    /**
-     * Adds to Messages a Header with the local partitin number and if receives a SET_PARTITIONS Event sends
-     * a new Message with a PartitionerHeader set to COMMAND that carries the Hashtable
-     */
-
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-        Message msg;
-//        Event newEvent; GemStoneAddition
-        PartitionerHeader partHeader;
-
-        switch(evt.getType()) {
-
-        case Event.SET_PARTITIONS:
-	    //Sends a partitioning message
-	     if(log.isInfoEnabled()) log.info(ExternalStrings.PARTITIONER_SET_PARTITIONS_RECEIVED_ARGUMENT__0, evt.getArg().toString());
-	    msg = new Message(null,null,null);
-	    partHeader = new PartitionerHeader(PartitionerHeader.COMMAND);
-	    partHeader.Destinations = (Hashtable) evt.getArg();
-	    msg.putHeader(getName(), partHeader);
-	    passDown(new Event(Event.MSG,msg));
-	    break;
-
-        case Event.MSG:
-            msg=(Message)evt.getArg();
-            msg.putHeader(getName(), new PartitionerHeader(PartitionerHeader.NORMAL,my_partition));
-            // Do something with the event, e.g. add a header to the message
-            // Optionally pass down
-            break;
-        }
-
-        passDown(evt);          // Pass on to the layer below us
-    }
-
-
-
-
-
-/**
- * The Partitioner header normally (type = NORMAL) contains just the partition number that is checked to discard messages
- * received from other partitions.
- * If type is COMMAND Destination contains an Hashtable where keys are of type Address and represent process (channel)
- * addresses and values are Integer representing the partition that shuold be assigned to each Address.
- */
-
-    public static class PartitionerHeader extends Header  {
-	// your variables
-	static final int NORMAL=0; //normal header (do nothing)
-	static final int COMMAND=1; //set partition vector
-	int type=0,partition=1;
-	Hashtable Destinations=null;
-	
-	public PartitionerHeader () {} // used for externalization
-	public PartitionerHeader (int type) { this.type= type;    }
-	public PartitionerHeader (int type,int partition) { this.type= type; this.partition = partition;  }
-	
-	    @Override // GemStoneAddition  
-	public String toString() {
-	    switch (type) {
-	    case NORMAL: return "NORMAL ->partition :" + partition;
-	    case COMMAND: return "COMMAND ->hashtable :" + Destinations;
-	    default: return "<unknown>";
-		
-	    }
-	}
-	
-	public void writeExternal(ObjectOutput out) throws IOException {
-	    out.writeInt(type);
-	    out.writeInt(partition);
-	    out.writeObject(Destinations);
-	}
-	
-	
-	
-	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-	    type=in.readInt();
-	    partition=in.readInt();
-	    Destinations=(Hashtable)in.readObject();
-	}
-}
-    
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF.java
deleted file mode 100644
index bc88814..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PERF.java,v 1.10 2005/08/11 12:43:47 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.View;
-import com.gemstone.org.jgroups.stack.Protocol;
-import com.gemstone.org.jgroups.stack.ProtocolObserver;
-import com.gemstone.org.jgroups.util.ExternalStrings;
-
-import java.util.Properties;
-import java.util.Vector;
-
-
-/**
- * Measures time taken by each protocol to process a message. PERF has to be the top protocol in a stack. It
- * adds a special header to the message which travels with the message. Upon initialization,
- * PERF creates a ProtocolObserver for each protocol layer in the stack. That observer notes the time taken for a
- * message to travel through the layer it observes, and records the start time, end time and total time
- * <em>in the message itself</em> (in the header created by PERF). When a message is received by PERF, the statistics
- * for the message are appended to a file (or displayed in a GUI (not yet done)).<p>
- * <em>Because of different wall times between different machines, PERF should only be used for members
- * in the same JVM. For members in different processes, physical clocks have to be synchronized: if they are
- * only a few milliseconds aprt, the values will be incorrect.</em>
- * For example, to write all performance data to a file, do the following:
- * <ol>
- * <li>Set tracing to on, e.g. <code>trace=true</code> in jgroups.properties
- * <li>Add a trace statement for PERF.up(): <code>trace0=PERF.up DEBUG /tmp/trace.perf</code>. This will write
- * all trace output to the given file.
- * </ol>
- *
- * @author Bela Ban Oct 2001
- * @version $Revision: 1.10 $
- */
-public class PERF extends Protocol  {
-    boolean             details=false;
-    final Vector        members=new Vector();
-    Vector              protocols=null;
-    static final String name="PERF";
-
-
-    /**
-     * All protocol names have to be unique !
-     */
-    @Override // GemStoneAddition  
-    public String getName() {
-        return name;
-    }
-
-
-    @Override // GemStoneAddition  
-    public boolean setProperties(Properties props) {
-        super.setProperties(props);
-        String str;
-
-        str=props.getProperty("details");
-        if(str != null) {
-            details=Boolean.valueOf(str).booleanValue();
-            props.remove("details");
-        }
-        if(props.size() > 0) {
-            log.error(ExternalStrings.PERF_PERFSETPROPERTIES_THESE_PROPERTIES_ARE_NOT_RECOGNIZED__0, props);
-
-            return false;
-        }
-        return true;
-    }
-
-
-    @Override // GemStoneAddition  
-    public void start() throws Exception {
-        protocols=stack != null ? stack.getProtocols() : null;
-        setupObservers();
-    }
-
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-        Message msg;
-        PerfHeader hdr;
-
-        switch(evt.getType()) {
-
-        case Event.MSG:
-            msg=(Message)evt.getArg();
-            hdr=removePerfHeader(msg);
-            if(hdr != null) {
-                hdr.setEndTime();
-                hdr.setDone(name, PerfHeader.UP); // we do this here because header is removed, so PassUp won't find it
-                if(trace)
-                    log.trace(hdr.printContents(details, protocols) + "\n---------------------------------\n");
-            }
-            break;
-        }
-
-        passUp(evt);            // Pass up to the layer above us
-    }
-
-
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-        Message msg;
-
-        switch(evt.getType()) {
-
-        case Event.TMP_VIEW:
-        case Event.VIEW_CHANGE:
-            Vector new_members=((View)evt.getArg()).getMembers();
-            synchronized(members) {
-                members.removeAllElements();
-                members.addAll(new_members);
-            }
-            passDown(evt);
-            break;
-
-        case Event.MSG:
-            msg=(Message)evt.getArg();
-            initializeMessage(msg); // Add a PerfHeader to the message
-            break;
-        }
-
-        passDown(evt);          // Pass on to the layer below us
-    }
-
-
-    /* ----------------------------------- Private Methods -------------------------------------- */
-
-    /**
-     * Create PerfObservers for all protocols save PERF
-     */
-    void setupObservers() {
-        Protocol p=null;
-        String pname;
-        PerfObserver po=null;
-
-        for(int i=0; i < protocols.size(); i++) {
-            p=(Protocol)protocols.elementAt(i);
-            pname=p.getName();
-            if(pname != null) {
-                po=new PerfObserver(pname);
-                p.setObserver(po);
-            }
-        }
-    }
-
-
-    void initializeMessage(Message msg) {
-        PerfHeader hdr=new PerfHeader(msg.getSrc(), msg.getDest());
-        Protocol p;
-        String pname=null;
-
-        if(protocols == null) {
-            log.error(ExternalStrings.PERF_PERFINITIALIZEMESSAGE_PROTOCOLS_VARIABLE_IS_NULL);
-            return;
-        }
-
-        for(int i=0; i < protocols.size(); i++) {
-            p=(Protocol)protocols.elementAt(i);
-            pname=p.getName();
-            if(pname != null) {
-                hdr.addEntry(pname);
-            }
-        }
-        hdr.setReceived(name, PerfHeader.DOWN); // we do this here because down() didn't yet find a PerfHeader
-        msg.putHeader(name, hdr);
-    }
-
-
-    /**
-     * Removes if present. Otherwise returns null
-     */
-    PerfHeader removePerfHeader(Message m) {
-        Object hdr=null;
-
-        if(m == null || (hdr=m.removeHeader(name)) == null)
-            return null;
-        return (PerfHeader)hdr;
-    }
-
-
-//      Vector getProtocols() {
-//  	Vector   ret=(Vector)stack.getProtocols().clone();
-//  	Protocol p;
-	
-//  	for(int i=0; i < ret.size(); i++) {
-//  	    p=(Protocol)ret.elementAt(i);
-//  	    if(p.getName() != null && p.getName().equals(getName())) {
-//  		ret.removeElement(p);
-//  		break;
-//  	    }
-//  	}
-//  	return ret;
-//      }
-
-    /* -------------------------------- End of Private Methods ---------------------------------- */
-}
-
-
-/**
- * Observes a protocol and adds its timings to the PerfHeader attached to each protocol.
- */
-class PerfObserver implements ProtocolObserver {
-    final String prot_name;
-    boolean bottom=false;
-
-    PerfObserver(String prot_name) {
-        this.prot_name=prot_name;
-    }
-
-
-    public void setProtocol(Protocol prot) {
-        if(prot != null && prot.getDownProtocol() == null)
-            bottom=true;
-    }
-
-
-    public boolean up(Event evt, int num_evts) {
-        PerfHeader hdr;
-        if(evt.getType() == Event.MSG) {
-            hdr=getPerfHeader((Message)evt.getArg());
-            if(hdr != null) {
-                hdr.setReceived(prot_name, PerfHeader.UP);
-                if(bottom)
-                    hdr.setNetworkReceived();
-            }
-        }
-        return true;
-    }
-
-
-    public boolean passUp(Event evt) {
-        PerfHeader hdr;
-        if(evt.getType() == Event.MSG) {
-            hdr=getPerfHeader((Message)evt.getArg());
-            if(hdr != null) {
-                hdr.setDone(prot_name, PerfHeader.UP);
-            }
-        }
-        return true;
-    }
-
-
-    public boolean down(Event evt, int num_evts) {
-        PerfHeader hdr;
-        if(evt.getType() == Event.MSG) {
-            hdr=getPerfHeader((Message)evt.getArg());
-            if(hdr != null) {
-                hdr.setReceived(prot_name, PerfHeader.DOWN);
-            }
-        }
-        return true;
-    }
-
-
-    public boolean passDown(Event evt) {
-        PerfHeader hdr;
-        if(evt.getType() == Event.MSG) {
-            hdr=getPerfHeader((Message)evt.getArg());
-            if(hdr != null) {
-                hdr.setDone(prot_name, PerfHeader.DOWN);
-                if(bottom)
-                    hdr.setNetworkSent();
-            }
-        }
-        return true;
-    }
-
-
-    PerfHeader getPerfHeader(Message m) {
-        Object hdr=null;
-
-        if(m == null || (hdr=m.getHeader(PERF.name)) == null)
-            return null;
-        return (PerfHeader)hdr;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF_TP.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF_TP.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF_TP.java
deleted file mode 100644
index 314454e..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PERF_TP.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PERF_TP.java,v 1.11 2005/08/11 12:43:47 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-
-import com.gemstone.org.jgroups.Address;
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.stack.Protocol;
-import com.gemstone.org.jgroups.util.ExternalStrings;
-
-
-/**
- * Measures the time for a message to travel from the channel to the transport
- * @author Bela Ban
- * @version $Id: PERF_TP.java,v 1.11 2005/08/11 12:43:47 belaban Exp $
- */
-public class PERF_TP extends Protocol  {
-    private Address local_addr=null;
-    static  PERF_TP instance=null;
-    long    stop, start;
-    long    num_msgs=0;
-    long    expected_msgs=0;
-    boolean done=false;
-
-
-    public static PERF_TP getInstance() {
-        return instance;
-    }
-
-    public PERF_TP() {
-        if(instance == null)
-            instance=this;
-    }
-
-
-    @Override // GemStoneAddition  
-    public String toString() {
-        return "Protocol PERF_TP (local address: " + local_addr + ')';
-    }
-
-    public boolean done() {
-        return done;
-    }
-
-    public long getNumMessages() {
-        return num_msgs;
-    }
-
-    public void setExpectedMessages(long m) {
-        expected_msgs=m;
-        num_msgs=0;
-        done=false;
-        start=System.currentTimeMillis();
-    }
-
-    public void reset() {
-        num_msgs=expected_msgs=stop=start=0;
-        done=false;
-    }
-
-    public long getTotalTime() {
-        return stop-start;
-    }
-
-
-    /*------------------------------ Protocol interface ------------------------------ */
-
-    @Override // GemStoneAddition  
-    public String getName() {
-        return "PERF_TP";
-    }
-
-
-
-
-    @Override // GemStoneAddition  
-    public void init() throws Exception {
-        local_addr=new com.gemstone.org.jgroups.stack.IpAddress("localhost", 10000); // fake address
-    }
-
-    @Override // GemStoneAddition  
-    public void start() throws Exception {
-        passUp(new Event(Event.SET_LOCAL_ADDRESS, local_addr));
-    }
-
-
-    /**
-     * Caller by the layer above this layer. Usually we just put this Message
-     * into the send queue and let one or more worker threads handle it. A worker thread
-     * then removes the Message from the send queue, performs a conversion and adds the
-     * modified Message to the send queue of the layer below it, by calling Down).
-     */
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-        Message msg;
-        Address dest_addr;
-
-
-        switch(evt.getType()) {
-
-        case Event.MSG:
-            if(done) {
-                break;
-            }
-            msg=(Message)evt.getArg();
-            dest_addr=msg.getDest();
-            if(dest_addr == null)
-                num_msgs++;
-            if(num_msgs >= expected_msgs) {
-                stop=System.currentTimeMillis();
-                synchronized(this) {
-                    done=true;
-                    this.notifyAll();
-                }
-                if(log.isInfoEnabled()) log.info(ExternalStrings.PERF_TP_ALL_DONE_NUM_MSGS_0__EXPECTED_MSGS_1, new Object[] {Long.valueOf(num_msgs), Long.valueOf(expected_msgs)});
-            }
-            break;
-
-        case Event.CONNECT:
-            passUp(new Event(Event.CONNECT_OK));
-            return;
-
-        case Event.DISCONNECT:
-            passUp(new Event(Event.DISCONNECT_OK));
-            return;
-        }
-
-        if(down_prot != null)
-            passDown(evt);
-    }
-
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-        Message msg;
-        Address dest_addr;
-        switch(evt.getType()) {
-
-        case Event.MSG:
-            if(done) {
-                if(warn) log.warn("all done (discarding msg)");
-                break;
-            }
-            msg=(Message)evt.getArg();
-            dest_addr=msg.getDest();
-            if(dest_addr == null)
-                num_msgs++;
-            if(num_msgs >= expected_msgs) {
-                stop=System.currentTimeMillis();
-                synchronized(this) {
-                    done=true;
-                    this.notifyAll();
-                }
-                if(log.isInfoEnabled()) log.info(ExternalStrings.PERF_TP_ALL_DONE_NUM_MSGS_0__EXPECTED_MSGS_1, new Object[] {Long.valueOf(num_msgs), Long.valueOf(expected_msgs)});
-            }
-            return;
-        }
-        passUp(evt);
-    }
-
-    /*--------------------------- End of Protocol interface -------------------------- */
-
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PIGGYBACK.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PIGGYBACK.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PIGGYBACK.java
deleted file mode 100644
index 88dd0fe..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PIGGYBACK.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PIGGYBACK.java,v 1.10 2005/08/11 12:43:47 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-import com.gemstone.org.jgroups.*;
-import com.gemstone.org.jgroups.stack.Protocol;
-import com.gemstone.org.jgroups.util.ExternalStrings;
-import com.gemstone.org.jgroups.util.Queue;
-import com.gemstone.org.jgroups.util.QueueClosedException;
-import com.gemstone.org.jgroups.util.Util;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Properties;
-import java.util.Vector;
-
-
-/**
- * Combines multiple messages into a single large one. As many messages as possible are combined into
- * one, after a max timeout or when the msg size becomes too big the message is sent. On the receiving
- * side, the large message is spliced into the smaller ones and delivered.
- */
-
-public class PIGGYBACK extends Protocol  {
-    long max_wait_time=20; // milliseconds: max. wait between consecutive msgs
-    long max_size=8192;    // don't piggyback if created msg would exceed this size (in bytes)
-    final Queue msg_queue=new Queue();
-    Packer packer=null;
-    boolean packing=false;
-    Address local_addr=null;
-
-
-    class Packer implements Runnable {
-        Thread t=null; // GemStoneAddition -- accesses synchronized on this
-
-
-        synchronized /* GemStoneAddition */ public void start() {
-            if(t == null) {
-                t=new Thread(this, "Packer thread");
-                t.setDaemon(true);
-                t.start();
-            }
-        }
-
-        synchronized /* GemStoneAddition */ public void stop() {
-          if (t != null) t.interrupt(); // GemStoneAddition
-            t=null;
-        }
-
-        public void run() {
-            long current_size=0;
-            long start_time, time_to_wait=max_wait_time;
-            Message m, new_msg;
-            Vector msgs;
-
-            for (;;) { // GemStoneAddition -- avoid anti-pattern
-              if (Thread.currentThread().isInterrupted()) break; // GemStoneAddition
-                try {
-                    m=(Message)msg_queue.remove();
-                    m.setSrc(local_addr);
-                    start_time=System.currentTimeMillis();
-                    current_size=0;
-                    new_msg=new Message();
-                    msgs=new Vector();
-                    msgs.addElement(m);
-                    current_size+=m.size();
-
-                    while(System.currentTimeMillis() - start_time <= max_wait_time &&
-                            current_size <= max_size) {
-
-                        time_to_wait=max_wait_time - (System.currentTimeMillis() - start_time);
-                        if(time_to_wait <= 0)
-                            break;
-
-                        try {
-                            m=(Message)msg_queue.peek(time_to_wait);
-                            m.setSrc(local_addr);
-                        }
-                        catch(TimeoutException timeout) {
-                            break;
-                        }
-                        if(/*m == null || GemStoneAddition not possible */ m.size() + current_size > max_size)
-                            break;
-                        m=(Message)msg_queue.remove();
-                        current_size+=m.size();
-                        msgs.addElement(m);
-                    }
-
-                    try {
-                        new_msg.putHeader(getName(), new PiggybackHeader());
-                        new_msg.setBuffer(Util.objectToByteBuffer(msgs));
-                        passDown(new Event(Event.MSG, new_msg));
-
-                            if(log.isInfoEnabled()) log.info("combined " + msgs.size() +
-                                    " messages of a total size of " + current_size + " bytes");
-                    }
-                    catch(Exception e) {
-                        if(warn) log.warn("exception is " + e);
-                    }
-                }
-                catch (InterruptedException ie) { // GemStoneAddition
-                     if(log.isInfoEnabled()) log.info(ExternalStrings.PIGGYBACK_PACKER_STOPPED_AS_QUEUE_IS_INTERRUPTED);
-                    break; // No need to reset interrupt bit; just exit.
-                }                    
-                catch(QueueClosedException closed) {
-                     if(log.isInfoEnabled()) log.info(ExternalStrings.PIGGYBACK_PACKER_STOPPED_AS_QUEUE_IS_CLOSED);
-                    break;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * All protocol names have to be unique !
-     */
-    @Override // GemStoneAddition  
-    public String getName() {
-        return "PIGGYBACK";
-    }
-
-
-    @Override // GemStoneAddition  
-    public boolean setProperties(Properties props) {super.setProperties(props);
-        String str;
-
-        str=props.getProperty("max_wait_time");
-        if(str != null) {
-            max_wait_time=Long.parseLong(str);
-            props.remove("max_wait_time");
-        }
-        str=props.getProperty("max_size");
-        if(str != null) {
-            max_size=Long.parseLong(str);
-            props.remove("max_size");
-        }
-
-        if(props.size() > 0) {
-            log.error(ExternalStrings.PIGGYBACK_PIGGYBACKSETPROPERTIES_THESE_PROPERTIES_ARE_NOT_RECOGNIZED__0, props);
-
-            return false;
-        }
-        return true;
-    }
-
-
-    @Override // GemStoneAddition  
-    public void start() throws Exception {
-        startPacker();
-    }
-
-    @Override // GemStoneAddition  
-    public void stop() {
-        packing=false;
-        msg_queue.close(true);  // flush pending messages, this should also stop the packer ...
-        stopPacker();           // ... but for safety reasons, we stop it here again
-    }
-
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-        Message msg;
-        Object obj;
-        Vector messages;
-
-        switch(evt.getType()) {
-
-            case Event.SET_LOCAL_ADDRESS:
-                local_addr=(Address)evt.getArg();
-                break;
-
-            case Event.MSG:
-                msg=(Message)evt.getArg();
-                obj=msg.getHeader(getName());
-                if(obj == null || !(obj instanceof PiggybackHeader))
-                    break;
-
-                msg.removeHeader(getName());
-                try {
-                    messages=(Vector)msg.getObject();
-                     if(log.isInfoEnabled()) log.info(ExternalStrings.PIGGYBACK_UNPACKING__0__MESSAGES, messages.size());
-                    for(int i=0; i < messages.size(); i++)
-                        passUp(new Event(Event.MSG, messages.elementAt(i)));
-                }
-                catch(Exception e) {
-                    if(warn) log.warn("piggyback message does not contain a vector of " +
-                            "piggybacked messages, discarding message ! Exception is " + e);
-                    return;
-                }
-
-                return;             // don't pass up !
-        }
-
-        passUp(evt);            // Pass up to the layer above us
-    }
-
-
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-        Message msg;
-
-        switch(evt.getType()) {
-
-            case Event.MSG:
-                msg=(Message)evt.getArg();
-
-                if(msg.getDest() != null && !msg.getDest().isMulticastAddress())
-                    break;  // unicast message, handle as usual
-
-                if(!packing)
-                    break;  // pass down as usual; we haven't started yet
-
-                try {
-                    msg_queue.add(msg);
-                }
-                catch(QueueClosedException closed) {
-                    break;  // pass down regularly
-                }
-                return;
-        }
-
-        passDown(evt);          // Pass on to the layer below us
-    }
-
-
-    void startPacker() {
-        if(packer == null) {
-            packing=true;
-            packer=new Packer();
-            packer.start();
-        }
-    }
-
-
-    void stopPacker() {
-        if(packer != null) {
-            packer.stop();
-            packing=false;
-            msg_queue.close(false);
-            packer=null;
-        }
-    }
-
-
-    public static class PiggybackHeader extends Header  {
-
-        public PiggybackHeader() {
-        }
-
-        @Override // GemStoneAddition  
-        public String toString() {
-            return "[PIGGYBACK: <variables> ]";
-        }
-
-        public void writeExternal(ObjectOutput out) throws IOException {
-        }
-
-
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        }
-
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PING.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PING.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PING.java
deleted file mode 100644
index 9e99af5..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PING.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PING.java,v 1.27 2005/08/11 12:43:47 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-import java.net.InetAddress;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.Random;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import com.gemstone.org.jgroups.Address;
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.stack.GossipClient;
-import com.gemstone.org.jgroups.stack.IpAddress;
-import com.gemstone.org.jgroups.util.ExternalStrings;
-import com.gemstone.org.jgroups.util.List;
-import com.gemstone.org.jgroups.util.Util;
-
-
-/**
- * The PING protocol layer retrieves the initial membership (used by the GMS when started
- * by sending event FIND_INITIAL_MBRS down the stack). We do this by mcasting PING
- * requests to an IP MCAST address (or, if gossiping is enabled, by contacting the GossipServer).
- * The responses should allow us to determine the coordinator whom we have to
- * contact, e.g. in case we want to join the group.  When we are a server (after having
- * received the BECOME_SERVER event), we'll respond to PING requests with a PING
- * response.<p> The FIND_INITIAL_MBRS event will eventually be answered with a
- * FIND_INITIAL_MBRS_OK event up the stack.
- * The following properties are available
- * property: gossip_host - if you are using GOSSIP then this defines the host of the GossipServer, default is null
- * property: gossip_port - if you are using GOSSIP then this defines the port of the GossipServer, default is null
- */
-public class PING extends Discovery  {
-    String       gossip_host=null;
-    int          gossip_port=0;
-    long         gossip_refresh=20000; // time in msecs after which the entry in GossipServer will be refreshed
-    GossipClient client;
-    int          port_range=1;        // number of ports to be probed for initial membership
-    List         initial_hosts=null;  // hosts to be contacted for the initial membership
-    public static final String name="PING";
-
-
-    @Override // GemStoneAddition
-    public String getName() {
-        return name;
-    }
-
-    // start GemStoneAddition
-    @Override // GemStoneAddition
-    public int getProtocolEnum() {
-      return com.gemstone.org.jgroups.stack.Protocol.enumPING;
-    }
-    // end GemStone addition
-
-
-
-    /**
-     * sets the properties of the PING protocol.
-     * The following properties are available
-     * property: timeout - the timeout (ms) to wait for the initial members, default is 3000=3 secs
-     * property: num_initial_members - the minimum number of initial members for a FIND_INITAL_MBRS, default is 2
-     * property: gossip_host - if you are using GOSSIP then this defines the host of the GossipServer, default is null
-     * property: gossip_port - if you are using GOSSIP then this defines the port of the GossipServer, default is null
-     *
-     * @param props - a property set containing only PING properties
-     * @return returns true if all properties were parsed properly
-     *         returns false if there are unrecnogized properties in the property set
-     */
-    @Override // GemStoneAddition
-    public boolean setProperties(Properties props) {
-        String str;
-
-        str=props.getProperty("gossip_host");
-        if(str != null) {
-            gossip_host=str;
-            props.remove("gossip_host");
-        }
-
-        str=props.getProperty("gossip_port");
-        if(str != null) {
-            gossip_port=Integer.parseInt(str);
-            props.remove("gossip_port");
-        }
-
-        str=props.getProperty("gossip_refresh");
-        if(str != null) {
-            gossip_refresh=Long.parseLong(str);
-            props.remove("gossip_refresh");
-        }
-
-        if(gossip_host != null && gossip_port != 0) {
-            try {
-                client=new GossipClient(new IpAddress(InetAddress.getByName(gossip_host), gossip_port), gossip_refresh);
-            }
-            catch(Exception e) {
-                if(log.isErrorEnabled()) log.error(ExternalStrings.PING_CREATION_OF_GOSSIPCLIENT_FAILED_EXCEPTION_0, e);
-                return false; // will cause stack creation to abort
-            }
-        }
-
-        str=props.getProperty("port_range");           // if member cannot be contacted on base port,
-        if(str != null) {                              // how many times can we increment the port
-            port_range=Integer.parseInt(str);
-            if(port_range < 1) {
-                port_range=1;
-            }
-            props.remove("port_range");
-        }
-
-        str=props.getProperty("initial_hosts");
-        if(str != null) {
-            props.remove("initial_hosts");
-            initial_hosts=createInitialHosts(str);
-        }
-
-        return super.setProperties(props);
-    }
-
-
-    @Override // GemStoneAddition
-    public void stop() {
-        super.stop();
-        if(client != null) {
-            client.stop();
-        }
-    }
-
-
-    @Override // GemStoneAddition
-    public void localAddressSet(Address addr) {
-        // Add own address to initial_hosts if not present: we must always be able to ping ourself !
-        if(initial_hosts != null && local_addr != null) {
-            List hlist;
-            boolean inInitialHosts=false;
-            for(Enumeration en=initial_hosts.elements(); en.hasMoreElements() && !inInitialHosts;) {
-                hlist=(List)en.nextElement();
-                if(hlist.contains(local_addr)) {
-                    inInitialHosts=true;
-                }
-            }
-            if(!inInitialHosts) {
-                hlist=new List();
-                hlist.add(local_addr);
-                initial_hosts.add(hlist);
-                if(log.isDebugEnabled())
-                    log.debug("adding my address (" + local_addr + ") to initial_hosts; initial_hosts=" + initial_hosts);
-            }
-        }
-    }
-
-
-    @Override // GemStoneAddition
-    public void handleConnect() {
-        if(client != null)
-            client.register(group_addr, local_addr, 0, false);
-    }
-
-    @Override // GemStoneAddition
-    public void handleDisconnect() {
-        if(client != null)
-            client.stop();
-    }
-
-
-
-    @Override // GemStoneAddition
-    public void sendGetMembersRequest(AtomicBoolean waiter_sync) {
-        Message msg;
-        PingHeader hdr;
-        Vector gossip_rsps;
-
-        wakeWaiter(waiter_sync);
-
-        if(client != null) {
-            gossip_rsps=client.getMembers(group_addr, local_addr, true, 0); // GemStoneAddition - localaddr
-            if(gossip_rsps != null && gossip_rsps.size() > 0) {
-                // Set a temporary membership in the UDP layer, so that the following multicast
-                // will be sent to all of them
-                Event view_event=new Event(Event.TMP_VIEW, makeView(gossip_rsps));
-                passDown(view_event); // needed e.g. by failure detector or UDP
-            }
-            else {
-                passUp(new Event(Event.FIND_INITIAL_MBRS_OK, null));
-                return;
-            }
-
-            if(gossip_rsps.size() > 0) {
-                for(int i=0; i < gossip_rsps.size(); i++) {
-                    Address dest=(Address)gossip_rsps.elementAt(i);
-                    msg=new Message(dest, null, null);
-                    msg.putHeader(getName(), new PingHeader(PingHeader.GET_MBRS_REQ, null));
-                    passDown(new Event(Event.MSG, msg));
-                }
-            }
-
-            try { // GemStoneAddition
-            Util.sleep(500);
-            }
-            catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-              // We're done in this method; just propagate the thread bit
-            }
-        }
-        else {
-            if(initial_hosts != null && initial_hosts.size() > 0) {
-                IpAddress h;
-                List hlist;
-                msg=new Message(null, null, null);
-                msg.putHeader(getName(), new PingHeader(PingHeader.GET_MBRS_REQ, null));
-                for(Enumeration en=initial_hosts.elements(); en.hasMoreElements();) {
-                    hlist=(List)en.nextElement();
-                    boolean isMember=false;
-                    for(Enumeration hen=hlist.elements(); hen.hasMoreElements() && !isMember;) {
-                        h=(IpAddress)hen.nextElement();
-                        msg.setDest(h);
-                        if(trace)
-                            log.trace("[FIND_INITIAL_MBRS] sending PING request to " + msg.getDest());
-                        passDown(new Event(Event.MSG, msg.copy()));
-                    }
-                }
-            }
-            else {
-                // 1. Mcast GET_MBRS_REQ message
-                ping_waiter.clearResponses(); // GemStoneAddition - ignore past work
-                hdr=new PingHeader(PingHeader.GET_MBRS_REQ, null);
-                msg=new Message(null, null, null);  // mcast msg
-                msg.putHeader(getName(), hdr); // needs to be getName(), so we might get "MPING" !
-                try {
-                  sendMcastDiscoveryRequest(msg);
-                }
-                catch (InterruptedException ie) {
-                  Thread.currentThread().interrupt();
-                  return;
-                }
-            }
-        }
-    }
-
-    void sendMcastDiscoveryRequest(Message discovery_request) throws InterruptedException {
-      // waiting for a random amount of time here helps avoid connection exceptions during
-      // concurrent multicast startup
-      if (Thread.interrupted()) throw new InterruptedException(); // GemStoneAddition
-      long waitTime = new Random(this.hashCode()).nextInt(150);
-      if (waitTime > 0) {
-        Thread.sleep(waitTime);
-      }
-        passDown(new Event(Event.MSG, discovery_request));
-    }
-
-//    // GemStoneAddition - let others know if this process becomes the coordinator
-//    public void down(Event evt) {
-//      super.down(evt);
-//      if (evt.getType() == Event.BECOME_SERVER) {
-//        sendIAMCoordinator();
-//      }
-//    }
-
-    /* -------------------------- Private methods ---------------------------- */
-
-
-
-    /**
-     * Input is "daddy[8880],sindhu[8880],camille[5555]. Return List of IpAddresses
-     */
-    private List createInitialHosts(String l) {
-        List tmp=new List();
-        StringTokenizer tok=new StringTokenizer(l, ",");
-        String t;
-
-        while(tok.hasMoreTokens()) {
-            try {
-                t=tok.nextToken();
-                String host=t.substring(0, t.indexOf('['));
-                int port=Integer.parseInt(t.substring(t.indexOf('[') + 1, t.indexOf(']')));
-                List hosts=new List();
-                for(int i=port; i < port + port_range; i++) {
-                    hosts.add(new IpAddress(host, i));
-                }
-                tmp.add(hosts);
-            }
-            catch(NumberFormatException e) {
-                if(log.isErrorEnabled()) log.error(ExternalStrings.PING_EXEPTION_IS__0, e);
-            }
-        }
-        return tmp;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTMETHODS.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTMETHODS.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTMETHODS.java
deleted file mode 100644
index 419ab83..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTMETHODS.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PRINTMETHODS.java,v 1.3 2004/03/30 06:47:21 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.blocks.MethodCall;
-import com.gemstone.org.jgroups.stack.Protocol;
-
-
-public class PRINTMETHODS extends Protocol {
-
-    public PRINTMETHODS() {}
-
-    @Override // GemStoneAddition  
-    public String        getName()             {return "PRINTMETHODS";}
-
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-	Object       obj=null;
-//	byte[]       buf; GemStoneAddition
-    	Message      msg;
-
-	if(evt.getType() == Event.MSG) {
-	    msg=(Message)evt.getArg();
-	    if(msg.getLength() > 0) {
-		try {
-		    obj=msg.getObject();
-		    if(obj != null && obj instanceof MethodCall)
-			System.out.println("--> PRINTMETHODS: received " + obj);
-		}
-		catch(ClassCastException cast_ex) {}
-		catch(Exception e) {}
-	    }
-	}
-
-	passUp(evt);
-    }
-    
-
-
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-//	Object       obj=null; GemStoneAddition
-//	byte[]       buf; GemStoneAddition
-//	Message      msg; GemStoneAddition
-
-	if(evt.getType() == Event.MSG) {
-
-	}
-	passDown(evt);
-    }
-
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8b2ea77d/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTOBJS.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTOBJS.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTOBJS.java
deleted file mode 100644
index dc72396..0000000
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/protocols/PRINTOBJS.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/** Notice of modification as required by the LGPL
- *  This file was modified by Gemstone Systems Inc. on
- *  $Date$
- **/
-// $Id: PRINTOBJS.java,v 1.4 2005/05/30 14:31:07 belaban Exp $
-
-package com.gemstone.org.jgroups.protocols;
-
-
-import com.gemstone.org.jgroups.Event;
-import com.gemstone.org.jgroups.Message;
-import com.gemstone.org.jgroups.stack.Protocol;
-
-
-public class PRINTOBJS extends Protocol {
-
-    public PRINTOBJS() {
-    }
-
-    @Override // GemStoneAddition  
-    public String getName() {
-        return "PRINTOBJS";
-    }
-
-
-    @Override // GemStoneAddition  
-    public void up(Event evt) {
-        Object obj=null;
-//        byte[] buf; GemStoneAddition
-        Message msg;
-
-        if(evt.getType() != Event.MSG) {
-            System.out.println("------------ PRINTOBJS (received event) ----------------");
-            System.out.println(evt);
-            System.out.println("--------------------------------------------------------");
-            passUp(evt);
-            return;
-        }
-
-        msg=(Message)evt.getArg();
-        if(msg.getLength() > 0) {
-            try {
-                obj=msg.getObject();
-            }
-            catch(ClassCastException cast_ex) {
-                System.out.println("------------ PRINTOBJS (received) ----------------------");
-                System.out.println(msg);
-                System.out.println("--------------------------------------------------------");
-                passUp(evt);
-                return;
-            }
-            catch(Exception e) {
-                log.error(e);
-            }
-
-            System.out.println("------------ PRINTOBJS (received) ----------------------");
-            System.out.println(obj);
-            System.out.println("--------------------------------------------------------");
-        }
-        else
-            System.out.println("------- PRINTOBJS (received null msg from " + msg.getSrc() + ", headers are " +
-                    msg.printObjectHeaders() + ") --------");
-
-        passUp(evt);
-    }
-
-
-    @Override // GemStoneAddition  
-    public void down(Event evt) {
-        Object obj=null;
-//        byte[] buf; GemStoneAddition
-        Message msg;
-
-        if(evt.getType() != Event.MSG) {
-            System.out.println("------------ PRINTOBJS (sent event) --------------------");
-            System.out.println(evt);
-            System.out.println("--------------------------------------------------------");
-            passDown(evt);
-            return;
-        }
-
-        msg=(Message)evt.getArg();
-        if(msg.getLength() > 0) {
-            try {
-                obj=msg.getObject();
-            }
-            catch(ClassCastException cast_ex) {
-                System.out.println("------------ PRINTOBJS (sent) --------------------------");
-                System.out.println(msg);
-                System.out.println("--------------------------------------------------------");
-                passDown(evt);
-                return;
-            }
-            catch(Exception e) {
-                log.error(e);
-            }
-
-            System.out.println("------------ PRINTOBJS (sent) --------------------------");
-            System.out.println(obj);
-            System.out.println("--------------------------------------------------------");
-        }
-        else
-            System.out.println("------- PRINTOBJS (sent null msg to " + msg.getDest() + ", headers are " +
-                    msg.printObjectHeaders() + " ) -------------");
-
-        passDown(evt);
-    }
-
-
-    public void reset() {
-        System.out.println("PRINTOBJS protocol is reset");
-    }
-
-    @Override // GemStoneAddition  
-    public String toString() {
-        return "Protocol PRINTOBJS";
-    }
-
-
-}