geronimo-scm mailing list archives

Author: jgenender
Date: Fri Sep 15 09:08:38 2006
New Revision: 446650

URL: http://svn.apache.org/viewvc?view=rev&rev=446650
Log:
Add funcs from OpeWireFormat

Modified:
    geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/transport/TransportServer.java
    geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/wireformat/WireFormat.java

Modified: geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/transport/TransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/transport/TransportServer.java?view=diff&rev=446650&r1=446649&r2=446650
==============================================================================
--- geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/transport/TransportServer.java
(original)
+++ geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/transport/TransportServer.java
Fri Sep 15 09:08:38 2006
@@ -20,7 +20,6 @@
 import java.net.InetSocketAddress;
 import java.net.URI;
 
-import org.apache.activemq.command.BrokerInfo;
 import org.apache.geronimo.openwire.Service;
 
 

Modified: geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/wireformat/WireFormat.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/wireformat/WireFormat.java?view=diff&rev=446650&r1=446649&r2=446650
==============================================================================
--- geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/wireformat/WireFormat.java
(original)
+++ geronimo/sandbox/gcache/openwire/src/main/java/org/apache/geronimo/openwire/wireformat/WireFormat.java
Fri Sep 15 09:08:38 2006
@@ -22,6 +22,7 @@
 import java.io.IOException;
 
 import org.apache.geronimo.openwire.util.ByteSequence;
+import org.apache.geronimo.openwire.command.WireFormatInfo;
 
 
 /**
@@ -33,22 +34,22 @@
 public interface WireFormat {
 
     /**
-     * Packet based marshaling 
+     * Packet based marshaling
      */
     ByteSequence marshal(Object command) throws IOException;
 
     /**
-     * Packet based un-marshaling 
+     * Packet based un-marshaling
      */
     Object unmarshal(ByteSequence packet) throws IOException;
 
     /**
-     * Stream based marshaling 
+     * Stream based marshaling
      */
     void marshal(Object command, DataOutputStream out) throws IOException;
 
     /**
-     * Packet based un-marshaling 
+     * Packet based un-marshaling
      */
     Object unmarshal(DataInputStream in) throws IOException;
 
@@ -61,5 +62,14 @@
      * @return the version of the wire format
      */
     public int getVersion();
+
+    // Question: is this the right way to go?
+    // TODO - investigate the WireFormatNegotiator class and see if these
+    // methods shold be here or not
+    public void setPreferedWireFormatInfo(WireFormatInfo info);
+
+    public WireFormatInfo getPreferedWireFormatInfo();
+
+    public void renegotiateWireFormat(WireFormatInfo info) throws IOException;
 
 }