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 [1/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...
Author: danhaywood
Date: Sat Nov 6 08:46:35 2010
New Revision: 1031974
URL: http://svn.apache.org/viewvc?rev=1031974&view=rev
Log:
moving serialize, encoding marshalling and sockets transport into the submodules for them; reorg some package names
Added:
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/ClientMarshaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ClientMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/Marshaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/Marshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/MarshallerAbstract.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/MarshallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/MarshallingConstants.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingProtocolConstants.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/MarshallingInstaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/marshalling/ServerMarshaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ServerMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ObjectEncoderDecoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectEncoderDecoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/PersistenceQueryEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/FieldOrderCache.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/FieldOrderCache.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectDeserializer.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectDeserializer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectEncoderDecoderDefault.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectEncoderDecoderDefault.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/ObjectSerializer.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectSerializer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoderAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindAllInstancesEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindAllInstancesEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByPatternEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByPatternEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindByTitleEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByTitleEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ServerConnectionHandler.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionHandler.java
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingMarshaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/internal/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/serialize/SerializingMarshaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/EncodingOverHttpProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/HttpClientTransport.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpRemotingConstants.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/HttpRemotingConstants.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/transport/
- copied from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/
- copied from r1031826, incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/extensions/remoting/http/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/EncodingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/SerializingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewerInstaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewerInstaller.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerAbstract.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerConstants.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerConstants.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerInstallerAbstract.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransport.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransportConstants.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransportConstants.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/Worker.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/WorkerPool.java
- copied, changed from r1031826, incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/WorkerPool.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/worker/
Removed:
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/EncodingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/SerializingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ClientMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/Marshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/MarshallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ServerMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/EncodingProtocolConstants.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/FieldOrderCache.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectDeserializer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectEncoderDecoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectEncoderDecoderDefault.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/ObjectSerializer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryEncoderAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindAllInstancesEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByPatternEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindByTitleEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQueryDefaultEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/encoding/internal/PersistenceQueryFindUsingApplibQuerySerializableEncoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/serialize/SerializingMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/EncodingOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SerializingOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionHandler.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerConstants.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/SocketsViewerInstallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransport.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/SocketTransportConstants.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/Worker.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/socket/server/WorkerPool.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/transport/HttpClientTransport.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/EncodingOverHttpProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/HttpRemotingConstants.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/http/transport/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/META-INF/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/extensions/remoting/http/
Modified:
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnection.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facetdecorator/ProxyFacetDecorator.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/ServerFacadeLogger.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/facade/impl/ServerFacadeImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/protocol/ProtocolConstants.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnection.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/server/ServerConnectionDefault.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/transport/ProfilingOutputStream.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/CommandClientTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/ProxyPersistorTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteLocallyTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/client/facets/ProxyAction_ExecuteRemotelyTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyCollectionData.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyEncodeableObjectData.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyNullValue.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/data/DummyObjectData.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthenticationRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestUsabilityEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/AuthorizationRequestVisibilityEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearAssociationRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ClearValueRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/CloseSessionRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteClientActionRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ExecuteServerActionEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/FindInstancesRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetObjectRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/GetPropertiesRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/HasInstancesRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/OidForServiceRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveFieldRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/ResolveObjectRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetAssociationRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/exchange/SetValueRequestEncodabilityTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/facade/DummyServerFacade.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/protocol/encoding/ObjectEncoderImplTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_AssociationTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ClientActionTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_ParseableAssociationsTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/remoting/server/ServerFacadeImpl_RemoteActionTest.java
incubator/isis/trunk/alternatives/remoting/marshalling-encode/pom.xml
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/pom.xml
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/pom.xml
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/server/XStreamOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/extensions/xstream/shared/XStreamMarshaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/pom.xml
incubator/isis/trunk/alternatives/remoting/transport-http/server/pom.xml
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingServlet.java
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/alternatives/remoting/transport/http/server/EncodingOverHttpRemotingViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/pom.xml
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnection.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnection.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnection.java Sat Nov 6 08:46:35 2010
@@ -23,7 +23,7 @@ package org.apache.isis.remoting.client;
import org.apache.isis.commons.components.ApplicationScopedComponent;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
-import org.apache.isis.remoting.protocol.ClientMarshaller;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
import org.apache.isis.remoting.server.ServerConnection;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ClientConnectionDefault.java Sat Nov 6 08:46:35 2010
@@ -22,13 +22,13 @@ package org.apache.isis.remoting.client;
import java.io.IOException;
-import org.apache.log4j.Logger;
import org.apache.isis.remoting.IsisRemoteException;
import org.apache.isis.remoting.exchange.Request;
import org.apache.isis.remoting.exchange.ResponseEnvelope;
-import org.apache.isis.remoting.protocol.ClientMarshaller;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
import org.apache.isis.remoting.transport.ConnectionException;
import org.apache.isis.runtime.persistence.ConcurrencyException;
+import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/ProxyInstallerAbstract.java Sat Nov 6 08:46:35 2010
@@ -17,197 +17,186 @@
* under the License.
*/
+package org.apache.isis.remoting.client;
-package org.apache.isis.remoting.client;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.apache.isis.commons.ensure.Ensure.ensureThatArg;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.services.ServicesInjector;
-import org.apache.isis.remoting.client.authentication.AuthenticationManagerProxy;
-import org.apache.isis.remoting.client.authorization.AuthorizationManagerProxy;
-import org.apache.isis.remoting.client.facetdecorator.ProxyFacetDecorator;
-import org.apache.isis.remoting.client.persistence.ClientSideTransactionManager;
-import org.apache.isis.remoting.client.persistence.PersistenceSessionProxy;
-import org.apache.isis.remoting.client.persistence.ProxyPersistenceSessionFactory;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.facade.proxy.ServerFacadeProxy;
-import org.apache.isis.remoting.protocol.ClientMarshaller;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoderDefault;
-import org.apache.isis.remoting.transport.Transport;
-import org.apache.isis.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
-import org.apache.isis.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
-import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
-import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
-import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.remoting.ClientConnectionInstaller;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-
-public abstract class ProxyInstallerAbstract extends PersistenceMechanismInstallerAbstract implements ClientConnectionInstaller {
-
- @SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(ProxyInstallerAbstract.class);
-
- private ObjectEncoderDecoder encoderDecoder;
- private ServerFacade serverFacade;
-
- public ProxyInstallerAbstract(String name) {
- super(ClientConnectionInstaller.TYPE, name);
- }
-
- @Override
- public List<Class<?>> getTypes() {
- return listOf(super.getTypes(), ClientConnection.class);
- }
-
- ///////////////////////////////////////////////////////////////////
- // Encoder/Decoder
- ///////////////////////////////////////////////////////////////////
-
- /**
- * Lazily creates (so that {@link #getConfiguration()} is available).
- */
- protected ObjectEncoderDecoder getEncoderDecoder() {
- if (encoderDecoder == null) {
- encoderDecoder = ObjectEncoderDecoderDefault.create(getConfiguration());
- }
- return encoderDecoder;
- }
-
-
- ///////////////////////////////////////////////////////////////////
- // ServerFacade
- ///////////////////////////////////////////////////////////////////
-
- /**
- * Lazily creates (so that {@link #getConfiguration()} is available).
- */
- private ServerFacade getServerFacade() {
- if (serverFacade == null) {
- serverFacade = createServerFacade();
- serverFacade.init();
- }
- return serverFacade;
- }
-
- /**
- * Creates the {@link #getServerFacade()} as required.
- *
- * <p>
- * Overridable, but default implementation calls the {@link #createTransport()}
- * and {@link #createMarshaller(Transport)} hooks.
- */
- protected ServerFacade createServerFacade() {
- Transport transport = createTransport();
- ClientMarshaller marshaller = createMarshaller(transport);
- ClientConnection connection = new ClientConnectionDefault(marshaller);
- return new ServerFacadeProxy(connection);
- }
-
- /**
- * Mandatory hook method.
- */
- protected abstract Transport createTransport();
-
- /**
- * Mandatory hook method.
- */
- protected abstract ClientMarshaller createMarshaller(Transport transport);
-
-
-
- ///////////////////////////////////////////////////////////////////
- // Authentication Manager
- ///////////////////////////////////////////////////////////////////
-
- public AuthenticationManager createAuthenticationManager() {
- return new AuthenticationManagerProxy(getConfiguration(), getServerFacade(), getEncoderDecoder());
- }
-
-
- ///////////////////////////////////////////////////////////////////
- // Authorization Manager
- ///////////////////////////////////////////////////////////////////
-
- public AuthorizationManager createAuthorizationManager() {
- return new AuthorizationManagerProxy(getConfiguration(), getServerFacade(), getEncoderDecoder());
- }
-
-
- ///////////////////////////////////////////////////////////////////
- // Create PersistenceSession
- ///////////////////////////////////////////////////////////////////
-
- public PersistenceSessionFactory createPersistenceSessionFactory(final DeploymentType deploymentType) {
- return new ProxyPersistenceSessionFactory(deploymentType, this);
- }
-
- protected PersistenceSession createPersistenceSession(
- final PersistenceSessionFactory persistenceSessionFactory,
- final AdapterManagerExtended adapterManager,
- final AdapterFactory adapterFactory,
- final ObjectFactory objectFactory,
- final OidGenerator oidGenerator,
- final ServicesInjector servicesInjector) {
-
- final PersistenceSessionProxy persistenceSession =
- new PersistenceSessionProxy(
- persistenceSessionFactory,
- adapterFactory, objectFactory, servicesInjector, oidGenerator, adapterManager,
- getServerFacade(), getEncoderDecoder());
-
- IsisTransactionManager transactionManager =
- createTransactionManager(getConfiguration(), persistenceSession.getAdapterManager(), persistenceSession);
-
- ensureThatArg(persistenceSession, is(not(nullValue())));
- ensureThatArg(transactionManager, is(not(nullValue())));
-
- transactionManager.injectInto(persistenceSession);
-
- // ... and finally return
- return persistenceSession;
- }
-
- /**
- * Creates the {@link IsisTransactionManager}, potentially
- * overriddable.
- *
- * <p>
- * Called from {@link #createPersistenceSession(PersistenceSessionFactory)}.
- */
- protected IsisTransactionManager createTransactionManager(
- final IsisConfiguration configuration,
- final AdapterManagerProxy adapterManager,
- final PersistenceSessionTransactionManagement transactionManagement) {
- return new ClientSideTransactionManager(adapterManager, transactionManagement, getServerFacade(), getEncoderDecoder());
- }
-
- ///////////////////////////////////////////////////////////////////
- // Decorator
- ///////////////////////////////////////////////////////////////////
-
- public List<FacetDecorator> createDecorators() {
- return Arrays.<FacetDecorator>asList(
- new ProxyFacetDecorator(
- getConfiguration(), getServerFacade(), getEncoderDecoder()));
- }
-
-
-
-}
+import static org.apache.isis.commons.ensure.Ensure.ensureThatArg;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.remoting.client.authentication.AuthenticationManagerProxy;
+import org.apache.isis.remoting.client.authorization.AuthorizationManagerProxy;
+import org.apache.isis.remoting.client.facetdecorator.ProxyFacetDecorator;
+import org.apache.isis.remoting.client.persistence.ClientSideTransactionManager;
+import org.apache.isis.remoting.client.persistence.PersistenceSessionProxy;
+import org.apache.isis.remoting.client.persistence.ProxyPersistenceSessionFactory;
+import org.apache.isis.remoting.facade.ServerFacade;
+import org.apache.isis.remoting.facade.proxy.ServerFacadeProxy;
+import org.apache.isis.remoting.marshalling.ClientMarshaller;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.remoting.transport.Transport;
+import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.runtime.authorization.AuthorizationManager;
+import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
+import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
+import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
+import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
+import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
+import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
+import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
+import org.apache.isis.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.runtime.transaction.IsisTransactionManager;
+import org.apache.log4j.Logger;
+
+public abstract class ProxyInstallerAbstract extends PersistenceMechanismInstallerAbstract implements
+ ClientConnectionInstaller {
+
+ @SuppressWarnings("unused")
+ private static final Logger LOG = Logger.getLogger(ProxyInstallerAbstract.class);
+
+ private ObjectEncoderDecoder encoderDecoder;
+ private ServerFacade serverFacade;
+
+ public ProxyInstallerAbstract(String name) {
+ super(ClientConnectionInstaller.TYPE, name);
+ }
+
+ @Override
+ public List<Class<?>> getTypes() {
+ return listOf(super.getTypes(), ClientConnection.class);
+ }
+
+ // /////////////////////////////////////////////////////////////////
+ // Encoder/Decoder
+ // /////////////////////////////////////////////////////////////////
+
+ /**
+ * Lazily creates (so that {@link #getConfiguration()} is available).
+ */
+ protected ObjectEncoderDecoder getEncoderDecoder() {
+ if (encoderDecoder == null) {
+ encoderDecoder = ObjectEncoderDecoderDefault.create(getConfiguration());
+ }
+ return encoderDecoder;
+ }
+
+ // /////////////////////////////////////////////////////////////////
+ // ServerFacade
+ // /////////////////////////////////////////////////////////////////
+
+ /**
+ * Lazily creates (so that {@link #getConfiguration()} is available).
+ */
+ private ServerFacade getServerFacade() {
+ if (serverFacade == null) {
+ serverFacade = createServerFacade();
+ serverFacade.init();
+ }
+ return serverFacade;
+ }
+
+ /**
+ * Creates the {@link #getServerFacade()} as required.
+ *
+ * <p>
+ * Overridable, but default implementation calls the {@link #createTransport()} and
+ * {@link #createMarshaller(Transport)} hooks.
+ */
+ protected ServerFacade createServerFacade() {
+ Transport transport = createTransport();
+ ClientMarshaller marshaller = createMarshaller(transport);
+ ClientConnection connection = new ClientConnectionDefault(marshaller);
+ return new ServerFacadeProxy(connection);
+ }
+
+ /**
+ * Mandatory hook method.
+ */
+ protected abstract Transport createTransport();
+
+ /**
+ * Mandatory hook method.
+ */
+ protected abstract ClientMarshaller createMarshaller(Transport transport);
+
+ // /////////////////////////////////////////////////////////////////
+ // Authentication Manager
+ // /////////////////////////////////////////////////////////////////
+
+ @Override
+ public AuthenticationManager createAuthenticationManager() {
+ return new AuthenticationManagerProxy(getConfiguration(), getServerFacade(), getEncoderDecoder());
+ }
+
+ // /////////////////////////////////////////////////////////////////
+ // Authorization Manager
+ // /////////////////////////////////////////////////////////////////
+
+ @Override
+ public AuthorizationManager createAuthorizationManager() {
+ return new AuthorizationManagerProxy(getConfiguration(), getServerFacade(), getEncoderDecoder());
+ }
+
+ // /////////////////////////////////////////////////////////////////
+ // Create PersistenceSession
+ // /////////////////////////////////////////////////////////////////
+
+ @Override
+ public PersistenceSessionFactory createPersistenceSessionFactory(final DeploymentType deploymentType) {
+ return new ProxyPersistenceSessionFactory(deploymentType, this);
+ }
+
+ @Override
+ protected PersistenceSession createPersistenceSession(final PersistenceSessionFactory persistenceSessionFactory,
+ final AdapterManagerExtended adapterManager, final AdapterFactory adapterFactory,
+ final ObjectFactory objectFactory, final OidGenerator oidGenerator, final ServicesInjector servicesInjector) {
+
+ final PersistenceSessionProxy persistenceSession =
+ new PersistenceSessionProxy(persistenceSessionFactory, adapterFactory, objectFactory, servicesInjector,
+ oidGenerator, adapterManager, getServerFacade(), getEncoderDecoder());
+
+ IsisTransactionManager transactionManager =
+ createTransactionManager(getConfiguration(), persistenceSession.getAdapterManager(), persistenceSession);
+
+ ensureThatArg(persistenceSession, is(not(nullValue())));
+ ensureThatArg(transactionManager, is(not(nullValue())));
+
+ transactionManager.injectInto(persistenceSession);
+
+ // ... and finally return
+ return persistenceSession;
+ }
+
+ /**
+ * Creates the {@link IsisTransactionManager}, potentially overriddable.
+ *
+ * <p>
+ * Called from {@link #createPersistenceSession(PersistenceSessionFactory)}.
+ */
+ protected IsisTransactionManager createTransactionManager(final IsisConfiguration configuration,
+ final AdapterManagerProxy adapterManager, final PersistenceSessionTransactionManagement transactionManagement) {
+ return new ClientSideTransactionManager(adapterManager, transactionManagement, getServerFacade(),
+ getEncoderDecoder());
+ }
+
+ // /////////////////////////////////////////////////////////////////
+ // Decorator
+ // /////////////////////////////////////////////////////////////////
+
+ @Override
+ public List<FacetDecorator> createDecorators() {
+ return Arrays.<FacetDecorator> asList(new ProxyFacetDecorator(getConfiguration(), getServerFacade(),
+ getEncoderDecoder()));
+ }
+
+}
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/AuthenticationManagerProxy.java Sat Nov 6 08:46:35 2010
@@ -24,7 +24,7 @@ import org.apache.isis.metamodel.authent
import org.apache.isis.metamodel.config.IsisConfiguration;
import org.apache.isis.remoting.exchange.CloseSessionRequest;
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.authentication.standard.AuthenticationManagerStandard;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authentication/ProxyAuthenticator.java Sat Nov 6 08:46:35 2010
@@ -20,24 +20,23 @@
package org.apache.isis.remoting.client.authentication;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-
-import org.apache.isis.commons.ensure.Assert;
-import org.apache.isis.commons.ensure.Ensure;
-import org.apache.isis.commons.lang.StringUtils;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.exchange.OpenSessionRequest;
-import org.apache.isis.remoting.exchange.OpenSessionResponse;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
-import org.apache.isis.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
-import org.apache.isis.runtime.authentication.standard.SimpleSession;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import org.apache.isis.commons.ensure.Ensure;
+import org.apache.isis.commons.lang.StringUtils;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.remoting.exchange.OpenSessionRequest;
+import org.apache.isis.remoting.exchange.OpenSessionResponse;
+import org.apache.isis.remoting.facade.ServerFacade;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.runtime.authentication.standard.PasswordRequestAuthenticatorAbstract;
+import org.apache.isis.runtime.authentication.standard.SimpleSession;
public final class ProxyAuthenticator extends PasswordRequestAuthenticatorAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/authorization/AuthorizationManagerProxy.java Sat Nov 6 08:46:35 2010
@@ -20,20 +20,20 @@
package org.apache.isis.remoting.client.authorization;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.remoting.data.common.IdentityData;
-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.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.remoting.data.common.IdentityData;
+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.facade.ServerFacade;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.authorization.AuthorizationManagerAbstract;
public class AuthorizationManagerProxy extends AuthorizationManagerAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facetdecorator/ProxyFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facetdecorator/ProxyFacetDecorator.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facetdecorator/ProxyFacetDecorator.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facetdecorator/ProxyFacetDecorator.java Sat Nov 6 08:46:35 2010
@@ -20,7 +20,6 @@
package org.apache.isis.remoting.client.facetdecorator;
-import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.config.IsisConfiguration;
import org.apache.isis.metamodel.facetdecorator.FacetDecoratorAbstract;
import org.apache.isis.metamodel.facets.Facet;
@@ -38,7 +37,7 @@ import org.apache.isis.remoting.client.f
import org.apache.isis.remoting.client.facets.PropertyClearFacetWrapProxy;
import org.apache.isis.remoting.client.facets.PropertySetterFacetWrapProxy;
import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
public class ProxyFacetDecorator extends FacetDecoratorAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ActionInvocationFacetWrapProxy.java Sat Nov 6 08:46:35 2010
@@ -20,7 +20,6 @@
package org.apache.isis.remoting.client.facets;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.Identifier;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
@@ -43,7 +42,7 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ExecuteServerActionResponse;
import org.apache.isis.remoting.exchange.KnownObjectsRequest;
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.ConcurrencyException;
import org.apache.isis.runtime.persistence.PersistenceSession;
@@ -52,6 +51,7 @@ import org.apache.isis.runtime.transacti
import org.apache.isis.runtime.transaction.messagebroker.MessageList;
import org.apache.isis.runtime.transaction.messagebroker.WarningList;
import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
+import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionAddToFacetWrapProxy.java Sat Nov 6 08:46:35 2010
@@ -20,7 +20,6 @@
package org.apache.isis.remoting.client.facets;
-import org.apache.log4j.Logger;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
@@ -32,9 +31,10 @@ import org.apache.isis.remoting.data.com
import org.apache.isis.remoting.exchange.SetAssociationRequest;
import org.apache.isis.remoting.exchange.SetAssociationResponse;
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.ConcurrencyException;
+import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/CollectionRemoveFromFacetWrapProxy.java Sat Nov 6 08:46:35 2010
@@ -20,7 +20,6 @@
package org.apache.isis.remoting.client.facets;
-import org.apache.log4j.Logger;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
@@ -32,9 +31,10 @@ import org.apache.isis.remoting.data.com
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
import org.apache.isis.remoting.exchange.ClearAssociationResponse;
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.ConcurrencyException;
+import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertyClearFacetWrapProxy.java Sat Nov 6 08:46:35 2010
@@ -23,7 +23,6 @@ package org.apache.isis.remoting.client.
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetAbstract;
import org.apache.isis.remoting.data.common.IdentityData;
@@ -31,7 +30,7 @@ import org.apache.isis.remoting.data.com
import org.apache.isis.remoting.exchange.ClearAssociationRequest;
import org.apache.isis.remoting.exchange.ClearAssociationResponse;
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.ConcurrencyException;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/PropertySetterFacetWrapProxy.java Sat Nov 6 08:46:35 2010
@@ -34,7 +34,7 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.SetValueRequest;
import org.apache.isis.remoting.exchange.SetValueResponse;
import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/facets/ProxyUtil.java Sat Nov 6 08:46:35 2010
@@ -20,15 +20,13 @@
package org.apache.isis.remoting.client.facets;
-import org.apache.log4j.Logger;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.ConcurrencyException;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.log4j.Logger;
public class ProxyUtil {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ClientSideTransactionManager.java Sat Nov 6 08:46:35 2010
@@ -20,29 +20,29 @@
package org.apache.isis.remoting.client.persistence;
-import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.remoting.client.transaction.ClientSideTransaction;
-import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
-import org.apache.isis.remoting.data.common.ObjectData;
-import org.apache.isis.remoting.data.common.ReferenceData;
-import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
-import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
-import org.apache.isis.remoting.exchange.KnownObjectsRequest;
-import org.apache.isis.remoting.facade.ServerFacade;
-import org.apache.isis.remoting.protocol.encoding.internal.ObjectEncoderDecoder;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.ConcurrencyException;
-import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
-import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.transaction.IsisTransactionManagerAbstract;
-import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.remoting.client.transaction.ClientSideTransaction;
+import org.apache.isis.remoting.client.transaction.ClientTransactionEvent;
+import org.apache.isis.remoting.data.common.ObjectData;
+import org.apache.isis.remoting.data.common.ReferenceData;
+import org.apache.isis.remoting.exchange.ExecuteClientActionRequest;
+import org.apache.isis.remoting.exchange.ExecuteClientActionResponse;
+import org.apache.isis.remoting.exchange.KnownObjectsRequest;
+import org.apache.isis.remoting.facade.ServerFacade;
+import org.apache.isis.remoting.protocol.ObjectEncoderDecoder;
+import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.runtime.persistence.ConcurrencyException;
+import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
+import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerProxy;
+import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.runtime.transaction.IsisTransactionManagerAbstract;
+import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
+import org.apache.log4j.Logger;
public class ClientSideTransactionManager extends IsisTransactionManagerAbstract<ClientSideTransaction> {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/PersistenceSessionProxy.java Sat Nov 6 08:46:35 2010
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
import org.apache.isis.commons.components.ApplicationScopedComponent;
import org.apache.isis.commons.components.SessionScopedComponent;
import org.apache.isis.commons.debug.DebugString;
@@ -55,7 +54,7 @@ import org.apache.isis.remoting.exchange
import org.apache.isis.remoting.exchange.ResolveObjectRequest;
import org.apache.isis.remoting.exchange.ResolveObjectResponse;
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.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;
@@ -70,6 +69,7 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.transaction.TransactionalClosureAbstract;
import org.apache.isis.runtime.transaction.TransactionalClosureWithReturnAbstract;
import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
+import org.apache.log4j.Logger;
public class PersistenceSessionProxy extends PersistenceSessionAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java?rev=1031974&r1=1031973&r2=1031974&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/remoting/client/persistence/ProxyPersistenceSessionFactory.java Sat Nov 6 08:46:35 2010
@@ -20,9 +20,9 @@
package org.apache.isis.remoting.client.persistence;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
-import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
-import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
+import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.runtime.system.DeploymentType;
public class ProxyPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {