incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1035936 [2/3] - in /incubator/isis/trunk: alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/ alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/ a...
Date Wed, 17 Nov 2010 07:24:39 GMT
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/RequestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/RequestAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/RequestAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/RequestAbstract.java Wed Nov 17 07:24:36 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequest.java Wed Nov 17 07:24:36 2010
@@ -22,13 +22,11 @@ package org.apache.isis.alternatives.rem
 
 import java.io.IOException;
 
-import org.apache.isis.alternatives.remoting.common.data.Data;
 import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 public class ResolveFieldRequest extends RequestAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.common.exchange;
 
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
 import org.apache.isis.alternatives.remoting.common.data.Data;
 import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.common.exchange;
 
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
 import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequest.java Wed Nov 17 07:24:36 2010
@@ -23,11 +23,9 @@ package org.apache.isis.alternatives.rem
 import java.io.IOException;
 
 import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
-import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 public class SetAssociationRequest extends RequestAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.common.exchange;
 
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
 import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequest.java Wed Nov 17 07:24:36 2010
@@ -24,7 +24,6 @@ import java.io.IOException;
 
 import org.apache.isis.alternatives.remoting.common.data.common.EncodableObjectData;
 import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
-import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.common.exchange;
 
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
 import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DataOutputExtended;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/proxy/ServerFacadeProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/proxy/ServerFacadeProxy.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/proxy/ServerFacadeProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/proxy/ServerFacadeProxy.java Wed Nov 17 07:24:36 2010
@@ -21,7 +21,6 @@
 package org.apache.isis.alternatives.remoting.common.facade.proxy;
 
 
-import org.apache.log4j.Logger;
 import org.apache.isis.alternatives.remoting.common.IsisRemoteException;
 import org.apache.isis.alternatives.remoting.common.client.ClientConnection;
 import org.apache.isis.alternatives.remoting.common.exchange.AuthorizationRequestUsability;
@@ -60,6 +59,7 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.exchange.SetValueRequest;
 import org.apache.isis.alternatives.remoting.common.exchange.SetValueResponse;
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
+import org.apache.log4j.Logger;
 
 /**
  * previously called <tt>ClientConnection</tt>.

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ClientMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ClientMarshaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ClientMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ClientMarshaller.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.alternatives.remoting.common.marshalling;
 
-import java.io.IOException;
-
+import java.io.IOException;
+
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/MarshallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/MarshallerAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/MarshallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/MarshallerAbstract.java Wed Nov 17 07:24:36 2010
@@ -17,91 +17,88 @@
  *  under the License.
  */
 
+package org.apache.isis.alternatives.remoting.common.marshalling;
 
-package org.apache.isis.alternatives.remoting.common.marshalling;
-
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
+import java.io.IOException;
+
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-
-
-public abstract class MarshallerAbstract implements ClientMarshaller, ServerMarshaller {
-
-	private static final Logger LOG = Logger.getLogger(MarshallerAbstract.class);
-
-	private final IsisConfiguration configuration;
-	private final Transport transport;
-	
-	private boolean keepAlive;
-
-    
-    public MarshallerAbstract(
-    		final IsisConfiguration configuration, final Transport transport) {
-		this.configuration = configuration;
-		this.transport = transport;
-	}
-
-    //////////////////////////////////////////////////////////
-    // init, shutdown
-    //////////////////////////////////////////////////////////
-
-    public void init() {
-    	transport.init();
-        keepAlive = getConfiguration().getBoolean(MarshallingConstants.KEEPALIVE_KEY, MarshallingConstants.KEEPALIVE_DEFAULT);
-        if (LOG.isInfoEnabled()) {
-        	LOG.info("keepAlive=" + keepAlive);
-        }
-    }
-
-	public void shutdown() {
-    	transport.disconnect();
-    	transport.shutdown();
-	}
-
-
-    //////////////////////////////////////////////////////////
-    // Settings
-    //////////////////////////////////////////////////////////
-	
-	public boolean isKeepAlive() {
-		return keepAlive;
-	}
-
-	
-    //////////////////////////////////////////////////////////
-    // connect
-    //////////////////////////////////////////////////////////
-	
-	public void connect() throws IOException {
-		transport.connect();
-	}
-	
-	public void disconnect() {
-		transport.disconnect();
-	}
-	
-	/**
-	 * Not API.  Whether reconnects are performed depends on the
-	 * marshaller/protocol.
-	 */
-    protected void reconnect() throws IOException {
-        disconnect();
-        connect();
-    }
-
-
-    //////////////////////////////////////////////////////////
-    // Dependencies (from constructor)
-    //////////////////////////////////////////////////////////
-
-	public IsisConfiguration getConfiguration() {
-		return configuration;
-	}
-    
-	public Transport getTransport() {
-		return transport;
-	}
-	
-}
+import org.apache.log4j.Logger;
+
+public abstract class MarshallerAbstract implements ClientMarshaller, ServerMarshaller {
+
+    private static final Logger LOG = Logger.getLogger(MarshallerAbstract.class);
+
+    private final IsisConfiguration configuration;
+    private final Transport transport;
+
+    private boolean keepAlive;
+
+    public MarshallerAbstract(final IsisConfiguration configuration, final Transport transport) {
+        this.configuration = configuration;
+        this.transport = transport;
+    }
+
+    // ////////////////////////////////////////////////////////
+    // init, shutdown
+    // ////////////////////////////////////////////////////////
+
+    @Override
+    public void init() {
+        transport.init();
+        keepAlive =
+            getConfiguration().getBoolean(MarshallingConstants.KEEPALIVE_KEY, MarshallingConstants.KEEPALIVE_DEFAULT);
+        if (LOG.isInfoEnabled()) {
+            LOG.info("keepAlive=" + keepAlive);
+        }
+    }
+
+    @Override
+    public void shutdown() {
+        transport.disconnect();
+        transport.shutdown();
+    }
+
+    // ////////////////////////////////////////////////////////
+    // Settings
+    // ////////////////////////////////////////////////////////
+
+    public boolean isKeepAlive() {
+        return keepAlive;
+    }
+
+    // ////////////////////////////////////////////////////////
+    // connect
+    // ////////////////////////////////////////////////////////
+
+    @Override
+    public void connect() throws IOException {
+        transport.connect();
+    }
+
+    @Override
+    public void disconnect() {
+        transport.disconnect();
+    }
+
+    /**
+     * Not API. Whether reconnects are performed depends on the marshaller/protocol.
+     */
+    protected void reconnect() throws IOException {
+        disconnect();
+        connect();
+    }
+
+    // ////////////////////////////////////////////////////////
+    // Dependencies (from constructor)
+    // ////////////////////////////////////////////////////////
+
+    public IsisConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public Transport getTransport() {
+        return transport;
+    }
+
+}

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ServerMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ServerMarshaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ServerMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ServerMarshaller.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.alternatives.remoting.common.marshalling;
 
