Author: fmoga
Date: Tue Nov 16 22:14:20 2010
New Revision: 1035837

URL: http://svn.apache.org/viewvc?rev=1035837&view=rev
Log:
Improved websocket connection design.

Added:
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java
   (contents, props changed)
      - copied, changed from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/CloseStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java
   (contents, props changed)
      - copied, changed from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/FramingStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java
   (contents, props changed)
      - copied, changed from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/HandshakeStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java
   (contents, props changed)
      - copied, changed from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/WebSocketStreamHandler.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/
      - copied from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/impl/
Removed:
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/CloseStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/FramingStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/HandshakeStrategy.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/WebSocketStreamHandler.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/impl/
Modified:
    labs/monsoon/trunk/modules/monsoon-client/pom.xml
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/WebSocket.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnection.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnectionFactory.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WsConnection.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WssConnection.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/CloseStrategyDraft03.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/FramingStrategyDraft03.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/HandshakeStrategyDraft03.java
    
labs/monsoon/trunk/modules/monsoon-client/src/main/java/sun/net/www/protocol/ws/Handler.java

Modified: labs/monsoon/trunk/modules/monsoon-client/pom.xml
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/pom.xml?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- labs/monsoon/trunk/modules/monsoon-client/pom.xml (original)
+++ labs/monsoon/trunk/modules/monsoon-client/pom.xml Tue Nov 16 22:14:20 2010
@@ -51,5 +51,12 @@
                        <type>jar</type>
                        <scope>compile</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>4.0.3</version>
+                       <type>jar</type>
+                       <scope>compile</scope>
+               </dependency>
        </dependencies>
 </project>

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/WebSocket.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/WebSocket.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/WebSocket.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/WebSocket.java
 Tue Nov 16 22:14:20 2010
@@ -18,13 +18,17 @@
  */
 package org.apache.monsoon.client;
 
