incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1031974 [4/4] - in /incubator/isis/trunk/alternatives/remoting: common/src/main/java/org/apache/isis/remoting/client/ common/src/main/java/org/apache/isis/remoting/client/authentication/ common/src/main/java/org/apache/isis/remoting/client...
Date Sat, 06 Nov 2010 08:46:39 GMT
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java Sat Nov  6 08:46:35 2010
@@ -20,36 +20,36 @@
 
 package org.apache.isis.remoting.server;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.remoting.data.DummyReferenceData;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.exchange.ClearAssociationRequest;
-import org.apache.isis.remoting.exchange.ClearAssociationResponse;
-import org.apache.isis.remoting.exchange.SetAssociationRequest;
-import org.apache.isis.remoting.exchange.SetAssociationResponse;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyAssociation;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.remoting.data.DummyReferenceData;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.exchange.ClearAssociationRequest;
+import org.apache.isis.remoting.exchange.ClearAssociationResponse;
+import org.apache.isis.remoting.exchange.SetAssociationRequest;
+import org.apache.isis.remoting.exchange.SetAssociationResponse;
+import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.persistence.ConcurrencyException;
+import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.runtime.testsystem.TestProxyAssociation;
+import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java Sat Nov  6 08:46:35 2010
@@ -20,42 +20,42 @@
 
 package org.apache.isis.remoting.server;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
-import org.apache.isis.remoting.data.DummyIdentityData;
-import org.apache.isis.remoting.data.DummyObjectData;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
-import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
-import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
-import org.apache.isis.runtime.testsystem.TestProxySession;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
+import org.apache.isis.remoting.data.DummyIdentityData;
+import org.apache.isis.remoting.data.DummyObjectData;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
+import org.apache.isis.remoting.exchange.KnownObjectsRequest;
+import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.persistence.ConcurrencyException;
+import org.apache.isis.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.runtime.testsystem.TestProxySession;
+import org.apache.isis.runtime.testsystem.TestProxySystem;
+import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java Sat Nov  6 08:46:35 2010
@@ -20,40 +20,40 @@
 
 package org.apache.isis.remoting.server;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.remoting.data.DummyEncodeableObjectData;
-import org.apache.isis.remoting.data.DummyReferenceData;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.exchange.ClearValueRequest;
-import org.apache.isis.remoting.exchange.ClearValueResponse;
-import org.apache.isis.remoting.exchange.SetValueRequest;
-import org.apache.isis.remoting.exchange.SetValueResponse;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
-import org.apache.isis.runtime.testsystem.TestProxyAssociation;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.remoting.data.DummyEncodeableObjectData;
+import org.apache.isis.remoting.data.DummyReferenceData;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.exchange.ClearValueRequest;
+import org.apache.isis.remoting.exchange.ClearValueResponse;
+import org.apache.isis.remoting.exchange.SetValueRequest;
+import org.apache.isis.remoting.exchange.SetValueResponse;
+import org.apache.isis.remoting.facade.ServerFacade;
+import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.persistence.ConcurrencyException;
+import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
+import org.apache.isis.runtime.testsystem.TestProxyAssociation;
+import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java Sat Nov  6 08:46:35 2010
@@ -21,42 +21,41 @@
 package org.apache.isis.remoting.server;
 
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.remoting.data.DummyIdentityData;
-import org.apache.isis.remoting.data.DummyObjectData;
-import org.apache.isis.remoting.data.DummyReferenceData;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
-import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.testdomain.Movie;
-import org.apache.isis.runtime.testsystem.TestProxyAdapter;
-import org.apache.isis.runtime.testsystem.TestProxySession;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
+
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.remoting.data.DummyIdentityData;
+import org.apache.isis.remoting.data.DummyObjectData;
+import org.apache.isis.remoting.data.DummyReferenceData;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
+import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.runtime.testsystem.TestProxySession;
+import org.apache.isis.runtime.testsystem.TestProxySystem;
+import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-encode/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-encode/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-encode/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-encode/pom.xml Sat Nov  6 08:46:35 2010
@@ -40,30 +40,10 @@
     </reporting>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-		    <artifactId>runtime</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>common</artifactId>
         </dependency>