-import java.io.IOException;
-
+import java.io.IOException;
+
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/protocol/ObjectEncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/protocol/ObjectEncoderDecoder.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/protocol/ObjectEncoderDecoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/protocol/ObjectEncoderDecoder.java Wed Nov 17 07:24:36 2010
@@ -30,7 +30,6 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.exchange.ExecuteClientActionResponse;
 import org.apache.isis.alternatives.remoting.common.exchange.ExecuteServerActionResponse;
 import org.apache.isis.alternatives.remoting.common.exchange.KnownObjectsRequest;
-import org.apache.isis.alternatives.remoting.common.exchange.OpenSessionRequest;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/ServerConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/ServerConnectionHandler.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/ServerConnectionHandler.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/ServerConnectionHandler.java Wed Nov 17 07:24:36 2010
@@ -26,7 +26,7 @@ import java.io.StringWriter;
 import org.apache.isis.alternatives.remoting.common.exchange.OpenSessionRequest;
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.alternatives.remoting.common.exchange.ResponseEnvelope;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/Transport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/Transport.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/Transport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/Transport.java Wed Nov 17 07:24:36 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.alternatives.remoting.transport;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 
 public interface Transport extends ApplicationScopedComponent {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedConnection.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedConnection.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedConnection.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.transport.pipe;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.alternatives.remoting.common.exchange.ResponseEnvelope;
+import org.apache.log4j.Logger;
 
 
 public class PipedConnection {

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedServer.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedServer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedServer.java Wed Nov 17 07:24:36 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.alternatives.remoting.transport.pipe;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.alternatives.remoting.common.exchange.ResponseEnvelope;
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
+import org.apache.log4j.Logger;
 
 
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/simple/SimpleTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/simple/SimpleTransport.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/simple/SimpleTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/simple/SimpleTransport.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.alternatives.remoting.transport.simple;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-
+import java.io.InputStream;
+import java.io.OutputStream;
+
 import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectDecoderCollectionTest.java Wed Nov 17 07:24:36 2010
@@ -28,10 +28,10 @@ import org.apache.commons.collections.Co
 import org.apache.isis.alternatives.remoting.common.data.common.CollectionData;
 import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
 import org.apache.isis.alternatives.remoting.common.data.common.ReferenceData;
-import org.apache.isis.alternatives.remoting.common.protocol.internal.FieldOrderCache;
-import org.apache.isis.alternatives.remoting.common.protocol.internal.ObjectDeserializer;
 import org.apache.isis.alternatives.remoting.data.DummyCollectionData;
 import org.apache.isis.alternatives.remoting.data.DummyObjectData;
+import org.apache.isis.alternatives.remoting.protocol.internal.FieldOrderCache;
+import org.apache.isis.alternatives.remoting.protocol.internal.ObjectDeserializer;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java Wed Nov 17 07:24:36 2010
@@ -25,10 +25,10 @@ import static org.junit.Assert.assertTru
 
 import org.apache.isis.alternatives.remoting.common.data.Data;
 import org.apache.isis.alternatives.remoting.common.data.common.NullData;
-import org.apache.isis.alternatives.remoting.common.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.alternatives.remoting.data.DummyEncodeableObjectData;
 import org.apache.isis.alternatives.remoting.data.DummyNullValue;
 import org.apache.isis.alternatives.remoting.data.DummyObjectData;
+import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.facets.Facet;

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java Wed Nov 17 07:24:36 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.encode;
 
 import java.io.IOException;
@@ -25,11 +24,10 @@ import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.alternatives.remoting.common.marshalling.MarshallerAbstract;
 import org.apache.isis.alternatives.remoting.common.marshalling.MarshallingConstants;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.encoding.DataInputExtended;
@@ -39,132 +37,134 @@ import org.apache.isis.core.metamodel.en
 import org.apache.isis.core.metamodel.encoding.DebugDataInputExtended;
 import org.apache.isis.core.metamodel.encoding.DebugDataOutputExtended;
 import org.apache.isis.core.metamodel.encoding.Encodable;
-
+import org.apache.log4j.Logger;
 
 public class EncodingMarshaller extends MarshallerAbstract {
-    
-    public EncodingMarshaller(
-    		final IsisConfiguration configuration,
-			final Transport transport) {
-		super(configuration, transport);
-	}
 
-	private static final Logger LOG = Logger.getLogger(EncodingMarshaller.class);
+    public EncodingMarshaller(final IsisConfiguration configuration, final Transport transport) {
+        super(configuration, transport);
+    }
+
+    private static final Logger LOG = Logger.getLogger(EncodingMarshaller.class);
 
     private static enum As {
-    	ENCODABLE(0) {
-			@Override
-			public void writeObject(DataOutputExtended output, Object object) throws IOException {
-		    	writeTo(output);
-		        output.writeEncodable(object);
-			}
-			@Override
-			public <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException {
-				// not quite symmetrical with write; the byte has already been read from stream
-				// to determine which As instance to delegate to
-		        return input.readEncodable(cls);
-			}
-		},
-    	SERIALIZABLE(1) {
-			@Override
-			public void writeObject(DataOutputExtended output, Object object) throws IOException {
-		    	writeTo(output);
-		        output.writeSerializable(object);
-			}
-			@Override
-			public <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException {
-				// not quite symmetrical with write; the byte has already been read from stream
-				// to determine which As instance to delegate to
-		        return input.readSerializable(cls);
-			}
-		};
-    	static Map<Integer, As> cache = new HashMap<Integer, As>();
-    	static {
-    		for(As as: values()) {
-    			cache.put(as.idx, as);
-    		}
-    	}
-    	private final int idx;
-    	private As(int idx) {
-    		this.idx = idx;
-    	}
-    	static As get(int idx) {
-    		return cache.get(idx); 
-    	}
-		public static As readFrom(DataInputExtended input) throws IOException {
-			return get(input.readByte());
-		}
-		public void writeTo(DataOutputExtended output) throws IOException {
-			output.writeByte(idx);
-		}
-		public abstract void writeObject(DataOutputExtended output, Object object) throws IOException;
-		public abstract <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException;
+        ENCODABLE(0) {
+            @Override
+            public void writeObject(DataOutputExtended output, Object object) throws IOException {
+                writeTo(output);
+                output.writeEncodable(object);
+            }
+
+            @Override
+            public <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException {
+                // not quite symmetrical with write; the byte has already been read from stream
+                // to determine which As instance to delegate to
+                return input.readEncodable(cls);
+            }
+        },
+        SERIALIZABLE(1) {
+            @Override
+            public void writeObject(DataOutputExtended output, Object object) throws IOException {
+                writeTo(output);
+                output.writeSerializable(object);
+            }
+
+            @Override
+            public <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException {
+                // not quite symmetrical with write; the byte has already been read from stream
+                // to determine which As instance to delegate to
+                return input.readSerializable(cls);
+            }
+        };
+        static Map<Integer, As> cache = new HashMap<Integer, As>();
+        static {
+            for (As as : values()) {
+                cache.put(as.idx, as);
+            }
+        }
+        private final int idx;
+
+        private As(int idx) {
+            this.idx = idx;
+        }
+
+        static As get(int idx) {
+            return cache.get(idx);
+        }
+
+        public static As readFrom(DataInputExtended input) throws IOException {
+            return get(input.readByte());
+        }
+
+        public void writeTo(DataOutputExtended output) throws IOException {
+            output.writeByte(idx);
+        }
+
+        public abstract void writeObject(DataOutputExtended output, Object object) throws IOException;
+
+        public abstract <T> T readObject(DataInputExtended input, Class<T> cls) throws IOException;
     }
-    
 
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // Properties
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
+
+    private boolean debugging;
 
-	private boolean debugging;
-	
     private DataInputExtended input;
     private DataOutputExtended output;
 
-
-
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // Common to both ClientMarshaller and ServerMarshaller
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
 
     @Override
     public void init() {
-    	super.init();
-        debugging = getConfiguration().getBoolean(MarshallingConstants.DEBUGGING_KEY, MarshallingConstants.DEBUGGING_DEFAULT);
+        super.init();
+        debugging =
+            getConfiguration().getBoolean(MarshallingConstants.DEBUGGING_KEY, MarshallingConstants.DEBUGGING_DEFAULT);
         if (LOG.isInfoEnabled()) {
-        	LOG.info("debugging=" + debugging);
+            LOG.info("debugging=" + debugging);
         }
     }
 
-
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // Common to both ClientMarshaller and ServerMarshaller
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
 
     @Override
     public void connect() throws IOException {
-    	super.connect();
-    	
-    	this.input =  new DataInputStreamExtended(getTransport().getInputStream());
-    	this.output =  new DataOutputStreamExtended(getTransport().getOutputStream());
-    	
-    	if(debugging) {
-	    	this.input = new DebugDataInputExtended(input);
-	        this.output = new DebugDataOutputExtended(output);
-    	}
+        super.connect();
+
+        this.input = new DataInputStreamExtended(getTransport().getInputStream());
+        this.output = new DataOutputStreamExtended(getTransport().getOutputStream());
+
+        if (debugging) {
+            this.input = new DebugDataInputExtended(input);
+            this.output = new DebugDataOutputExtended(output);
+        }
     }
 
     private void writeToOutput(final Object object) throws IOException {
-    	// expect to be either Encodable or Serializable, prefer the former.
-    	if (object instanceof Encodable) {
-    		As.ENCODABLE.writeObject(output, object);
-    	} else {
-    		As.SERIALIZABLE.writeObject(output, object);
-    	}
+        // expect to be either Encodable or Serializable, prefer the former.
+        if (object instanceof Encodable) {
+            As.ENCODABLE.writeObject(output, object);
+        } else {
+            As.SERIALIZABLE.writeObject(output, object);
+        }
         output.flush();
     }
 
     private <T> T readFromInput(Class<T> cls) throws IOException {
-    	As as = As.readFrom(input);
-    	return as.readObject(input, cls);
+        As as = As.readFrom(input);
+        return as.readObject(input, cls);
     }
 
-    
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // ClientMarshaller impl
-    //////////////////////////////////////////////////////////////////
-    
+    // ////////////////////////////////////////////////////////////////
 
+    @Override
     public Object request(final Request request) throws IOException {
         if (LOG.isDebugEnabled()) {
             LOG.debug("sending request " + request);
@@ -185,11 +185,11 @@ public class EncodingMarshaller extends 
         return object;
     }
 
-    
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
     // ServerMarshaller impl
-    //////////////////////////////////////////////////////////////////
+    // ////////////////////////////////////////////////////////////////
 
+    @Override
     public Request readRequest() throws IOException {
         final Request request = readFromInput(Request.class);
         if (LOG.isDebugEnabled()) {
@@ -198,18 +198,20 @@ public class EncodingMarshaller extends 
         return request;
     }
 
+    @Override
     public void sendResponse(final Object response) throws IOException {
         if (LOG.isDebugEnabled()) {
-		    LOG.debug("send response: " + response);
-		}
-		writeToOutput(response);
+            LOG.debug("send response: " + response);
+        }
+        writeToOutput(response);
     }
 
+    @Override
     public void sendError(final IsisException exception) throws IOException {
         if (LOG.isDebugEnabled()) {
-		    LOG.debug("send error: " + exception);
-		}
-		writeToOutput(exception);
+            LOG.debug("send error: " + exception);
+        }
+        writeToOutput(exception);
     }
 
 }

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java Wed Nov 17 07:24:36 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.serialize;
 
 import java.io.IOException;
@@ -26,47 +25,45 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.net.SocketException;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.alternatives.remoting.common.exchange.Request;
 import org.apache.isis.alternatives.remoting.common.marshalling.MarshallerAbstract;
 import org.apache.isis.alternatives.remoting.common.protocol.IllegalRequestException;
-import org.apache.isis.alternatives.remoting.common.transport.ConnectionException;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.log4j.Logger;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
-
 public class SerializingMarshaller extends MarshallerAbstract {
 
-	private static final Logger LOG = Logger.getLogger(SerializingMarshaller.class);
+    private static final Logger LOG = Logger.getLogger(SerializingMarshaller.class);
 
     private ObjectInputStream input;
     private ObjectOutputStream output;
 
-    public SerializingMarshaller(
-    		final IsisConfiguration configuration,
-    		final Transport transport) {
-    	super(configuration, transport);
+    public SerializingMarshaller(final IsisConfiguration configuration, final Transport transport) {
+        super(configuration, transport);
     }
 
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // connect (client-side impl)
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
     @Override
     public void connect() throws IOException {
-    	super.connect();
+        super.connect();
 
-    	this.input = new ObjectInputStream(getTransport().getInputStream());
+        this.input = new ObjectInputStream(getTransport().getInputStream());
         this.output = new ObjectOutputStream(getTransport().getOutputStream());
     }
 
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // ServerMarshaller impl
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
+    @Override
     public Object request(final Request request) throws IOException {
         try {
             if (LOG.isDebugEnabled()) {
@@ -87,8 +84,8 @@ public class SerializingMarshaller exten
             return object;
             /*
              * } catch (StreamCorruptedException e) { try { int available = input.available();
-             * LOG.debug("error in reading; skipping bytes: " + available); input.skip(available); } catch
-             * (IOException e1) { e1.printStackTrace(); } throw new ConnectionException(e.getMessage(), e);
+             * LOG.debug("error in reading; skipping bytes: " + available); input.skip(available); } catch (IOException
+             * e1) { e1.printStackTrace(); } throw new ConnectionException(e.getMessage(), e);
              */
         } catch (final ClassNotFoundException e) {
             throw new ConnectionException("Failed request", e);
@@ -97,14 +94,14 @@ public class SerializingMarshaller exten
 
     @SuppressWarnings("BC_UNCONFIRMED_CAST")
     private Serializable asSerializable(final Request request) {
-        return (Serializable)request;
+        return (Serializable) request;
     }
 
-
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // ServerMarshaller impl
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
+    @Override
     public Request readRequest() throws IOException {
         try {
             final Request request = (Request) input.readObject();
@@ -114,10 +111,12 @@ public class SerializingMarshaller exten
         }
     }
 
+    @Override
     public void sendError(final IsisException exception) throws IOException {
         send(exception);
     }
 
+    @Override
     public void sendResponse(final Object response) throws IOException {
         send(response);
     }

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java Wed Nov 17 07:24:36 2010
@@ -17,44 +17,41 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.xstream.client;
 
 import java.util.List;
 
-import org.apache.isis.alternatives.remoting.client.ProxyInstallerAbstract;
+import org.apache.isis.alternatives.remoting.common.client.ProxyInstallerAbstract;
+import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
 import org.apache.isis.alternatives.remoting.marshalling.xstream.shared.XStreamMarshaller;
 import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
-import org.apache.isis.remoting.marshalling.ClientMarshaller;
-
 
 public class XStreamOverSocketsProxyDecoratorInstaller extends ProxyInstallerAbstract {
 
     public XStreamOverSocketsProxyDecoratorInstaller() {
-		super("xstream-sockets");
-	}
+        super("xstream-sockets");
+    }
 
-	@Override
-	protected void addConfigurationResources(List<String> configurationResources) {
-		super.addConfigurationResources(configurationResources);
-		// TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
-		// and Transport using the installers.
-		configurationResources.add("protocol.properties");
-		configurationResources.add("protocol_xstream.properties");
-		configurationResources.add("transport.properties");
-		configurationResources.add("transport_sockets.properties");
-	}
+    @Override
+    protected void addConfigurationResources(List<String> configurationResources) {
+        super.addConfigurationResources(configurationResources);
+        // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+        // and Transport using the installers.
+        configurationResources.add("protocol.properties");
+        configurationResources.add("protocol_xstream.properties");
+        configurationResources.add("transport.properties");
+        configurationResources.add("transport_sockets.properties");
+    }
 
     @Override
     protected Transport createTransport() {
-    	return new SocketTransport(getConfiguration());
+        return new SocketTransport(getConfiguration());
     }
-    
+
     @Override
-	protected ClientMarshaller createMarshaller(Transport transport) {
-		return new XStreamMarshaller(getConfiguration(), transport);
-	}
+    protected ClientMarshaller createMarshaller(Transport transport) {
+        return new XStreamMarshaller(getConfiguration(), transport);
+    }
 
 }
-

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java Wed Nov 17 07:24:36 2010
@@ -17,42 +17,37 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.xstream.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.isis.alternatives.remoting.facade.ServerFacade;
+import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
+import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.alternatives.remoting.marshalling.xstream.shared.XStreamMarshaller;
 import org.apache.isis.alternatives.remoting.server.ServerConnection;
 import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
 import org.apache.isis.alternatives.remoting.transport.ConnectionException;
 import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
 import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
-import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-
 
 public class XStreamOverSocketsViewer extends SocketsViewerAbstract {
-	
+
     public XStreamOverSocketsViewer(ObjectEncoderDecoder objectEncoderDecoder) {
-    	super(objectEncoderDecoder);
-	}
+        super(objectEncoderDecoder);
+    }
 
-	@Override
-    protected ServerConnection createServerConnection(
-            final InputStream input,
-            final OutputStream output,
-            final ServerFacade distribution) {
-    	SimpleTransport transport = new SimpleTransport(getConfiguration(), input, output);
+    @Override
+    protected ServerConnection createServerConnection(final InputStream input, final OutputStream output,
+        final ServerFacade distribution) {
+        SimpleTransport transport = new SimpleTransport(getConfiguration(), input, output);
         XStreamMarshaller serverMarshaller = new XStreamMarshaller(getConfiguration(), transport);
         try {
-			serverMarshaller.connect();
+            serverMarshaller.connect();
         } catch (IOException e) {
             throw new ConnectionException(e);
         }
         return new ServerConnectionDefault(distribution, serverMarshaller);
     }
 }
-

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java Wed Nov 17 07:24:36 2010
@@ -17,46 +17,43 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.xstream.server;
 
 import java.util.List;
 
+import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
 import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerInstallerAbstract;
 import org.apache.isis.core.runtime.Isis;
 import org.apache.isis.core.runtime.viewer.IsisViewer;
-import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-
 
 /**
- * Implementation of a {@link IsisViewer} providing the ability to run
- * from server as a {@link Isis command line} application.
+ * Implementation of a {@link IsisViewer} providing the ability to run from server as a {@link Isis command line}
+ * application.
  * 
  * <p>
- * To run, use the <tt>--viewer xstream-sockets</tt> flag. The client-side
- * should run using <tt>--connector xstream-sockets</tt> flag.
+ * To run, use the <tt>--viewer xstream-sockets</tt> flag. The client-side should run using
+ * <tt>--connector xstream-sockets</tt> flag.
  */
 public class XStreamOverSocketsViewerInstaller extends SocketsViewerInstallerAbstract {
 
     public XStreamOverSocketsViewerInstaller() {
-		super("xstream-sockets");
-	}
+        super("xstream-sockets");
+    }
 
-	@Override
-	protected void addConfigurationResources(List<String> configurationResources) {
-		super.addConfigurationResources(configurationResources);
-		// TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
-		// and Transport using the installers.
-		configurationResources.add("protocol.properties");
-		configurationResources.add("protocol_xstream.properties");
-		configurationResources.add("transport.properties");
-		configurationResources.add("transport_sockets.properties");
-	}
+    @Override
+    protected void addConfigurationResources(List<String> configurationResources) {
+        super.addConfigurationResources(configurationResources);
+        // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+        // and Transport using the installers.
+        configurationResources.add("protocol.properties");
+        configurationResources.add("protocol_xstream.properties");
+        configurationResources.add("transport.properties");
+        configurationResources.add("transport_sockets.properties");
+    }
 
-	@Override
+    @Override
     protected SocketsViewerAbstract createSocketsViewer(ObjectEncoderDecoder objectEncoderDecoder) {
         return new XStreamOverSocketsViewer(objectEncoderDecoder);
     }
 }
-

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java Wed Nov 17 07:24:36 2010
@@ -17,7 +17,6 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.marshalling.xstream.shared;
 
 import java.io.IOException;
@@ -26,48 +25,45 @@ import java.io.ObjectOutputStream;
 import java.io.StreamCorruptedException;
 import java.net.SocketException;
 
-import org.apache.isis.alternatives.remoting.exchange.Request;
+import org.apache.isis.alternatives.remoting.common.exchange.Request;
+import org.apache.isis.alternatives.remoting.common.marshalling.MarshallerAbstract;
+import org.apache.isis.alternatives.remoting.common.protocol.IllegalRequestException;
 import org.apache.isis.alternatives.remoting.transport.ConnectionException;
 import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.marshalling.MarshallerAbstract;
-import org.apache.isis.remoting.protocol.IllegalRequestException;
 import org.apache.log4j.Logger;
 
 import com.thoughtworks.xstream.XStream;
 
-
 public class XStreamMarshaller extends MarshallerAbstract {
-    
-	private static final Logger LOG = Logger.getLogger(XStreamMarshaller.class);
+
+    private static final Logger LOG = Logger.getLogger(XStreamMarshaller.class);
     private final XStream xstream = new XStream();
     private ObjectInputStream input;
     private ObjectOutputStream output;
 
-    public XStreamMarshaller(
-    		final IsisConfiguration configuration,
-    		final Transport transport) {
-    	super(configuration, transport);
-    }
-    
-    
-    ////////////////////////////////////////////////////////
+    public XStreamMarshaller(final IsisConfiguration configuration, final Transport transport) {
+        super(configuration, transport);
+    }
+
+    // //////////////////////////////////////////////////////
     // common Marshaller impl
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
+
+    @Override
+    public void connect() throws IOException {
+        super.connect();
 
-	public void connect() throws IOException {
-		super.connect();
-    	
-    	this.output = new ObjectOutputStream(getTransport().getOutputStream());
+        this.output = new ObjectOutputStream(getTransport().getOutputStream());
         this.input = new ObjectInputStream(getTransport().getInputStream());
     }
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // ServerMarshaller impl
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
 
+    @Override
     public Object request(final Request request) throws IOException {
         final String requestData = xstream.toXML(request);
         if (LOG.isInfoEnabled()) {
@@ -106,12 +102,11 @@ public class XStreamMarshaller extends M
         }
     }
 
-    
-    ////////////////////////////////////////////////////////
+    // //////////////////////////////////////////////////////
     // ServerMarshaller impl
-    ////////////////////////////////////////////////////////
-    
-    
+    // //////////////////////////////////////////////////////
+
+    @Override
     public Request readRequest() throws IOException {
         try {
             final String requestData = (String) input.readObject();
@@ -125,11 +120,13 @@ public class XStreamMarshaller extends M
         }
     }
 
+    @Override
     public void sendError(final IsisException exception) throws IOException {
         final String responseData = xstream.toXML(exception);
         sendData(responseData);
     }
 
+    @Override
     public void sendResponse(final Object response) throws IOException {
         final String responseData = xstream.toXML(response);
         sendData(responseData);
@@ -143,5 +140,4 @@ public class XStreamMarshaller extends M
         output.flush();
     }
 
-
 }

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java Wed Nov 17 07:24:36 2010
@@ -22,8 +22,8 @@ package org.apache.isis.alternatives.rem
 import java.util.List;
 
 import org.apache.isis.alternatives.remoting.common.client.ProxyInstallerAbstract;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 
 public class EncodingOverHttpProxyInstaller extends ProxyInstallerAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java Wed Nov 17 07:24:36 2010
@@ -17,9 +17,8 @@
  *  under the License.
  */
 
+package org.apache.isis.alternatives.remoting.transport.http.client;
 
-package org.apache.isis.alternatives.remoting.transport.http.client;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,94 +28,90 @@ import java.io.OutputStream;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.isis.alternatives.remoting.common.transport.TransportAbstract;
+import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
 import org.apache.isis.core.commons.io.LazyInputStream;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-
-public class HttpClientTransport extends TransportAbstract {
-
-	private HttpClient httpClient;
-	private String url;
-
-	private ByteArrayOutputStream outputStream;
-	private InputStream inputStream;
-
-	public HttpClientTransport(IsisConfiguration configuration) {
-		super(configuration);
-	}
-
-	// ///////////////////////////////////////////////////////////
-	// init, shutdown
-	// ///////////////////////////////////////////////////////////
-
-	public void init() {
-		httpClient = new HttpClient();
-		url = getConfiguration().getString(
-				HttpRemotingConstants.URL_KEY,
-				HttpRemotingConstants.URL_DEFAULT);
-	}
-
-	public void shutdown() {
-		httpClient = null;
-	}
-
-	// ///////////////////////////////////////////////////////////
-	// connect, disconnect
-	// ///////////////////////////////////////////////////////////
-
-	public void connect() throws IOException {
-		outputStream = new ByteArrayOutputStream();
-	}
-
-	public void disconnect() {
-		inputStream = null;
-		outputStream = null;
-	}
-
-	// ///////////////////////////////////////////////////////////
-	// streams
-	// ///////////////////////////////////////////////////////////
-
-	/**
-	 * Returns an {@link OutputStream} that writes into the request body of an
-	 * HTTP POST, and will send on {@link OutputStream#flush() flush}.
-	 */
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	/**
-	 * When first called, executes the HTTP POST, then returns the response
-	 * body.
-	 * 
-	 * <p>
-	 * Subsequent calls return the same input stream, at whatever position they
-	 * have been processed.
-	 */
-	public InputStream getInputStream() throws IOException {
-		if (inputStream == null) {
-			inputStream = new LazyInputStream(
-				new LazyInputStream.InputStreamProvider() {
-					public InputStream getInputStream() throws IOException {
-						PostMethod postMethod = new PostMethod(url);
-						
-						// copy over
-						InputStreamRequestEntity requestEntity = new InputStreamRequestEntity(
-								new ByteArrayInputStream(outputStream.toByteArray()));
-						postMethod.setRequestEntity(requestEntity);
-						
-						// execute
-						httpClient.executeMethod(postMethod);
-						
-						// clear for next time
-						outputStream.reset();
-						
-						// return response
-						return postMethod.getResponseBodyAsStream();
-					}
-				});
-		}
-		return inputStream;
-	}
-
-}
+
+public class HttpClientTransport extends TransportAbstract {
+
+    private HttpClient httpClient;
+    private String url;
+
+    private ByteArrayOutputStream outputStream;
+    private InputStream inputStream;
+
+    public HttpClientTransport(IsisConfiguration configuration) {
+        super(configuration);
+    }
+
+    // ///////////////////////////////////////////////////////////
+    // init, shutdown
+    // ///////////////////////////////////////////////////////////
+
+    public void init() {
+        httpClient = new HttpClient();
+        url = getConfiguration().getString(HttpRemotingConstants.URL_KEY, HttpRemotingConstants.URL_DEFAULT);
+    }
+
+    public void shutdown() {
+        httpClient = null;
+    }
+
+    // ///////////////////////////////////////////////////////////
+    // connect, disconnect
+    // ///////////////////////////////////////////////////////////
+
+    public void connect() throws IOException {
+        outputStream = new ByteArrayOutputStream();
+    }
+
+    public void disconnect() {
+        inputStream = null;
+        outputStream = null;
+    }
+
+    // ///////////////////////////////////////////////////////////
+    // streams
+    // ///////////////////////////////////////////////////////////
+
+    /**
+     * Returns an {@link OutputStream} that writes into the request body of an HTTP POST, and will send on
+     * {@link OutputStream#flush() flush}.
+     */
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    /**
+     * When first called, executes the HTTP POST, then returns the response body.
+     * 
+     * <p>
+     * Subsequent calls return the same input stream, at whatever position they have been processed.
+     */
+    public InputStream getInputStream() throws IOException {
+        if (inputStream == null) {
+            inputStream = new LazyInputStream(new LazyInputStream.InputStreamProvider() {
+                @Override
+                public InputStream getInputStream() throws IOException {
+                    PostMethod postMethod = new PostMethod(url);
+
+                    // copy over
+                    InputStreamRequestEntity requestEntity =
+                        new InputStreamRequestEntity(new ByteArrayInputStream(outputStream.toByteArray()));
+                    postMethod.setRequestEntity(requestEntity);
+
+                    // execute
+                    httpClient.executeMethod(postMethod);
+
+                    // clear for next time
+                    outputStream.reset();
+
+                    // return response
+                    return postMethod.getResponseBodyAsStream();
+                }
+            });
+        }
+        return inputStream;
+    }
+
+}

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java Wed Nov 17 07:24:36 2010
@@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
-import org.apache.isis.alternatives.remoting.common.protocol.internal.ObjectEncoderDecoderDefault;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnection;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnectionDefault;
-import org.apache.isis.alternatives.remoting.common.transport.ServerConnectionHandler;
-import org.apache.isis.alternatives.remoting.common.transport.simple.SimpleTransport;
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
+import org.apache.isis.alternatives.remoting.transport.ServerConnectionHandler;
+import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.system.IsisSystem;
 import org.apache.isis.core.webapp.IsisWebAppBootstrapper;

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java Wed Nov 17 07:24:36 2010
@@ -17,43 +17,41 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.transport.sockets.client;
 
 import java.util.List;
 
 import org.apache.isis.alternatives.remoting.common.client.ProxyInstallerAbstract;
 import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
 
-
 public class EncodingOverSocketsProxyInstaller extends ProxyInstallerAbstract {
 
     public EncodingOverSocketsProxyInstaller() {
-		super("encoding-sockets");
-	}
+        super("encoding-sockets");
+    }
 
-	@Override
-	protected void addConfigurationResources(List<String> configurationResources) {
-		super.addConfigurationResources(configurationResources);
-		// TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
-		// and Transport using the installers.
-		configurationResources.add("protocol.properties");
-		configurationResources.add("protocol_encoding.properties");
-		configurationResources.add("transport.properties");
-		configurationResources.add("transport_sockets.properties");
-	}
+    @Override
+    protected void addConfigurationResources(List<String> configurationResources) {
+        super.addConfigurationResources(configurationResources);
+        // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+        // and Transport using the installers.
+        configurationResources.add("protocol.properties");
+        configurationResources.add("protocol_encoding.properties");
+        configurationResources.add("transport.properties");
+        configurationResources.add("transport_sockets.properties");
+    }
 
     @Override
     protected Transport createTransport() {
-    	return new SocketTransport(getConfiguration());
+        return new SocketTransport(getConfiguration());
     }
-    
+
     @Override
-	protected ClientMarshaller createMarshaller(Transport transport) {
-		return new EncodingMarshaller(getConfiguration(), transport);
-	}
+    protected ClientMarshaller createMarshaller(Transport transport) {
+        return new EncodingMarshaller(getConfiguration(), transport);
+    }
 
 }

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java Wed Nov 17 07:24:36 2010
@@ -17,44 +17,41 @@
  *  under the License.
  */
 
-
 package org.apache.isis.alternatives.remoting.transport.sockets.client;
 
 import java.util.List;
 
 import org.apache.isis.alternatives.remoting.common.client.ProxyInstallerAbstract;
 import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
 import org.apache.isis.alternatives.remoting.marshalling.serialize.SerializingMarshaller;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
 
-
 public class SerializingOverSocketsProxyInstaller extends ProxyInstallerAbstract {
 
     public SerializingOverSocketsProxyInstaller() {
-		super("serializing-sockets");
-	}
+        super("serializing-sockets");
+    }
+
+    @Override
+    protected void addConfigurationResources(List<String> configurationResources) {
+        super.addConfigurationResources(configurationResources);
+        // TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
+        // and Transport using the installers.
+        configurationResources.add("protocol.properties");
+        configurationResources.add("protocol_serializing.properties");
+        configurationResources.add("transport.properties");
+        configurationResources.add("transport_sockets.properties");
+    }
 
-	@Override
-	protected void addConfigurationResources(List<String> configurationResources) {
-		super.addConfigurationResources(configurationResources);
-		// TODO: this (small) hack is because we don't load up the Protocol (Marshaller)
-		// and Transport using the installers.
-		configurationResources.add("protocol.properties");
-		configurationResources.add("protocol_serializing.properties");
-		configurationResources.add("transport.properties");
-		configurationResources.add("transport_sockets.properties");
-	}
-
-
-	@Override
-	protected Transport createTransport() {
-		return new SocketTransport(getConfiguration());
-	}
+    @Override
+    protected Transport createTransport() {
+        return new SocketTransport(getConfiguration());
+    }
 
     @Override
-	protected ClientMarshaller createMarshaller(Transport transport) {
-		return new SerializingMarshaller(getConfiguration(), transport);
-	}
-	
+    protected ClientMarshaller createMarshaller(Transport transport) {
+        return new SerializingMarshaller(getConfiguration(), transport);
+    }
+
 }

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java Wed Nov 17 07:24:36 2010
@@ -26,10 +26,10 @@ import java.io.OutputStream;
 
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnectionDefault;
-import org.apache.isis.alternatives.remoting.common.transport.ConnectionException;
-import org.apache.isis.alternatives.remoting.common.transport.simple.SimpleTransport;
 import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
 
 
 public class EncodingOverSocketsViewer extends SocketsViewerAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java Wed Nov 17 07:24:36 2010
@@ -26,11 +26,11 @@ import java.io.OutputStream;
 
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnection;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnectionDefault;
-import org.apache.isis.alternatives.remoting.common.transport.ConnectionException;
-import org.apache.isis.alternatives.remoting.common.transport.simple.SimpleTransport;
 import org.apache.isis.alternatives.remoting.marshalling.serialize.SerializingMarshaller;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
 
 
 public class SerializingOverSocketsViewer extends SocketsViewerAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java Wed Nov 17 07:24:36 2010
@@ -27,10 +27,10 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.apache.log4j.Logger;
-import org.apache.isis.alternatives.remoting.facade.ServerFacade;
-import org.apache.isis.alternatives.remoting.facade.ServerFacadeLogger;
-import org.apache.isis.alternatives.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
+import org.apache.isis.alternatives.remoting.common.facade.ServerFacadeLogger;
+import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
+import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.alternatives.remoting.server.ServerConnection;
 import org.apache.isis.alternatives.remoting.transport.ConnectionException;
 import org.apache.isis.alternatives.remoting.transport.ProfilingInputStream;
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtime.syst
 import org.apache.isis.core.runtime.system.internal.monitor.HttpServerMonitor;
 import org.apache.isis.core.runtime.system.internal.monitor.SocketServerMonitor;
 import org.apache.isis.core.runtime.viewer.IsisViewerAbstract;
-import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.log4j.Logger;
 
 
 public abstract class SocketsViewerAbstract extends IsisViewerAbstract implements DebugInfo {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java Wed Nov 17 07:24:36 2010
@@ -17,27 +17,25 @@
  *  under the License.
  */
 
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
-package org.apache.isis.alternatives.remoting.transport.sockets.server;
-
+import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.core.runtime.viewer.IsisViewer;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract;
-import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-
-public abstract class SocketsViewerInstallerAbstract extends IsisViewerInstallerAbstract {
-
-	public SocketsViewerInstallerAbstract(String name) {
-		super(name);
-	}
-
-	@Override
-    public IsisViewer doCreateViewer() {
-        ObjectEncoderDecoderDefault encoder = 
-        	ObjectEncoderDecoderDefault.create(getConfiguration());
-        return createSocketsViewer(encoder);
-    }
-	
-    protected abstract IsisViewer createSocketsViewer(ObjectEncoderDecoder objectEncoderDecoder);
-
-}
+
+public abstract class SocketsViewerInstallerAbstract extends IsisViewerInstallerAbstract {
+
+    public SocketsViewerInstallerAbstract(String name) {
+        super(name);
+    }
+
+    @Override
+    public IsisViewer doCreateViewer() {
+        ObjectEncoderDecoderDefault encoder = ObjectEncoderDecoderDefault.create(getConfiguration());
+        return createSocketsViewer(encoder);
+    }
+
+    protected abstract IsisViewer createSocketsViewer(ObjectEncoderDecoder objectEncoderDecoder);
+
+}

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java Wed Nov 17 07:24:36 2010
@@ -21,21 +21,21 @@
 package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
 import static org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants.PORT_DEFAULT;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.apache.log4j.Logger;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
 import org.apache.isis.alternatives.remoting.transport.ConnectionException;
 import org.apache.isis.alternatives.remoting.transport.ProfilingInputStream;
 import org.apache.isis.alternatives.remoting.transport.ProfilingOutputStream;
 import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.log4j.Logger;
 
 public class SocketTransport extends TransportAbstract {
 



Mime
View raw message