+import org.apache.monsoon.client.handler.WebSocketConnectionHandler;
+import org.apache.monsoon.client.handler.impl.CloseStrategyDraft03;
+import org.apache.monsoon.client.handler.impl.FramingStrategyDraft03;
+import org.apache.monsoon.client.handler.impl.HandshakeStrategyDraft03;
 import org.apache.monsoon.client.url.WebSocketURL;
 import org.apache.monsoon.client.url.WebSocketURLException;
 
 public class WebSocket {
 
     private WebSocketState state;
-    private WebSocketURL url;
+    private WebSocketConnectionHandler handler;
 
     public WebSocket(String url) throws WebSocketURLException {
         this(url, new String[] {});
@@ -36,7 +40,9 @@ public class WebSocket {
 
     public WebSocket(String url, String[] protocols)
             throws WebSocketURLException {
-        this.url = new WebSocketURL(url);
+        this.handler = new WebSocketConnectionHandler(new WebSocketURL(url),
+                new HandshakeStrategyDraft03(), new FramingStrategyDraft03(),
+                new CloseStrategyDraft03());
     }
 
     public void send(String data) {

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnection.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnection.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnection.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnection.java
 Tue Nov 16 22:14:20 2010
@@ -19,29 +19,13 @@
 package org.apache.monsoon.client.connection;
 
 import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
 
-/**
- * 
- */
-public class WebSocketConnection extends URLConnection {
-
-    /**
-     * @param url
-     */
-    protected WebSocketConnection(URL url) {
-        super(url);
-        // TODO Auto-generated constructor stub
-    }
-
-    /**
-     * {...@inheritdoc}
-     */
-    @Override
-    public void connect() throws IOException {
-        // TODO Auto-generated method stub
+public interface WebSocketConnection {
 
-    }
+    void send(String message) throws IOException;
+
+    void onMessageReceived(String message);
+
+    void close() throws IOException;
 
 }

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnectionFactory.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnectionFactory.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WebSocketConnectionFactory.java
 Tue Nov 16 22:14:20 2010
@@ -18,8 +18,19 @@
  */
 package org.apache.monsoon.client.connection;
 
+import java.io.IOException;
+
+import org.apache.monsoon.client.url.WebSocketURL;
+
 public class WebSocketConnectionFactory {
 
-    
-    
+    public static WebSocketConnection getConnection(WebSocketURL url)
+            throws IOException {
+        // TODO: return same connection for same host and port
+        if (url.isSecure()) {
+            return new WssConnection(url);
+        }
+        return new WsConnection(url);
+    }
+
 }

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WsConnection.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WsConnection.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WsConnection.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WsConnection.java
 Tue Nov 16 22:14:20 2010
@@ -18,19 +18,54 @@
  */
 package org.apache.monsoon.client.connection;
 
-import java.net.URL;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
 
-/**
- * 
- */
-public class WsConnection extends WebSocketConnection {
+import org.apache.http.conn.scheme.PlainSocketFactory;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.HttpParams;
+import org.apache.monsoon.client.url.WebSocketURL;
+
+public class WsConnection implements WebSocketConnection {
+
+    private Socket socket;
+
+    public WsConnection(WebSocketURL url) throws IOException {
+        // TODO implement message listener
+        PlainSocketFactory sf = PlainSocketFactory.getSocketFactory();
+        socket = sf.createSocket();
+        HttpParams params = new BasicHttpParams();
+        params.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 1000L);
+        sf.connectSocket(socket, url.getHost(), url.getPort(), null, -1, 
params);
+    }
+
+    /**
+     * {...@inheritdoc}
+     * 
+     * @throws IOException
+     */
+    public void send(String message) throws IOException {
+        OutputStream os = socket.getOutputStream();
+        os.write(message.getBytes());
+        os.flush();
+    }
 
     /**
-     * @param url
+     * {...@inheritdoc}
+     * 
+     * @throws IOException
      */
-    protected WsConnection(URL url) {
-        super(url);
-        // TODO Auto-generated constructor stub
+    public void close() throws IOException {
+        socket.close();
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void onMessageReceived(String message) {
+
     }
 
 }

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WssConnection.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WssConnection.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WssConnection.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/connection/WssConnection.java
 Tue Nov 16 22:14:20 2010
@@ -18,19 +18,42 @@
  */
 package org.apache.monsoon.client.connection;
 
-import java.net.URL;
+import java.io.IOException;
+
+import org.apache.monsoon.client.url.WebSocketURL;
 
 /**
  * 
  */
-public class WssConnection extends WebSocketConnection {
+public class WssConnection implements WebSocketConnection {
+
+    public WssConnection(WebSocketURL url) {
+        // TODO Auto-generated method stub
+
+    }
 
     /**
-     * @param url
+     * {...@inheritdoc}
      */
-    protected WssConnection(URL url) {
-        super(url);
-        // TODO Auto-generated constructor stub
+    public void send(String message) throws IOException {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void onMessageReceived(String message) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void close() throws IOException {
+        // TODO Auto-generated method stub
+
     }
 
 }

Copied: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java
 (from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/CloseStrategy.java)
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java?p2=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java&p1=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/CloseStrategy.java&r1=1032255&r2=1035837&rev=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/CloseStrategy.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java
 Tue Nov 16 22:14:20 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream;
+package org.apache.monsoon.client.handler;
 
 /**
  * 

Propchange: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/CloseStrategy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java
 (from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/FramingStrategy.java)
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java?p2=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java&p1=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/FramingStrategy.java&r1=1032255&r2=1035837&rev=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/FramingStrategy.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java
 Tue Nov 16 22:14:20 2010
@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream;
+package org.apache.monsoon.client.handler;
 
 /**
  * 
  */
 public interface FramingStrategy {
 
+    String[] createFrames(String message);
+
     void onFrame();
 
 }

Propchange: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/FramingStrategy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java
 (from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/HandshakeStrategy.java)
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java?p2=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java&p1=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/HandshakeStrategy.java&r1=1032255&r2=1035837&rev=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/HandshakeStrategy.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java
 Tue Nov 16 22:14:20 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream;
+package org.apache.monsoon.client.handler;
 
 /**
  * 

Propchange: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/HandshakeStrategy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java
 (from r1032255, 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/WebSocketStreamHandler.java)
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java?p2=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java&p1=labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/WebSocketStreamHandler.java&r1=1032255&r2=1035837&rev=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/stream/WebSocketStreamHandler.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java
 Tue Nov 16 22:14:20 2010
@@ -16,11 +16,73 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream;
+package org.apache.monsoon.client.handler;
+
+import java.io.IOException;
+
+import org.apache.monsoon.client.connection.WebSocketConnection;
+import org.apache.monsoon.client.connection.WebSocketConnectionFactory;
+import org.apache.monsoon.client.url.WebSocketURL;
 
 /**
  * 
  */
-public class WebSocketStreamHandler {
+public class WebSocketConnectionHandler implements HandshakeStrategy,
+        FramingStrategy, CloseStrategy {
+
+    private WebSocketURL url;
+    private WebSocketConnection conn;
+    private HandshakeStrategy handshake;
+    private FramingStrategy framing;
+    private CloseStrategy closing;
+
+    public WebSocketConnectionHandler(WebSocketURL url,
+            HandshakeStrategy handshakeStrategy,
+            FramingStrategy framingStrategy, CloseStrategy closeStrategy) {
+        try {
+            conn = WebSocketConnectionFactory.getConnection(url);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void initiateHandshake() {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void checkHandshakeResponse() {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public String[] createFrames(String message) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void onFrame() {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {...@inheritdoc}
+     */
+    public void close() {
+        // TODO Auto-generated method stub
 
+    }
 }

Propchange: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/WebSocketConnectionHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/CloseStrategyDraft03.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/CloseStrategyDraft03.java?rev=1035837&r1=1032255&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/CloseStrategyDraft03.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/CloseStrategyDraft03.java
 Tue Nov 16 22:14:20 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream.impl;
+package org.apache.monsoon.client.handler.impl;
 
-import org.apache.monsoon.client.stream.CloseStrategy;
+import org.apache.monsoon.client.handler.CloseStrategy;
 
 /**
  * 

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/FramingStrategyDraft03.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/FramingStrategyDraft03.java?rev=1035837&r1=1032255&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/FramingStrategyDraft03.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/FramingStrategyDraft03.java
 Tue Nov 16 22:14:20 2010
@@ -16,13 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream.impl;
+package org.apache.monsoon.client.handler.impl;
+
+import org.apache.monsoon.client.handler.FramingStrategy;
 
 /**
  * 
  */
-public class FramingStrategyDraft03 implements
-        org.apache.monsoon.client.stream.FramingStrategy {
+public class FramingStrategyDraft03 implements FramingStrategy {
+
+    /**
+     * {...@inheritdoc}
+     */
+    public String[] createFrames(String message) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
     /**
      * {...@inheritdoc}
@@ -31,5 +40,4 @@ public class FramingStrategyDraft03 impl
         // TODO Auto-generated method stub
 
     }
-
 }

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/HandshakeStrategyDraft03.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/HandshakeStrategyDraft03.java?rev=1035837&r1=1032255&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/HandshakeStrategyDraft03.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/org/apache/monsoon/client/handler/impl/HandshakeStrategyDraft03.java
 Tue Nov 16 22:14:20 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.monsoon.client.stream.impl;
+package org.apache.monsoon.client.handler.impl;
 
-import org.apache.monsoon.client.stream.HandshakeStrategy;
+import org.apache.monsoon.client.handler.HandshakeStrategy;
 
 /**
  * 

Modified: 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/sun/net/www/protocol/ws/Handler.java
URL: 
http://svn.apache.org/viewvc/labs/monsoon/trunk/modules/monsoon-client/src/main/java/sun/net/www/protocol/ws/Handler.java?rev=1035837&r1=1035836&r2=1035837&view=diff
==============================================================================
--- 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/sun/net/www/protocol/ws/Handler.java
 (original)
+++ 
labs/monsoon/trunk/modules/monsoon-client/src/main/java/sun/net/www/protocol/ws/Handler.java
 Tue Nov 16 22:14:20 2010
@@ -32,7 +32,7 @@ public class Handler extends URLStreamHa
      * {...@inheritdoc}
      */
     @Override
-    protected URLConnection openConnection(URL arg0) throws IOException {
+    protected URLConnection openConnection(URL url) throws IOException {
         return null;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to