You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/06 09:46:39 UTC
svn commit: r1031974 [3/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...
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectSerializer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectSerializer.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectSerializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java Sat Nov 6 08:46:35 2010
@@ -17,8 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import java.util.Enumeration;
@@ -45,36 +44,33 @@ import org.apache.isis.runtime.persisten
/**
* Utility class to create Data objects representing a graph of Isis.
*
- * As each object is serialised its resolved state is changed to SERIALIZING; any object that is marked as
- * SERIALIZING is skipped.
+ * As each object is serialised its resolved state is changed to SERIALIZING; any object that is marked as SERIALIZING
+ * is skipped.
*/
-final class ObjectSerializer {
-
- private final DataFactory dataFactory;
- private final FieldOrderCache fieldOrderCache;
+public final class ObjectSerializer {
+
+ private final DataFactory dataFactory;
+ private final FieldOrderCache fieldOrderCache;
public ObjectSerializer(final DataFactory dataFactory, final FieldOrderCache fieldOrderCache) {
- this.fieldOrderCache = fieldOrderCache;
- this.dataFactory = dataFactory;
- }
-
- public final ReferenceData serializeAdapter(
- final ObjectAdapter adapter,
- final int depth,
- final KnownObjectsRequest knownObjects) {
+ this.fieldOrderCache = fieldOrderCache;
+ this.dataFactory = dataFactory;
+ }
+
+ public final ReferenceData serializeAdapter(final ObjectAdapter adapter, final int depth,
+ final KnownObjectsRequest knownObjects) {
Assert.assertNotNull(adapter);
return (ReferenceData) serializeObject2(adapter, depth, knownObjects);
}
public final EncodableObjectData serializeEncodeable(final ObjectAdapter adapter) {
final EncodableFacet facet = adapter.getSpecification().getFacet(EncodableFacet.class);
- return this.dataFactory.createValueData(adapter.getSpecification().getFullName(), facet.toEncodedString(adapter));
+ return this.dataFactory.createValueData(adapter.getSpecification().getFullName(),
+ facet.toEncodedString(adapter));
}
- private final Data serializeObject2(
- final ObjectAdapter adapter,
- final int graphDepth,
- final KnownObjectsRequest knownObjects) {
+ private final Data serializeObject2(final ObjectAdapter adapter, final int graphDepth,
+ final KnownObjectsRequest knownObjects) {
Assert.assertNotNull(adapter);
final ResolveState resolveState = adapter.getResolveState();
@@ -82,7 +78,8 @@ final class ObjectSerializer {
if (!isTransient && (resolveState.isSerializing() || resolveState.isGhost() || graphDepth <= 0)) {
Assert.assertNotNull("OID needed for reference", adapter, adapter.getOid());
- return this.dataFactory.createIdentityData(adapter.getSpecification().getFullName(), adapter.getOid(), adapter.getVersion());
+ return this.dataFactory.createIdentityData(adapter.getSpecification().getFullName(), adapter.getOid(),
+ adapter.getVersion());
}
if (isTransient && knownObjects.containsKey(adapter)) {
return knownObjects.get(adapter);
@@ -118,7 +115,8 @@ final class ObjectSerializer {
} else if (fields[i].isOneToOneAssociation()) {
if (field == null) {
- fieldContent[i] = !withCompleteData ? null : this.dataFactory.createNullData(fields[i].getSpecification()
+ fieldContent[i] =
+ !withCompleteData ? null : this.dataFactory.createNullData(fields[i].getSpecification()
.getFullName());
} else {
fieldContent[i] = serializeObject2(field, graphDepth - 1, knownObjects);
@@ -133,10 +131,8 @@ final class ObjectSerializer {
return data;
}
- public CollectionData serializeCollection(
- final ObjectAdapter collectionAdapter,
- final int graphDepth,
- final KnownObjectsRequest knownObjects) {
+ public CollectionData serializeCollection(final ObjectAdapter collectionAdapter, final int graphDepth,
+ final KnownObjectsRequest knownObjects) {
final Oid oid = collectionAdapter.getOid();
final String collectionType = collectionAdapter.getSpecification().getFullName();
final TypeOfFacet typeOfFacet = collectionAdapter.getSpecification().getFacet(TypeOfFacet.class);
@@ -144,8 +140,8 @@ final class ObjectSerializer {
throw new IsisException("No type of facet for collection " + collectionAdapter);
}
final String elementType = typeOfFacet.value().getName();
- final boolean hasAllElements = collectionAdapter.isTransient() ||
- collectionAdapter.getResolveState().isResolved();
+ final boolean hasAllElements =
+ collectionAdapter.isTransient() || collectionAdapter.getResolveState().isResolved();
ReferenceData[] elements;
if (hasAllElements) {
@@ -161,8 +157,8 @@ final class ObjectSerializer {
elements = new ObjectData[0];
}
- return this.dataFactory.createCollectionData(collectionType, elementType, oid, elements, hasAllElements, collectionAdapter.getVersion());
+ return this.dataFactory.createCollectionData(collectionType, elementType, oid, elements, hasAllElements,
+ collectionAdapter.getVersion());
}
-
}
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoderAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoderAbstract.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoderAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.spec.ObjectSpecification;
@@ -27,6 +27,8 @@ import org.apache.isis.remoting.data.Dat
import org.apache.isis.remoting.data.common.ObjectData;
import org.apache.isis.remoting.data.query.PersistenceQueryData;
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.PersistenceQueryEncoder;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindAllInstancesEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindAllInstancesEncoder.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindAllInstancesEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.remoting.data.query.PersistenceQueryData;
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByPatternEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByPatternEncoder.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByPatternEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByTitleEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByTitleEncoder.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByTitleEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.remoting.data.query.PersistenceQueryData;
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import java.util.HashMap;
import java.util.Map;
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java Sat Nov 6 08:46:35 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.remoting.protocol.encoding.internal;
+package org.apache.isis.remoting.protocol.internal;
import org.apache.isis.applib.query.Query;
import org.apache.isis.metamodel.services.container.query.QueryCardinality;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java Sat Nov 6 08:46:35 2010
@@ -25,7 +25,7 @@ import org.apache.isis.commons.exception
import org.apache.isis.remoting.client.ClientConnection;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.ServerMarshaller;
+import org.apache.isis.remoting.marshalling.ServerMarshaller;
/**
* Acts as the mediator between the {@link ServerMarshaller} (which pulls stuff off the transport and pushes stuff on)
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionDefault.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionDefault.java Sat Nov 6 08:46:35 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.ServerMarshaller;
+import org.apache.isis.remoting.marshalling.ServerMarshaller;
public class ServerConnectionDefault implements ServerConnection {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ProfilingOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ProfilingOutputStream.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ProfilingOutputStream.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ProfilingOutputStream.java Sat Nov 6 08:46:35 2010
@@ -17,18 +17,15 @@
* under the License.
*/
-
package org.apache.isis.remoting.transport;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.log4j.Logger;
-import org.apache.isis.remoting.protocol.encoding.EncodingMarshaller;
-
public class ProfilingOutputStream extends OutputStream {
-
+
private static final Logger LOG = Logger.getLogger(ProfilingOutputStream.class);
private final OutputStream wrapped;
@@ -86,7 +83,7 @@ public class ProfilingOutputStream exten
wrapped.write(b);
end();
}
-
+
@Override
public void close() throws IOException {
if (LOG.isDebugEnabled()) {
@@ -97,4 +94,3 @@ public class ProfilingOutputStream exten
}
}
-
Copied: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java (from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionHandler.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionHandler.java&r1=1031826&r2=1031974&rev=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionHandler.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java Sat Nov 6 08:46:35 2010
@@ -17,15 +17,12 @@
* under the License.
*/
-
-package org.apache.isis.remoting.server;
+package org.apache.isis.remoting.transport;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.net.SocketException;
-import org.apache.log4j.Logger;
import org.apache.isis.commons.debug.DebugInfo;
import org.apache.isis.commons.debug.DebugString;
import org.apache.isis.commons.exceptions.IsisException;
@@ -33,173 +30,166 @@ import org.apache.isis.metamodel.authent
import org.apache.isis.remoting.exchange.OpenSessionRequest;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
-import org.apache.isis.remoting.transport.socket.server.Worker;
+import org.apache.isis.remoting.server.ServerConnection;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
+import org.apache.log4j.Logger;
/**
- * Standard processing for processing an inbound {@link Request} and generating
- * an outbound {@link ResponseEnvelope} (or some sort of {@link Exception}).
+ * Standard processing for processing an inbound {@link Request} and generating an outbound {@link ResponseEnvelope} (or
+ * some sort of {@link Exception}).
*
* <p>
- * Used by the (socket transport) {@link Worker} and originally inlined; now
- * factored out so can be reused by other transports, notably http.
+ * Used by the (socket transport) {@link Worker} and originally inlined; now factored out so can be reused by other
+ * transports, notably http.
*/
public class ServerConnectionHandler {
- private static final Logger LOG = Logger
- .getLogger(ServerConnectionHandler.class);
- private static final Logger ACCESS_LOG = Logger.getLogger("access_log");
-
- private final ServerConnection connection;
-
- private String debugRequest;
- private String debugAuthSession;
- private String debugResponse;
- private String debugContextId;
-
- private DebugInfo[] debugSessionInfo;
-
- private long responseTime;
-
- public ServerConnectionHandler(ServerConnection connection) {
- this.connection = connection;
- }
-
- // /////////////////////////////////////////////////////
- // handleRequest
- // /////////////////////////////////////////////////////
-
- public void handleRequest() throws IOException {
- final long start = System.currentTimeMillis();
- final Request request = connection.readRequest();
- AuthenticationSession authenticationSession = null;
- try {
- authenticationSession = openSessionIfNotAuthenticateRequest(request);
-
- monitorRequest(authenticationSession, request);
- executeRequest(request);
-
- sendResponse(request);
-
- } catch (final Exception e) {
- sendExceptionResponse(e);
-
- } finally {
- closeSessionIfNotAuthenticateRequest(authenticationSession);
- calcResponseTime(start);
- }
- }
-
- private AuthenticationSession openSessionIfNotAuthenticateRequest(
- final Request request) {
- AuthenticationSession authenticationSession;
- if (LOG.isDebugEnabled()) {
- debugRequest = request.getId() + " - " + request.toString();
- }
- authenticationSession = request.getSession();
-
- if (authenticationSession == null) {
- if (LOG.isDebugEnabled()) {
- debugAuthSession = "(none)";
- debugContextId = "(none)";
- }
-
- if (!(request instanceof OpenSessionRequest)) {
- throw new IsisException(
- "AuthenticationSession required for all requests (except the initial Authenticate request)");
- }
- } else {
- IsisContext.openSession(authenticationSession);
-
- if (LOG.isDebugEnabled()) {
- debugAuthSession = authenticationSession.toString();
- debugContextId = IsisContext.getSessionId();
- debugSessionInfo = IsisContext.debugSession();
- }
- }
- return authenticationSession;
- }
-
- private void monitorRequest(
- final AuthenticationSession authenticationSession,
- final Request request) {
- String userName = authenticationSession != null ? authenticationSession
- .getUserName() : "**AUTHENTICATING**";
- String message = "{" + userName + "|" + this + "} "
- + request.toString();
- ACCESS_LOG.info(message);
- Monitor.addEvent("REQUEST", message, debugSessionInfo);
- }
-
- private void executeRequest(final Request request) {
- request.execute(connection.getServerFacade());
- }
-
- private void sendResponse(final Request request) throws IOException {
- ResponseEnvelope response = new ResponseEnvelope(request);
-
- if (LOG.isDebugEnabled()) {
- debugResponse = response.toString();
- LOG.debug("sending " + debugResponse);
- }
- connection.sendResponse(response);
- }
-
- private void sendExceptionResponse(final Exception e) throws IOException {
- LOG.error("error during remote request", e);
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
-
- if (LOG.isDebugEnabled()) {
- debugResponse = sw.toString();
- }
-
- connection.sendResponse(e);
- }
-
- private void calcResponseTime(final long start) {
- responseTime = System.currentTimeMillis() - start;
- }
-
- private void closeSessionIfNotAuthenticateRequest(
- AuthenticationSession authenticationSession) {
- if (authenticationSession == null) {
- return;
- }
- IsisContext.closeSession();
- }
-
- // /////////////////////////////////////////////////////
- // Debug
- // /////////////////////////////////////////////////////
-
- public void debug(final DebugString debug) {
- debug.appendln("context Id", debugContextId);
- debug.appendln("authSession", debugAuthSession);
- debug.appendln("request", debugRequest);
- debug.appendln("response", debugResponse);
- debug.appendln("duration", responseTime / 1000.0f + " secs.");
-
- // TODO: the code below was commented out (by Rob, presumably?); I've
- // reinstated it but disabled it so no change in behaviour
- if (false) {
- debugSessionInfo(debug);
- }
- }
-
- private void debugSessionInfo(final DebugString debug) {
- try {
- if (debugSessionInfo != null) {
- for (DebugInfo info : debugSessionInfo) {
- debug.appendTitle(info.debugTitle());
- info.debugData(debug);
- }
- }
- } catch (RuntimeException e) {
- debug.appendException(e);
- }
- }
+ private static final Logger LOG = Logger.getLogger(ServerConnectionHandler.class);
+ private static final Logger ACCESS_LOG = Logger.getLogger("access_log");
-}
+ private final ServerConnection connection;
+
+ private String debugRequest;
+ private String debugAuthSession;
+ private String debugResponse;
+ private String debugContextId;
+
+ private DebugInfo[] debugSessionInfo;
+
+ private long responseTime;
+
+ public ServerConnectionHandler(ServerConnection connection) {
+ this.connection = connection;
+ }
+
+ // /////////////////////////////////////////////////////
+ // handleRequest
+ // /////////////////////////////////////////////////////
+
+ public void handleRequest() throws IOException {
+ final long start = System.currentTimeMillis();
+ final Request request = connection.readRequest();
+ AuthenticationSession authenticationSession = null;
+ try {
+ authenticationSession = openSessionIfNotAuthenticateRequest(request);
+
+ monitorRequest(authenticationSession, request);
+ executeRequest(request);
+
+ sendResponse(request);
+
+ } catch (final Exception e) {
+ sendExceptionResponse(e);
+
+ } finally {
+ closeSessionIfNotAuthenticateRequest(authenticationSession);
+ calcResponseTime(start);
+ }
+ }
+
+ private AuthenticationSession openSessionIfNotAuthenticateRequest(final Request request) {
+ AuthenticationSession authenticationSession;
+ if (LOG.isDebugEnabled()) {
+ debugRequest = request.getId() + " - " + request.toString();
+ }
+ authenticationSession = request.getSession();
+
+ if (authenticationSession == null) {
+ if (LOG.isDebugEnabled()) {
+ debugAuthSession = "(none)";
+ debugContextId = "(none)";
+ }
+
+ if (!(request instanceof OpenSessionRequest)) {
+ throw new IsisException(
+ "AuthenticationSession required for all requests (except the initial Authenticate request)");
+ }
+ } else {
+ IsisContext.openSession(authenticationSession);
+
+ if (LOG.isDebugEnabled()) {
+ debugAuthSession = authenticationSession.toString();
+ debugContextId = IsisContext.getSessionId();
+ debugSessionInfo = IsisContext.debugSession();
+ }
+ }
+ return authenticationSession;
+ }
+
+ private void monitorRequest(final AuthenticationSession authenticationSession, final Request request) {
+ String userName = authenticationSession != null ? authenticationSession.getUserName() : "**AUTHENTICATING**";
+ String message = "{" + userName + "|" + this + "} " + request.toString();
+ ACCESS_LOG.info(message);
+ Monitor.addEvent("REQUEST", message, debugSessionInfo);
+ }
+
+ private void executeRequest(final Request request) {
+ request.execute(connection.getServerFacade());
+ }
+
+ private void sendResponse(final Request request) throws IOException {
+ ResponseEnvelope response = new ResponseEnvelope(request);
+
+ if (LOG.isDebugEnabled()) {
+ debugResponse = response.toString();
+ LOG.debug("sending " + debugResponse);
+ }
+ connection.sendResponse(response);
+ }
+
+ private void sendExceptionResponse(final Exception e) throws IOException {
+ LOG.error("error during remote request", e);
+ StringWriter sw = new StringWriter();
+ e.printStackTrace(new PrintWriter(sw));
+
+ if (LOG.isDebugEnabled()) {
+ debugResponse = sw.toString();
+ }
+
+ connection.sendResponse(e);
+ }
+
+ private void calcResponseTime(final long start) {
+ responseTime = System.currentTimeMillis() - start;
+ }
+
+ private void closeSessionIfNotAuthenticateRequest(AuthenticationSession authenticationSession) {
+ if (authenticationSession == null) {
+ return;
+ }
+ IsisContext.closeSession();
+ }
+
+ // /////////////////////////////////////////////////////
+ // Debug
+ // /////////////////////////////////////////////////////
+
+ public void debug(final DebugString debug) {
+ debug.appendln("context Id", debugContextId);
+ debug.appendln("authSession", debugAuthSession);
+ debug.appendln("request", debugRequest);
+ debug.appendln("response", debugResponse);
+ debug.appendln("duration", responseTime / 1000.0f + " secs.");
+
+ // TODO: the code below was commented out (by Rob, presumably?); I've
+ // reinstated it but disabled it so no change in behaviour
+ if (false) {
+ debugSessionInfo(debug);
+ }
+ }
+
+ private void debugSessionInfo(final DebugString debug) {
+ try {
+ if (debugSessionInfo != null) {
+ for (DebugInfo info : debugSessionInfo) {
+ debug.appendTitle(info.debugTitle());
+ info.debugData(debug);
+ }
+ }
+ } catch (RuntimeException e) {
+ debug.appendException(e);
+ }
+ }
+}
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java Sat Nov 6 08:46:35 2010
@@ -20,10 +20,8 @@
package org.apache.isis.remoting.client;
-import org.easymock.MockControl;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.remoting.IsisRemoteException;
-import org.apache.isis.remoting.client.ClientConnection;
import org.apache.isis.remoting.data.DummyIdentityData;
import org.apache.isis.remoting.data.common.IdentityData;
import org.apache.isis.remoting.data.common.ObjectData;
@@ -41,6 +39,7 @@ import org.apache.isis.remoting.facade.p
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.testsystem.TestProxyOid;
import org.apache.isis.runtime.testsystem.TestProxySession;
+import org.easymock.MockControl;
public class CommandClientTest extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java Sat Nov 6 08:46:35 2010
@@ -55,7 +55,7 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
import org.apache.isis.remoting.exchange.ResolveObjectRequest;
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.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java Sat Nov 6 08:46:35 2010
@@ -22,6 +22,14 @@ package org.apache.isis.remoting.client.
import static org.hamcrest.CoreMatchers.equalTo;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.remoting.facade.ServerFacade;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.testsystem.TestProxySystem;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
@@ -33,15 +41,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.remoting.client.facets.ActionInvocationFacetWrapProxy;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.testsystem.TestProxySystem;
@RunWith(JMock.class)
public class ProxyAction_ExecuteLocallyTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java Sat Nov 6 08:46:35 2010
@@ -27,20 +27,9 @@ import static org.junit.Assert.assertEqu
import java.util.List;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
-import org.apache.isis.remoting.client.facets.ActionInvocationFacetWrapProxy;
import org.apache.isis.remoting.data.Data;
import org.apache.isis.remoting.data.DummyNullValue;
import org.apache.isis.remoting.data.DummyReferenceData;
@@ -49,9 +38,15 @@ import org.apache.isis.remoting.data.com
import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
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.runtime.context.IsisContext;
import org.apache.isis.runtime.testsystem.TestProxySystem;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ProxyAction_ExecuteRemotelyTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java Sat Nov 6 08:46:35 2010
@@ -20,12 +20,12 @@
package org.apache.isis.remoting.data;
-import java.util.Arrays;
-
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.remoting.data.common.CollectionData;
-import org.apache.isis.remoting.data.common.ReferenceData;
+import java.util.Arrays;
+
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.remoting.data.common.CollectionData;
+import org.apache.isis.remoting.data.common.ReferenceData;
public class DummyCollectionData extends DummyReferenceData implements CollectionData {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyEncodeableObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyEncodeableObjectData.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyEncodeableObjectData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyEncodeableObjectData.java Sat Nov 6 08:46:35 2010
@@ -20,8 +20,8 @@
package org.apache.isis.remoting.data;
-import org.apache.isis.commons.lang.ToString;
-import org.apache.isis.remoting.data.common.EncodableObjectData;
+import org.apache.isis.commons.lang.ToString;
+import org.apache.isis.remoting.data.common.EncodableObjectData;
public final class DummyEncodeableObjectData implements EncodableObjectData {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyNullValue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyNullValue.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyNullValue.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyNullValue.java Sat Nov 6 08:46:35 2010
@@ -20,7 +20,7 @@
package org.apache.isis.remoting.data;
-import org.apache.isis.remoting.data.common.NullData;
+import org.apache.isis.remoting.data.common.NullData;
public class DummyNullValue implements NullData {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java Sat Nov 6 08:46:35 2010
@@ -20,13 +20,12 @@
package org.apache.isis.remoting.data;
-import java.util.Arrays;
-
-import org.apache.isis.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.remoting.data.Data;
-import org.apache.isis.remoting.data.common.ObjectData;
+import java.util.Arrays;
+
+import org.apache.isis.commons.lang.ToString;
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.remoting.data.common.ObjectData;
public class DummyObjectData extends DummyReferenceData implements ObjectData {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,13 +20,12 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.exchange.OpenSessionRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
public class AuthenticationRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,20 +20,19 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
-import org.jmock.integration.junit4.JMock;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
@RunWith(JMock.class)
public class AuthorizationRequestUsabilityEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,18 +20,17 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Ignore;
+import org.junit.Test;
public class AuthorizationRequestVisibilityEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.ClearAssociationRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ClearAssociationRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.ClearValueRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ClearValueRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,17 +20,16 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.exchange.CloseSessionRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.junit.Ignore;
+import org.junit.Test;
public class CloseSessionRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,20 +20,17 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.junit.Ignore;
+import org.junit.Test;
public class ExecuteClientActionRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,22 +20,20 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.remoting.data.Data;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.remoting.data.Data;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ExecuteServerActionEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,21 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.data.query.PersistenceQueryData;
-import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
-import org.apache.isis.remoting.exchange.FindInstancesRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.query.PersistenceQueryData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class FindInstancesRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,20 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.query.PersistenceQueryData;
-import org.apache.isis.remoting.exchange.GetObjectRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class GetObjectRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,16 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.exchange.GetPropertiesRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.junit.Ignore;
+import org.junit.Test;
public class GetPropertiesRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,18 +20,16 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.exchange.HasInstancesRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.junit.Ignore;
+import org.junit.Test;
public class HasInstancesRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,18 +20,16 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.exchange.OidForServiceRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.junit.Ignore;
+import org.junit.Test;
public class OidForServiceRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.ResolveFieldRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ResolveFieldRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.ResolveObjectRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class ResolveObjectRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,19 +20,18 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-import static org.apache.isis.commons.matchers.NofMatchers.*;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.SetAssociationRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class SetAssociationRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java Sat Nov 6 08:46:35 2010
@@ -20,20 +20,19 @@
package org.apache.isis.remoting.exchange;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.remoting.data.common.EncodableObjectData;
-import org.apache.isis.remoting.data.common.IdentityData;
-import org.apache.isis.remoting.exchange.SetValueRequest;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+
+import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.remoting.data.common.EncodableObjectData;
+import org.apache.isis.remoting.data.common.IdentityData;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
public class SetValueRequestEncodabilityTest extends EncodabilityContractTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java Sat Nov 6 08:46:35 2010
@@ -21,42 +21,41 @@
package org.apache.isis.remoting.facade;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
-import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
-import org.apache.isis.remoting.exchange.ClearAssociationRequest;
-import org.apache.isis.remoting.exchange.ClearValueRequest;
-import org.apache.isis.remoting.exchange.CloseSessionRequest;
-import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
-import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
-import org.apache.isis.remoting.exchange.FindInstancesRequest;
-import org.apache.isis.remoting.exchange.GetObjectRequest;
-import org.apache.isis.remoting.exchange.GetPropertiesRequest;
-import org.apache.isis.remoting.exchange.GetPropertiesResponse;
-import org.apache.isis.remoting.exchange.HasInstancesRequest;
-import org.apache.isis.remoting.exchange.OidForServiceRequest;
-import org.apache.isis.remoting.exchange.OpenSessionRequest;
-import org.apache.isis.remoting.exchange.OpenSessionResponse;
-import org.apache.isis.remoting.exchange.AuthorizationResponse;
-import org.apache.isis.remoting.exchange.ClearAssociationResponse;
-import org.apache.isis.remoting.exchange.ClearValueResponse;
-import org.apache.isis.remoting.exchange.CloseSessionResponse;
-import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
-import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
-import org.apache.isis.remoting.exchange.FindInstancesResponse;
-import org.apache.isis.remoting.exchange.GetObjectResponse;
-import org.apache.isis.remoting.exchange.HasInstancesResponse;
-import org.apache.isis.remoting.exchange.OidForServiceResponse;
-import org.apache.isis.remoting.exchange.ResolveFieldRequest;
-import org.apache.isis.remoting.exchange.ResolveFieldResponse;
-import org.apache.isis.remoting.exchange.ResolveObjectRequest;
-import org.apache.isis.remoting.exchange.ResolveObjectResponse;
-import org.apache.isis.remoting.exchange.SetAssociationRequest;
-import org.apache.isis.remoting.exchange.SetAssociationResponse;
-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.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.exchange.AuthorizationRequestUsability;
+import org.apache.isis.remoting.exchange.AuthorizationRequestVisibility;
+import org.apache.isis.remoting.exchange.AuthorizationResponse;
+import org.apache.isis.remoting.exchange.ClearAssociationRequest;
+import org.apache.isis.remoting.exchange.ClearAssociationResponse;
+import org.apache.isis.remoting.exchange.ClearValueRequest;
+import org.apache.isis.remoting.exchange.ClearValueResponse;
+import org.apache.isis.remoting.exchange.CloseSessionRequest;
+import org.apache.isis.remoting.exchange.CloseSessionResponse;
+import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
+import org.apache.isis.remoting.exchange.ExecuteServerActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
+import org.apache.isis.remoting.exchange.FindInstancesRequest;
+import org.apache.isis.remoting.exchange.FindInstancesResponse;
+import org.apache.isis.remoting.exchange.GetObjectRequest;
+import org.apache.isis.remoting.exchange.GetObjectResponse;
+import org.apache.isis.remoting.exchange.GetPropertiesRequest;
+import org.apache.isis.remoting.exchange.GetPropertiesResponse;
+import org.apache.isis.remoting.exchange.HasInstancesRequest;
+import org.apache.isis.remoting.exchange.HasInstancesResponse;
+import org.apache.isis.remoting.exchange.OidForServiceRequest;
+import org.apache.isis.remoting.exchange.OidForServiceResponse;
+import org.apache.isis.remoting.exchange.OpenSessionRequest;
+import org.apache.isis.remoting.exchange.OpenSessionResponse;
+import org.apache.isis.remoting.exchange.ResolveFieldRequest;
+import org.apache.isis.remoting.exchange.ResolveFieldResponse;
+import org.apache.isis.remoting.exchange.ResolveObjectRequest;
+import org.apache.isis.remoting.exchange.ResolveObjectResponse;
+import org.apache.isis.remoting.exchange.SetAssociationRequest;
+import org.apache.isis.remoting.exchange.SetAssociationResponse;
+import org.apache.isis.remoting.exchange.SetValueRequest;
+import org.apache.isis.remoting.exchange.SetValueResponse;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java Sat Nov 6 08:46:35 2010
@@ -20,28 +20,28 @@
package org.apache.isis.remoting.protocol.encoding;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.apache.commons.collections.CollectionUtils;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import org.apache.commons.collections.CollectionUtils;
import org.apache.isis.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.remoting.data.DummyCollectionData;
-import org.apache.isis.remoting.data.DummyObjectData;
-import org.apache.isis.remoting.data.common.CollectionData;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.protocol.encoding.internal.FieldOrderCache;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectDeserializer;
-import org.apache.isis.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
-import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.runtime.testsystem.TestPojo;
-import org.apache.isis.runtime.testsystem.TestProxyOid;
-import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.metamodel.facets.collections.modify.CollectionFacetAbstract;
+import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.remoting.data.DummyCollectionData;
+import org.apache.isis.remoting.data.DummyObjectData;
+import org.apache.isis.remoting.data.common.CollectionData;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.apache.isis.remoting.protocol.internal.FieldOrderCache;
+import org.apache.isis.remoting.protocol.internal.ObjectDeserializer;
+import org.apache.isis.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
+import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.runtime.testsystem.TestPojo;
+import org.apache.isis.runtime.testsystem.TestProxyOid;
+import org.apache.isis.runtime.testsystem.TestProxyVersion;
public class ObjectDecoderCollectionTest extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java Sat Nov 6 08:46:35 2010
@@ -23,9 +23,6 @@ package org.apache.isis.remoting.protoco
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ResolveState;
import org.apache.isis.metamodel.facets.Facet;
@@ -36,7 +33,7 @@ import org.apache.isis.remoting.data.Dum
import org.apache.isis.remoting.data.DummyNullValue;
import org.apache.isis.remoting.data.DummyObjectData;
import org.apache.isis.remoting.data.common.NullData;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
import org.apache.isis.runtime.testdomain.Movie;
import org.apache.isis.runtime.testdomain.Person;
import org.apache.isis.runtime.testspec.MovieSpecification;
@@ -44,6 +41,9 @@ import org.apache.isis.runtime.testspec.
import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
import org.apache.isis.runtime.testsystem.TestProxyOid;
import org.apache.isis.runtime.testsystem.TestProxyVersion;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;