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/16 17:44:47 UTC
svn commit: r1035687 [5/5] - in /incubator/isis/trunk/alternatives: objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/ objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/ objectstore/sql/persistor/src/ma...

Copied: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/server/ServerFacadeImpl_RemoteActionTest.java (from r1035661, 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/alternatives/remoting/server/ServerFacadeImpl_RemoteActionTest.java?p2=incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/server/ServerFacadeImpl_RemoteActionTest.java&p1=incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java&r1=1035661&r2=1035687&rev=1035687&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/alternatives/remoting/server/ServerFacadeImpl_RemoteActionTest.java Tue Nov 16 16:44:37 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.remoting.server;
+package org.apache.isis.alternatives.remoting.server;
 
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -31,6 +31,9 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.exchange.ExecuteServerActionResponse;
 import org.apache.isis.alternatives.remoting.common.facade.impl.ServerFacadeImpl;
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
+import org.apache.isis.alternatives.remoting.data.DummyIdentityData;
+import org.apache.isis.alternatives.remoting.data.DummyObjectData;
+import org.apache.isis.alternatives.remoting.data.DummyReferenceData;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -42,9 +45,6 @@ import org.apache.isis.core.runtime.test
 import org.apache.isis.core.runtime.testsystem.TestProxySession;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
-import org.apache.isis.remoting.data.DummyIdentityData;
-import org.apache.isis.remoting.data.DummyObjectData;
-import org.apache.isis.remoting.data.DummyReferenceData;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java?rev=1035687&r1=1035657&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java Tue Nov 16 16:44:37 2010
@@ -18,15 +18,15 @@
  */
 
 
-package org.apache.isis.extensions.xstream.client;
+package org.apache.isis.alternatives.remoting.marshalling.xstream.client;
 
 import java.util.List;
 
+import org.apache.isis.alternatives.remoting.client.ProxyInstallerAbstract;
+import org.apache.isis.alternatives.remoting.marshalling.xstream.shared.XStreamMarshaller;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransport;
-import org.apache.isis.extensions.xstream.shared.XStreamMarshaller;
-import org.apache.isis.remoting.client.ProxyInstallerAbstract;
 import org.apache.isis.remoting.marshalling.ClientMarshaller;
-import org.apache.isis.remoting.transport.Transport;
 
 
 public class XStreamOverSocketsProxyDecoratorInstaller extends ProxyInstallerAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java?rev=1035687&r1=1035657&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java Tue Nov 16 16:44:37 2010
@@ -18,20 +18,20 @@
  */
 
 
-package org.apache.isis.extensions.xstream.server;
+package org.apache.isis.alternatives.remoting.marshalling.xstream.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.isis.alternatives.remoting.facade.ServerFacade;
+import org.apache.isis.alternatives.remoting.marshalling.xstream.shared.XStreamMarshaller;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.server.ServerConnectionDefault;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.simple.SimpleTransport;
 import org.apache.isis.alternatives.remoting.transport.sockets.server.SocketsViewerAbstract;
-import org.apache.isis.extensions.xstream.shared.XStreamMarshaller;
-import org.apache.isis.remoting.facade.ServerFacade;
 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;
 
 
 public class XStreamOverSocketsViewer extends SocketsViewerAbstract {

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java?rev=1035687&r1=1035657&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java Tue Nov 16 16:44:37 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.xstream.server;
+package org.apache.isis.alternatives.remoting.marshalling.xstream.server;
 
 import java.util.List;
 

Modified: incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java?rev=1035687&r1=1035657&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java (original)
+++ incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java Tue Nov 16 16:44:37 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.xstream.shared;
+package org.apache.isis.alternatives.remoting.marshalling.xstream.shared;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -26,13 +26,13 @@ import java.io.ObjectOutputStream;
 import java.io.StreamCorruptedException;
 import java.net.SocketException;
 
+import org.apache.isis.alternatives.remoting.exchange.Request;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.Transport;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.exchange.Request;
 import org.apache.isis.remoting.marshalling.MarshallerAbstract;
 import org.apache.isis.remoting.protocol.IllegalRequestException;
-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-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java?rev=1035687&r1=1035686&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java Tue Nov 16 16:44:37 2010
@@ -28,6 +28,13 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 import org.apache.log4j.Logger;
+import org.apache.isis.alternatives.remoting.facade.ServerFacade;
+import org.apache.isis.alternatives.remoting.facade.ServerFacadeLogger;
+import org.apache.isis.alternatives.remoting.facade.impl.ServerFacadeImpl;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.ProfilingInputStream;
+import org.apache.isis.alternatives.remoting.transport.ProfilingOutputStream;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.SocketTransportConstants;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.Worker;
 import org.apache.isis.alternatives.remoting.transport.sockets.shared.WorkerPool;
@@ -39,14 +46,7 @@ import org.apache.isis.core.runtime.syst
 import org.apache.isis.core.runtime.system.internal.monitor.HttpServerMonitor;
 import org.apache.isis.core.runtime.system.internal.monitor.SocketServerMonitor;
 import org.apache.isis.core.runtime.viewer.IsisViewerAbstract;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.facade.ServerFacadeLogger;
-import org.apache.isis.remoting.facade.impl.ServerFacadeImpl;
 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;
 
 
 public abstract class SocketsViewerAbstract extends IsisViewerAbstract implements DebugInfo {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java?rev=1035687&r1=1035686&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java Tue Nov 16 16:44:37 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.alternatives.remoting.transport.sockets.server;
 
+import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.core.runtime.viewer.IsisViewer;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract;
 import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
-import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 
 public abstract class SocketsViewerInstallerAbstract extends IsisViewerInstallerAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java?rev=1035687&r1=1035686&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java Tue Nov 16 16:44:37 2010
@@ -31,11 +31,11 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 
 import org.apache.log4j.Logger;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.ProfilingInputStream;
+import org.apache.isis.alternatives.remoting.transport.ProfilingOutputStream;
+import org.apache.isis.alternatives.remoting.transport.TransportAbstract;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.transport.ConnectionException;
-import org.apache.isis.remoting.transport.ProfilingInputStream;
-import org.apache.isis.remoting.transport.ProfilingOutputStream;
-import org.apache.isis.remoting.transport.TransportAbstract;
 
 public class SocketTransport extends TransportAbstract {
 

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/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?rev=1035687&r1=1035686&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java Tue Nov 16 16:44:37 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.alternatives.remoting.transport.sockets.shared;
 
+import org.apache.isis.alternatives.remoting.transport.TransportInstaller;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
-import org.apache.isis.remoting.transport.TransportInstaller;
 
 
 public final class SocketTransportConstants {

Modified: incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/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?rev=1035687&r1=1035686&r2=1035687&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java (original)
+++ incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java Tue Nov 16 16:44:37 2010
@@ -26,17 +26,17 @@ import java.io.StringWriter;
 import java.net.SocketException;
 
 import org.apache.log4j.Logger;
+import org.apache.isis.alternatives.remoting.exchange.OpenSessionRequest;
+import org.apache.isis.alternatives.remoting.exchange.Request;
+import org.apache.isis.alternatives.remoting.exchange.ResponseEnvelope;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.transport.ServerConnectionHandler;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.internal.monitor.Monitor;
-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.server.ServerConnection;
-import org.apache.isis.remoting.transport.ServerConnectionHandler;
 
 public class Worker implements Runnable {
     private static final Logger LOG = Logger.getLogger(Worker.class);