-
 	</dependencies>
 
 </project>

Copied: incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/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?p2=incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingMarshaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.protocol.encoding;
+package org.apache.isis.alternatives.remoting.marshalling.encode;
 
 import java.io.IOException;
 import java.net.SocketException;
@@ -36,8 +36,8 @@ import org.apache.isis.metamodel.encodin
 import org.apache.isis.metamodel.encoding.DebugDataOutputExtended;
 import org.apache.isis.metamodel.encoding.Encodable;
 import org.apache.isis.remoting.exchange.Request;
-import org.apache.isis.remoting.protocol.MarshallerAbstract;
-import org.apache.isis.remoting.protocol.ProtocolConstants;
+import org.apache.isis.remoting.marshalling.MarshallerAbstract;
+import org.apache.isis.remoting.marshalling.MarshallingConstants;
 import org.apache.isis.remoting.transport.Transport;
 
 
@@ -120,7 +120,7 @@ public class EncodingMarshaller extends 
     @Override
     public void init() {
     	super.init();
-        debugging = getConfiguration().getBoolean(ProtocolConstants.DEBUGGING_KEY, ProtocolConstants.DEBUGGING_DEFAULT);
+        debugging = getConfiguration().getBoolean(MarshallingConstants.DEBUGGING_KEY, MarshallingConstants.DEBUGGING_DEFAULT);
         if (LOG.isInfoEnabled()) {
         	LOG.info("debugging=" + debugging);
         }

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-serialize/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-serialize/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-serialize/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-serialize/pom.xml Sat Nov  6 08:46:35 2010
@@ -40,30 +40,10 @@
     </reporting>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-		    <artifactId>runtime</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>common</artifactId>
         </dependency>
-
 	</dependencies>
 
 </project>

Copied: incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/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?p2=incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/serialize/SerializingMarshaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/serialize/SerializingMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.protocol.serialize;
+package org.apache.isis.alternatives.remoting.marshalling.serialize;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -30,8 +30,8 @@ import org.apache.log4j.Logger;
 import org.apache.isis.commons.exceptions.IsisException;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.remoting.exchange.Request;
+import org.apache.isis.remoting.marshalling.MarshallerAbstract;
 import org.apache.isis.remoting.protocol.IllegalRequestException;
-import org.apache.isis.remoting.protocol.MarshallerAbstract;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.Transport;
 

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml Sat Nov  6 08:46:35 2010
@@ -59,6 +59,13 @@
 			<artifactId>common</artifactId>
 		</dependency>
 
+        <dependency>
+            <!-- required for sockets transport support -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>transport-sockets</artifactId>
+            <optional>true</optional>
+        </dependency>
+
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java Sat Nov  6 08:46:35 2010
@@ -22,11 +22,11 @@ package org.apache.isis.extensions.xstre
 
 import java.util.List;
 
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
 import org.apache.isis.extensions.xstream.shared.XStreamMarshaller;
 import org.apache.isis.remoting.client.ProxyInstallerAbstract;
-import org.apache.isis.remoting.protocol.ClientMarshaller;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
 import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.remoting.transport.socket.SocketTransport;
 
 
 public class XStreamOverSocketsProxyDecoratorInstaller extends ProxyInstallerAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewer.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewer.java Sat Nov  6 08:46:35 2010
@@ -24,12 +24,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
 import org.apache.isis.extensions.xstream.shared.XStreamMarshaller;
 import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.remoting.server.ServerConnection;
 import org.apache.isis.remoting.server.ServerConnectionDefault;
-import org.apache.isis.remoting.server.SocketsViewerAbstract;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.simple.SimpleTransport;
 

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java Sat Nov  6 08:46:35 2010
@@ -22,9 +22,9 @@ package org.apache.isis.extensions.xstre
 
 import java.util.List;
 
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.remoting.server.SocketsViewerAbstract;
-import org.apache.isis.remoting.server.SocketsViewerInstallerAbstract;
+import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
+import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerInstallerAbstract;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.runtime.Isis;
 import org.apache.isis.runtime.viewer.IsisViewer;
 

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java Sat Nov  6 08:46:35 2010
@@ -21,21 +21,19 @@
 package org.apache.isis.extensions.xstream.shared;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.OutputStream;
 import java.io.StreamCorruptedException;
 import java.net.SocketException;
 
-import org.apache.log4j.Logger;
 import org.apache.isis.commons.exceptions.IsisException;
 import org.apache.isis.metamodel.config.IsisConfiguration;
 import org.apache.isis.remoting.exchange.Request;
+import org.apache.isis.remoting.marshalling.MarshallerAbstract;
 import org.apache.isis.remoting.protocol.IllegalRequestException;
-import org.apache.isis.remoting.protocol.MarshallerAbstract;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.Transport;
+import org.apache.log4j.Logger;
 
 import com.thoughtworks.xstream.XStream;
 

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/client/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/pom.xml Sat Nov  6 08:46:35 2010
@@ -40,21 +40,24 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-        </dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.isis.alternatives.remoting</groupId>
 			<artifactId>common</artifactId>
 		</dependency>
+        
+        <dependency>
+            <!-- required for encoding marshalling -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-encode</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <!-- required for serialize marshalling -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-serialize</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+
 		<dependency>
 		    <groupId>commons-httpclient</groupId>
 		    <artifactId>commons-httpclient</artifactId>

Copied: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/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?p2=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java&p1=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/EncodingOverHttpProxyInstaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/EncodingOverHttpProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java Sat Nov  6 08:46:35 2010
@@ -17,41 +17,39 @@
  *  under the License.
  */
 
+package org.apache.isis.alternatives.remoting.transport.http.client;
 
-package org.apache.isis.extensions.remoting.http;
+import java.util.List;
 
-import org.apache.isis.extensions.remoting.http.transport.HttpClientTransport;
+import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
 import org.apache.isis.remoting.client.ProxyInstallerAbstract;
-import org.apache.isis.remoting.protocol.encoding.EncodingMarshaller;
 import org.apache.isis.remoting.transport.Transport;
-import java.util.List;
 
 public class EncodingOverHttpProxyInstaller extends ProxyInstallerAbstract {
 
     public EncodingOverHttpProxyInstaller() {
-		super("encoding-http");
-	}
-
-	@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_http.properties");
-	}
+        super("encoding-http");
+    }
 
+    @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_http.properties");
+    }
 
     @Override
-	protected EncodingMarshaller createMarshaller(Transport transport) {
-		return new EncodingMarshaller(getConfiguration(), transport);
-	}
+    protected EncodingMarshaller createMarshaller(Transport transport) {
+        return new EncodingMarshaller(getConfiguration(), transport);
+    }
 
     @Override
-	protected Transport createTransport() {
-		return new HttpClientTransport(getConfiguration());
-	}
+    protected Transport createTransport() {
+        return new HttpClientTransport(getConfiguration());
+    }
 
 }

Copied: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java (from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/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?p2=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java&p1=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/HttpClientTransport.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/HttpClientTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java Sat Nov  6 08:46:35 2010
@@ -18,21 +18,20 @@
  */
 
 
-package org.apache.isis.extensions.remoting.http.transport;
+package org.apache.isis.alternatives.remoting.transport.http.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-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.commons.io.LazyInputStream;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.extensions.remoting.http.HttpRemotingConstants;
-import org.apache.isis.remoting.transport.TransportAbstract;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+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.commons.io.LazyInputStream;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.remoting.transport.TransportAbstract;
 
 public class HttpClientTransport extends TransportAbstract {
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java (from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/HttpRemotingConstants.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/HttpRemotingConstants.java?p2=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java&p1=incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/HttpRemotingConstants.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/HttpRemotingConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java Sat Nov  6 08:46:35 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.extensions.remoting.http;
+package org.apache.isis.alternatives.remoting.transport.http.client;
 
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.metamodel.config.ConfigurationConstants;
 
 public class HttpRemotingConstants {
 	

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-http/server/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/pom.xml Sat Nov  6 08:46:35 2010
@@ -42,18 +42,6 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-        </dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
 			<artifactId>webapp</artifactId>
 		</dependency>
 
@@ -61,6 +49,18 @@
 			<groupId>org.apache.isis.alternatives.remoting</groupId>
 			<artifactId>common</artifactId>
 		</dependency>
+        <dependency>
+            <!-- required for encoding marshalling -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-encode</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <!-- required for serialize marshalling -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-serialize</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
 	        <groupId>javax.servlet</groupId>

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=1031974&r1=1031826&r2=1031974&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 Sat Nov  6 08:46:35 2010
@@ -17,89 +17,80 @@
  *  under the License.
  */
 
+package org.apache.isis.alternatives.remoting.transport.http.server;
 
-package org.apache.isis.extensions.remoting.http;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.EncodingMarshaller;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoderDefault;
-import org.apache.isis.remoting.server.ServerConnection;
-import org.apache.isis.remoting.server.ServerConnectionDefault;
-import org.apache.isis.remoting.server.ServerConnectionHandler;
-import org.apache.isis.remoting.server.SocketsViewerAbstract;
-import org.apache.isis.remoting.transport.simple.SimpleTransport;
-import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.webapp.IsisWebAppBootstrapper;
-
-/**
- * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to
- * {@link ServerConnectionHandler}.
- */
-public class EncodingOverHttpRemotingServlet extends HttpServlet {
-
-	private static final long serialVersionUID = 1L;
-
-	private IsisSystem system;
-	private IsisConfiguration configuration;
-
-	private ServerFacadeImpl serverFacade;
-
-	@Override
-	public void init() throws ServletException {
-		super.init();
-		system = IsisWebAppBootstrapper
-				.getSystemBoundTo(getServletContext());
-		configuration = system.getConfiguration();
-
-		serverFacade = new ServerFacadeImpl(system.getSessionFactory()
-				.getAuthenticationManager());
-		serverFacade.setEncoder(ObjectEncoderDecoderDefault
-				.create(configuration));
-	}
-
-	@Override
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		ServletInputStream inputStream = request.getInputStream();
-		ServletOutputStream outputStream = response.getOutputStream();
-
-		ServerConnection serverConnection = createConnection(inputStream,
-				outputStream);
-
-		try {
-			new ServerConnectionHandler(serverConnection).handleRequest();
-		} catch (IOException ex) {
-			// REVIEW: is this enough, or should we try to return a more
-			// user-friendly exception or status?
-			throw ex;
-		} finally {
-			// nothing to do
-		}
-	}
-
-	private ServerConnection createConnection(ServletInputStream inputStream,
-			ServletOutputStream outputStream) throws IOException {
-
-		// TODO: should use installers to create these,
-		// provides the opportunity to read in installer-specific config files.
-		SimpleTransport transport = new SimpleTransport(configuration,
-				inputStream, outputStream);
-		EncodingMarshaller marshaller = new EncodingMarshaller(configuration,
-				transport);
-
-		// this is a no-op with the SimpleTransport, but include for consistency
-		marshaller.connect();
-
-		return new ServerConnectionDefault(serverFacade, marshaller);
-	}
-}
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.remoting.server.ServerConnection;
+import org.apache.isis.remoting.server.ServerConnectionDefault;
+import org.apache.isis.remoting.transport.ServerConnectionHandler;
+import org.apache.isis.remoting.transport.simple.SimpleTransport;
+import org.apache.isis.runtime.system.IsisSystem;
+import org.apache.isis.webapp.IsisWebAppBootstrapper;
+
+/**
+ * Analogous to {@link SocketsViewerAbstract}; both ultimately delegate to {@link ServerConnectionHandler}.
+ */
+public class EncodingOverHttpRemotingServlet extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+
+    private IsisSystem system;
+    private IsisConfiguration configuration;
+
+    private ServerFacadeImpl serverFacade;
+
+    @Override
+    public void init() throws ServletException {
+        super.init();
+        system = IsisWebAppBootstrapper.getSystemBoundTo(getServletContext());
+        configuration = system.getConfiguration();
+
+        serverFacade = new ServerFacadeImpl(system.getSessionFactory().getAuthenticationManager());
+        serverFacade.setEncoder(ObjectEncoderDecoderDefault.create(configuration));
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+        IOException {
+        ServletInputStream inputStream = request.getInputStream();
+        ServletOutputStream outputStream = response.getOutputStream();
+
+        ServerConnection serverConnection = createConnection(inputStream, outputStream);
+
+        try {
+            new ServerConnectionHandler(serverConnection).handleRequest();
+        } catch (IOException ex) {
+            // REVIEW: is this enough, or should we try to return a more
+            // user-friendly exception or status?
+            throw ex;
+        } finally {
+            // nothing to do
+        }
+    }
+
+    private ServerConnection createConnection(ServletInputStream inputStream, ServletOutputStream outputStream)
+        throws IOException {
+
+        // TODO: should use installers to create these,
+        // provides the opportunity to read in installer-specific config files.
+        SimpleTransport transport = new SimpleTransport(configuration, inputStream, outputStream);
+        EncodingMarshaller marshaller = new EncodingMarshaller(configuration, transport);
+
+        // this is a no-op with the SimpleTransport, but include for consistency
+        marshaller.connect();
+
+        return new ServerConnectionDefault(serverFacade, marshaller);
+    }
+}

Modified: incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.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/EncodingOverHttpRemotingViewerInstaller.java?rev=1031974&r1=1031826&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.remoting.http;
+package org.apache.isis.alternatives.remoting.transport.http.server;
 
 import java.util.List;
 

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/pom.xml?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/pom.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/pom.xml Sat Nov  6 08:46:35 2010
@@ -41,28 +41,24 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>metamodel</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-        </dependency>
-
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-		    <artifactId>runtime</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>runtime</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
+			<groupId>org.apache.isis.alternatives.remoting</groupId>
+		    <artifactId>common</artifactId>
 		</dependency>
 
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
+            <!-- required if using Serializing Marshaller -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-serialize</artifactId>
+            <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <!-- required if using Serializing Marshaller -->
+            <groupId>org.apache.isis.alternatives.remoting</groupId>
+            <artifactId>marshalling-encode</artifactId>
+            <optional>true</optional>
+        </dependency>
+
 	</dependencies>
 
 </project>

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/EncodingOverSocketsProxyInstaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/EncodingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java Sat Nov  6 08:46:35 2010
@@ -18,14 +18,15 @@
  */
 
 
-package org.apache.isis.remoting.client;
+package org.apache.isis.alternatives.remoting.transport.sockets.client;
 
 import java.util.List;
 
-import org.apache.isis.remoting.protocol.ClientMarshaller;
-import org.apache.isis.remoting.protocol.encoding.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
+import org.apache.isis.remoting.client.ProxyInstallerAbstract;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
 import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.remoting.transport.socket.SocketTransport;
 
 
 public class EncodingOverSocketsProxyInstaller extends ProxyInstallerAbstract {

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/SerializingOverSocketsProxyInstaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/SerializingOverSocketsProxyInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java Sat Nov  6 08:46:35 2010
@@ -18,14 +18,15 @@
  */
 
 
-package org.apache.isis.remoting.client;
+package org.apache.isis.alternatives.remoting.transport.sockets.client;
 
 import java.util.List;
 
-import org.apache.isis.remoting.protocol.ClientMarshaller;
-import org.apache.isis.remoting.protocol.serialize.SerializingMarshaller;
+import org.apache.isis.alternatives.remoting.marshalling.serialize.SerializingMarshaller;
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
+import org.apache.isis.remoting.client.ProxyInstallerAbstract;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
 import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.remoting.transport.socket.SocketTransport;
 
 
 public class SerializingOverSocketsProxyInstaller extends ProxyInstallerAbstract {

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewer.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java Sat Nov  6 08:46:35 2010
@@ -18,15 +18,16 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.isis.alternatives.remoting.marshalling.encode.EncodingMarshaller;
 import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.EncodingMarshaller;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.server.ServerConnectionDefault;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.simple.SimpleTransport;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewerInstaller.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/EncodingOverSocketsViewerInstaller.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewerInstaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java Sat Nov  6 08:46:35 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
 import java.util.List;
 
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.runtime.Isis;
 import org.apache.isis.runtime.viewer.IsisViewer;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewer.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java Sat Nov  6 08:46:35 2010
@@ -18,15 +18,17 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.isis.alternatives.remoting.marshalling.serialize.SerializingMarshaller;
 import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.remoting.protocol.serialize.SerializingMarshaller;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.server.ServerConnection;
+import org.apache.isis.remoting.server.ServerConnectionDefault;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.simple.SimpleTransport;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewerInstaller.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/SerializingOverSocketsViewerInstaller.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewerInstaller.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java Sat Nov  6 08:46:35 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
 import java.util.List;
 
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
 import org.apache.isis.runtime.Isis;
 import org.apache.isis.runtime.viewer.IsisViewer;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerAbstract.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,6 +28,9 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 import org.apache.log4j.Logger;
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.Worker;
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.WorkerPool;
 import org.apache.isis.commons.debug.DebugInfo;
 import org.apache.isis.commons.debug.DebugString;
 import org.apache.isis.commons.exceptions.IsisException;
@@ -35,13 +38,11 @@ import org.apache.isis.commons.lang.Thre
 import org.apache.isis.remoting.facade.ServerFacade;
 import org.apache.isis.remoting.facade.ServerFacadeLogger;
 import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.server.ServerConnection;
 import org.apache.isis.remoting.transport.ConnectionException;
 import org.apache.isis.remoting.transport.ProfilingInputStream;
 import org.apache.isis.remoting.transport.ProfilingOutputStream;
-import org.apache.isis.remoting.transport.socket.SocketTransportConstants;
-import org.apache.isis.remoting.transport.socket.server.Worker;
-import org.apache.isis.remoting.transport.socket.server.WorkerPool;
 import org.apache.isis.runtime.system.IsisSystem;
 import org.apache.isis.runtime.system.internal.monitor.HttpServerMonitor;
 import org.apache.isis.runtime.system.internal.monitor.SocketServerMonitor;

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerConstants.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/SocketsViewerConstants.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerConstants.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java Sat Nov  6 08:46:35 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
+import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
 import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.remoting.transport.socket.SocketTransportConstants;
 import org.apache.isis.runtime.viewer.IsisViewerInstaller;
 
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerInstallerAbstract.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java Sat Nov  6 08:46:35 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.runtime.viewer.IsisViewer;
 import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/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?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransport.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java Sat Nov  6 08:46:35 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.remoting.transport.socket;
+package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
-import static org.apache.isis.remoting.transport.socket.SocketTransportConstants.PORT_DEFAULT;
+import static org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants.PORT_DEFAULT;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransportConstants.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/SocketTransportConstants.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransportConstants.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransportConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.transport.socket;
+package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
 import org.apache.isis.metamodel.config.ConfigurationConstants;
 import org.apache.isis.remoting.transport.TransportInstaller;

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/Worker.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/Worker.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/Worker.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/Worker.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.transport.socket.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -34,7 +34,7 @@ import org.apache.isis.remoting.exchange
 import org.apache.isis.remoting.exchange.Request;
 import org.apache.isis.remoting.exchange.ResponseEnvelope;
 import org.apache.isis.remoting.server.ServerConnection;
-import org.apache.isis.remoting.server.ServerConnectionHandler;
+import org.apache.isis.remoting.transport.ServerConnectionHandler;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.system.internal.monitor.Monitor;
 

Copied: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/WorkerPool.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/WorkerPool.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/WorkerPool.java?p2=incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/WorkerPool.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/WorkerPool.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/WorkerPool.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/WorkerPool.java Sat Nov  6 08:46:35 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.transport.socket.server;
+package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;



Mime
View raw message