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/17 08:24:39 UTC
svn commit: r1035936 [1/3] - in /incubator/isis/trunk:
alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/
alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/
a...
Author: danhaywood
Date: Wed Nov 17 07:24:36 2010
New Revision: 1035936
URL: http://svn.apache.org/viewvc?rev=1035936&view=rev
Log:
fixing up compile errors from all those package renames
Removed:
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/extensions/remoting/
incubator/isis/trunk/alternatives/remoting/transport-http/server/src/main/java/org/apache/isis/extensions/
Modified:
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStoreTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/DefaultClockTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/TestClock.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/MockDataManager.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataVectorTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ReferenceVectorTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerInstancesTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/services/DummyServiceManager.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriterTest.java
incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnection.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnectionDefault.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/transaction/ClientSideTransaction.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/DataFactory.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ObjectDataImpl.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ReferenceData.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestUsability.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestVisibility.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearAssociationResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearValueResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/CloseSessionResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteClientActionResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OpenSessionResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/RequestAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveFieldResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ResolveObjectResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetAssociationResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueRequest.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/SetValueResponse.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/proxy/ServerFacadeProxy.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ClientMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/MarshallerAbstract.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/marshalling/ServerMarshaller.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/protocol/ObjectEncoderDecoder.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/ServerConnectionHandler.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/Transport.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedConnection.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/pipe/PipedServer.java
incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/transport/simple/SimpleTransport.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectDecoderCollectionTest.java
incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java
incubator/isis/trunk/alternatives/remoting/marshalling-encode/src/main/java/org/apache/isis/alternatives/remoting/marshalling/encode/EncodingMarshaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-serialize/src/main/java/org/apache/isis/alternatives/remoting/marshalling/serialize/SerializingMarshaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/client/XStreamOverSocketsProxyDecoratorInstaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/server/XStreamOverSocketsViewerInstaller.java
incubator/isis/trunk/alternatives/remoting/marshalling-xstream/src/main/java/org/apache/isis/alternatives/remoting/marshalling/xstream/shared/XStreamMarshaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/EncodingOverHttpProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-http/client/src/main/java/org/apache/isis/alternatives/remoting/transport/http/client/HttpClientTransport.java
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-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/EncodingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/client/SerializingOverSocketsProxyInstaller.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/EncodingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SerializingOverSocketsViewer.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerAbstract.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/server/SocketsViewerInstallerAbstract.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/SocketTransport.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/Worker.java
incubator/isis/trunk/alternatives/remoting/transport-sockets/src/main/java/org/apache/isis/alternatives/remoting/transport/sockets/shared/WorkerPool.java
incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/future/internal/EvaluatingMethodInterceptor.java
incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java Wed Nov 17 07:24:36 2010
@@ -23,7 +23,6 @@ package org.apache.isis.alternatives.obj
import java.text.MessageFormat;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.Clock;
import org.apache.isis.alternatives.objectstore.xml.internal.commands.XmlCreateObjectCommand;
import org.apache.isis.alternatives.objectstore.xml.internal.commands.XmlDestroyObjectCommand;
@@ -68,6 +67,7 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
+import org.apache.log4j.Logger;
public class XmlObjectStore implements ObjectStore {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstaller.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.adapter.XmlAdapterManager;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
@@ -33,6 +32,7 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
import org.apache.isis.core.runtime.persistence.oidgenerator.timebased.TimeBasedOidGenerator;
import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.log4j.Logger;
public class XmlPersistenceMechanismInstaller extends ObjectStorePersistenceMechanismInstallerAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.data.DataManager;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
@@ -30,6 +29,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.apache.log4j.Logger;
abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract {
private static final Logger LOG = Logger.getLogger(AbstractXmlPersistenceCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlCreateObjectCommand.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlCreateObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlCreateObjectCommand.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.data.DataManager;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
@@ -28,6 +27,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
+import org.apache.log4j.Logger;
public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand implements CreateObjectCommand {
private static final Logger LOG = Logger.getLogger(XmlCreateObjectCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java Wed Nov 17 07:24:36 2010
@@ -20,13 +20,13 @@
package org.apache.isis.alternatives.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.data.DataManager;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
+import org.apache.log4j.Logger;
public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand implements DestroyObjectCommand {
private static final Logger LOG = Logger.getLogger(XmlDestroyObjectCommand.class);
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml.internal.commands;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.data.Data;
import org.apache.isis.alternatives.objectstore.xml.internal.data.DataManager;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
@@ -28,6 +27,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
+import org.apache.log4j.Logger;
public final class XmlUpdateObjectCommand
extends AbstractXmlPersistenceCommand
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersion.java Wed Nov 17 07:24:36 2010
@@ -25,12 +25,10 @@ import java.io.Serializable;
import java.util.Date;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.Clock;
-import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.adapter.version.VersionUserAndTimeAbstract;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStoreTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStoreTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStoreTest.java Wed Nov 17 07:24:36 2010
@@ -20,13 +20,11 @@
package org.apache.isis.alternatives.objectstore.xml;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Collections;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.XmlObjectStore;
+
import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
import org.apache.isis.alternatives.objectstore.xml.internal.data.MockDataManager;
import org.apache.isis.alternatives.objectstore.xml.internal.services.DummyServiceManager;
@@ -37,7 +35,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
-import org.apache.isis.core.runtime.persistence.objectstore.transaction.ObjectStoreTransaction;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
@@ -45,8 +42,11 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
import org.apache.isis.core.runtime.testsystem.TestProxyConfiguration;
-
-import static org.junit.Assert.*;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
public class XmlObjectStoreTest extends ProxyJunit4TestCase {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstallerTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstallerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/XmlPersistenceMechanismInstallerTest.java Wed Nov 17 07:24:36 2010
@@ -20,13 +20,8 @@
package org.apache.isis.alternatives.objectstore.xml;
-import static org.junit.Assert.assertTrue;
-
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.XmlPersistenceMechanismInstaller;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.system.ContextCategory;
import org.apache.isis.core.runtime.system.DeploymentCategory;
@@ -34,6 +29,10 @@ import org.apache.isis.core.runtime.syst
import org.apache.isis.core.runtime.system.Splash;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
public class XmlPersistenceMechanismInstallerTest extends ProxyJunit4TestCase {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/DefaultClockTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/DefaultClockTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/DefaultClockTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/DefaultClockTest.java Wed Nov 17 07:24:36 2010
@@ -22,9 +22,8 @@ package org.apache.isis.alternatives.obj
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.junit.Test;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/TestClock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/TestClock.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/TestClock.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/clock/TestClock.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml.internal.clock;
-import org.apache.isis.alternatives.objectstore.xml.internal.clock.Clock;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/MockDataManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/MockDataManager.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/MockDataManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/MockDataManager.java Wed Nov 17 07:24:36 2010
@@ -25,11 +25,6 @@ import java.util.Vector;
import junit.framework.Assert;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.Data;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.DataManager;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectDataVector;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.PersistorException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataTest.java Wed Nov 17 07:24:36 2010
@@ -25,7 +25,6 @@ import java.util.Iterator;
import junit.framework.TestCase;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataVectorTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataVectorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectDataVectorTest.java Wed Nov 17 07:24:36 2010
@@ -20,16 +20,14 @@
package org.apache.isis.alternatives.objectstore.xml.internal.data;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectDataVector;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.junit.Before;
+import org.junit.Test;
public class ObjectDataVectorTest {
private ObjectDataVector objectDataVector;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ReferenceVectorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ReferenceVectorTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ReferenceVectorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ReferenceVectorTest.java Wed Nov 17 07:24:36 2010
@@ -20,13 +20,12 @@
package org.apache.isis.alternatives.objectstore.xml.internal.data;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.ReferenceVector;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
+import org.junit.Before;
+import org.junit.Test;
public class ReferenceVectorTest {
private ReferenceVector referenceVector;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerInstancesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerInstancesTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerInstancesTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerInstancesTest.java Wed Nov 17 07:24:36 2010
@@ -23,17 +23,14 @@ package org.apache.isis.alternatives.obj
import java.io.File;
import java.io.FilenameFilter;
-import org.apache.log4j.Logger;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
-import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClockTest;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectDataVector;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.xml.XmlDataManager;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.xml.XmlFile;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.log4j.Logger;
public class XmlDataManagerInstancesTest extends ProxyJunit3TestCase {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/data/xml/XmlDataManagerTest.java Wed Nov 17 07:24:36 2010
@@ -24,13 +24,10 @@ import java.io.File;
import java.io.FilenameFilter;
import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClock;
-import org.apache.isis.alternatives.objectstore.xml.internal.clock.DefaultClockTest;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.alternatives.objectstore.xml.internal.data.ReferenceVector;
import org.apache.isis.alternatives.objectstore.xml.internal.data.Role;
import org.apache.isis.alternatives.objectstore.xml.internal.data.Team;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.xml.XmlDataManager;
-import org.apache.isis.alternatives.objectstore.xml.internal.data.xml.XmlFile;
import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.context.IsisContext;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/services/DummyServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/services/DummyServiceManager.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/services/DummyServiceManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/services/DummyServiceManager.java Wed Nov 17 07:24:36 2010
@@ -20,7 +20,6 @@
package org.apache.isis.alternatives.objectstore.xml.internal.services;
-import org.apache.isis.alternatives.objectstore.xml.internal.services.ServiceManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/objectstore/xml/internal/version/FileVersionTest.java Wed Nov 17 07:24:36 2010
@@ -20,19 +20,18 @@
package org.apache.isis.alternatives.objectstore.xml.internal.version;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.objectstore.xml.internal.version.FileVersion;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
public class FileVersionTest extends ProxyJunit4TestCase {
Mockery context = new JUnit4Mockery();
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriterTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriterTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileContentWriterTest.java Wed Nov 17 07:24:36 2010
@@ -20,17 +20,16 @@
package org.apache.isis.alternatives.profilestore.xml.internal;
+import static org.junit.Assert.assertEquals;
+
import java.io.IOException;
import java.io.StringWriter;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.profilestore.xml.internal.UserProfileContentWriter;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.core.runtime.userprofile.UserProfile;
-
-import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
public class UserProfileContentWriterTest {
Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java Wed Nov 17 07:24:36 2010
@@ -20,18 +20,14 @@
package org.apache.isis.alternatives.profilestore.xml.internal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.apache.isis.alternatives.profilestore.xml.internal.UserProfileDataHandler;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -45,13 +41,16 @@ import org.apache.isis.core.runtime.syst
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
public class UserProfileDataHandlerTest {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnection.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnection.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnection.java Wed Nov 17 07:24:36 2010
@@ -23,7 +23,7 @@ package org.apache.isis.alternatives.rem
import org.apache.isis.alternatives.remoting.common.exchange.Request;
import org.apache.isis.alternatives.remoting.common.exchange.ResponseEnvelope;
import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
-import org.apache.isis.alternatives.remoting.common.server.ServerConnection;
+import org.apache.isis.alternatives.remoting.server.ServerConnection;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
/**
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnectionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnectionDefault.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnectionDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ClientConnectionDefault.java Wed Nov 17 07:24:36 2010
@@ -26,7 +26,7 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.exchange.Request;
import org.apache.isis.alternatives.remoting.common.exchange.ResponseEnvelope;
import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
-import org.apache.isis.alternatives.remoting.common.transport.ConnectionException;
+import org.apache.isis.alternatives.remoting.transport.ConnectionException;
import org.apache.isis.core.runtime.persistence.ConcurrencyException;
import org.apache.log4j.Logger;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/ProxyInstallerAbstract.java Wed Nov 17 07:24:36 2010
@@ -37,8 +37,8 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.facade.proxy.ServerFacadeProxy;
import org.apache.isis.alternatives.remoting.common.marshalling.ClientMarshaller;
import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
-import org.apache.isis.alternatives.remoting.common.protocol.internal.ObjectEncoderDecoderDefault;
-import org.apache.isis.alternatives.remoting.common.transport.Transport;
+import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
+import org.apache.isis.alternatives.remoting.transport.Transport;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.services.ServicesInjector;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/transaction/ClientSideTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/transaction/ClientSideTransaction.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/transaction/ClientSideTransaction.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/transaction/ClientSideTransaction.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.client.transaction;
-import java.util.ArrayList;
-import java.util.List;
-
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.transaction.IsisTransactionAbstract;
import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/DataFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/DataFactory.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/DataFactory.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/DataFactory.java Wed Nov 17 07:24:36 2010
@@ -26,7 +26,6 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.alternatives.remoting.common.data.common.NullData;
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.alternatives.remoting.common.data.common.ReferenceData;
-import org.apache.isis.alternatives.remoting.common.exchange.AuthorizationResponse;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/CollectionDataImpl.java Wed Nov 17 07:24:36 2010
@@ -22,15 +22,11 @@ package org.apache.isis.alternatives.rem
import java.io.IOException;
import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import org.apache.isis.core.commons.lang.ArrayUtils;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/EncodableObjectDataImpl.java Wed Nov 17 07:24:36 2010
@@ -25,7 +25,6 @@ import java.io.Serializable;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/IdentityDataImpl.java Wed Nov 17 07:24:36 2010
@@ -20,14 +20,12 @@
package org.apache.isis.alternatives.remoting.common.data.common;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/NullDataImpl.java Wed Nov 17 07:24:36 2010
@@ -20,12 +20,11 @@
package org.apache.isis.alternatives.remoting.common.data.common;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ObjectDataImpl.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ObjectDataImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ObjectDataImpl.java Wed Nov 17 07:24:36 2010
@@ -21,14 +21,12 @@
package org.apache.isis.alternatives.remoting.common.data.common;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.isis.alternatives.remoting.common.data.Data;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ReferenceData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ReferenceData.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ReferenceData.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/data/common/ReferenceData.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
package org.apache.isis.alternatives.remoting.common.data.common;
-import java.io.Serializable;
-
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.Data;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.Version;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestAbstract.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestAbstract.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-
+import java.io.IOException;
+
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestUsability.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestUsability.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestUsability.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestUsability.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-
+import java.io.IOException;
+
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestVisibility.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestVisibility.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestVisibility.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationRequestVisibility.java Wed Nov 17 07:24:36 2010
@@ -20,8 +20,8 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-
+import java.io.IOException;
+
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/AuthorizationResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearAssociationResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearAssociationResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearAssociationResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearAssociationResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearValueResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearValueResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearValueResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ClearValueResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/CloseSessionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/CloseSessionResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/CloseSessionResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/CloseSessionResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteClientActionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteClientActionResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteClientActionResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteClientActionResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.alternatives.remoting.common.data.common.ReferenceData;
import org.apache.isis.core.metamodel.adapter.version.Version;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionResponse.java Wed Nov 17 07:24:36 2010
@@ -20,11 +20,11 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.isis.alternatives.remoting.common.data.Data;
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.alternatives.remoting.common.data.common.ReferenceData;
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.en
import org.apache.isis.core.metamodel.encoding.Encodable;
import org.apache.isis.core.runtime.transaction.messagebroker.MessageList;
import org.apache.isis.core.runtime.transaction.messagebroker.WarningList;
-
-import com.google.inject.internal.Lists;
+
+import com.google.inject.internal.Lists;
public class ExecuteServerActionResponse implements Encodable, Serializable, MessageList, WarningList {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesRequest.java Wed Nov 17 07:24:36 2010
@@ -22,13 +22,11 @@ package org.apache.isis.alternatives.rem
import java.io.IOException;
-import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.alternatives.remoting.common.data.query.PersistenceQueryData;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public class FindInstancesRequest extends RequestAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/FindInstancesResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectRequest.java Wed Nov 17 07:24:36 2010
@@ -22,13 +22,11 @@ package org.apache.isis.alternatives.rem
import java.io.IOException;
-import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public class GetObjectRequest extends RequestAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetObjectResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.ObjectData;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesRequest.java Wed Nov 17 07:24:36 2010
@@ -21,12 +21,10 @@
package org.apache.isis.alternatives.remoting.common.exchange;
import java.io.IOException;
-import java.util.Properties;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public class GetPropertiesRequest extends RequestAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/GetPropertiesResponse.java Wed Nov 17 07:24:36 2010
@@ -20,10 +20,10 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Properties;
-
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Properties;
+
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesRequest.java Wed Nov 17 07:24:36 2010
@@ -26,7 +26,6 @@ import org.apache.isis.alternatives.remo
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public class HasInstancesRequest extends RequestAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/HasInstancesResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.encoding.Encodable;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequest.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceRequest.java Wed Nov 17 07:24:36 2010
@@ -22,12 +22,10 @@ package org.apache.isis.alternatives.rem
import java.io.IOException;
-import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public class OidForServiceRequest extends RequestAbstract {
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OidForServiceResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.alternatives.remoting.common.data.common.IdentityData;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OpenSessionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OpenSessionResponse.java?rev=1035936&r1=1035935&r2=1035936&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OpenSessionResponse.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/exchange/OpenSessionResponse.java Wed Nov 17 07:24:36 2010
@@ -20,9 +20,9 @@
package org.apache.isis.alternatives.remoting.common.exchange;
-import java.io.IOException;
-import java.io.Serializable;
-
+import java.io.IOException;
+import java.io.Serializable;
+
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.encoding.DataOutputExtended;