incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1035964 - in /incubator/isis/trunk: alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ core/metamodel...
Date Wed, 17 Nov 2010 09:55:24 GMT
Author: danhaywood
Date: Wed Nov 17 09:55:22 2010
New Revision: 1035964

URL: http://svn.apache.org/viewvc?rev=1035964&view=rev
Log:
fixing build and test issues following on from package renames

Added:
    incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/
    incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Movie.java
      - copied, changed from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Movie.java
    incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Person.java
      - copied, changed from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Person.java
    incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Role.java
      - copied, changed from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Role.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
      - copied, changed from r1035745, incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewerInstaller.java
      - copied, changed from r1035745, incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java
      - copied, changed from r1035745, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
      - copied, changed from r1035745, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java
Removed:
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Movie.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Person.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Role.java
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/look/
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/
    incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/
Modified:
    incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ProxyPersistorTest.java
    incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java
    incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
    incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java
    incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java
    incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java
    incubator/isis/trunk/defaults/objectstore/pom.xml
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureFilePersistorTest.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureServiceTest.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java
    incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java
    incubator/isis/trunk/defaults/objectstore/test.data
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ProxyPersistorTest.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/client/ProxyPersistorTest.java Wed Nov 17 09:55:22 2010
@@ -67,14 +67,14 @@ import org.apache.isis.core.runtime.pers
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
 import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
 import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
-import org.apache.isis.core.runtime.testdomain.Movie;
-import org.apache.isis.core.runtime.testdomain.Person;
 import org.apache.isis.core.runtime.testspec.MovieSpecification;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
 import org.apache.isis.core.runtime.testsystem.TestProxyOid;
 import org.apache.isis.core.runtime.testsystem.TestProxyOidGenerator;
 import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/protocol/encoding/ObjectEncoderImplTest.java Wed Nov 17 09:55:22 2010
@@ -34,13 +34,13 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.runtime.testdomain.Movie;
-import org.apache.isis.core.runtime.testdomain.Person;
 import org.apache.isis.core.runtime.testspec.MovieSpecification;
 import org.apache.isis.core.runtime.testspec.PersonSpecification;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit4TestCase;
 import org.apache.isis.core.runtime.testsystem.TestProxyOid;
 import org.apache.isis.core.runtime.testsystem.TestProxyVersion;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ReflectorConstants.java Wed Nov 17 09:55:22 2010
@@ -38,7 +38,7 @@ public final class ReflectorConstants {
     public static final String CLASS_SUBSTITUTOR_CLASS_NAME_LIST = ConfigurationConstants.ROOT
         + "reflector.class-substitutor";
     public static final String CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT =
-        "org.apache.isis.bytecode.cglib.specloader.classsubstitutor.CglibClassSubstitutor";
+        "org.apache.isis.defaults.bytecode.classsubstitutor.CglibClassSubstitutor";
 
     /**
      * Key used to lookup implementation of {@link SpecificationTraverser} in {@link IsisConfiguration}.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java Wed Nov 17 09:55:22 2010
@@ -50,7 +50,7 @@ public final class PersistenceConstants 
      */
     public static final String OBJECT_FACTORY_CLASS_NAME = ConfigurationConstants.ROOT + "persistor.object-factory";
     public static final String OBJECT_FACTORY_CLASS_NAME_DEFAULT =
-        "org.apache.isis.bytecode.cglib.persistence.objectfactory.CglibObjectFactory";
+        "org.apache.isis.defaults.bytecode.objectfactory.CglibObjectFactory";
 
     /**
      * Key used to lookup implementation of {@link ServicesInjector} in {@link IsisConfiguration}.

Modified: incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties (original)
+++ incubator/isis/trunk/core/runtime/src/main/resources/installer-registry.properties Wed Nov 17 09:55:22 2010
@@ -19,7 +19,6 @@ org.apache.isis.core.runtime.i18n.resour
 org.apache.isis.core.runtime.help.file.FileBasedHelpDecoratorInstaller                # "help-file"
 org.apache.isis.core.runtime.transaction.facetdecorator.standard.TransactionFacetDecoratorInstaller      # "transaction"
 
-
 # viewer (runs within embedded web server)
 org.apache.isis.core.webapp.monitor.WebServerMonitorInstaller  # "monitor"
 
@@ -61,98 +60,58 @@ org.apache.isis.alternatives.security.ld
 # ALTERNATIVES: REMOTING
 ############################################################
 
-# connector (client-side)
-org.apache.isis.extensions.xstream.client.XStreamOverSocketsProxyDecoratorInstaller      # "xstream"
-
-# viewer (server-side)
-org.apache.isis.extensions.xstream.server.XStreamOverSocketsViewerInstaller      # "xstream"
-
-# connector (client-side)
-org.apache.isis.remoting.client.EncodingOverSocketsProxyInstaller     # "encoding-sockets"
-org.apache.isis.remoting.client.SerializingOverSocketsProxyInstaller  # "serializing-sockets"
-
-# viewer (standalone, server-side)
-org.apache.isis.remoting.server.EncodingOverSocketsViewerInstaller     # "encoding-sockets"
-org.apache.isis.remoting.server.SerializingOverSocketsViewerInstaller  # "serializing-sockets"
-
-# connector (client-side)
-org.apache.isis.extensions.remoting.http.EncodingOverHttpProxyInstaller  # "encoding-http"
-
-# viewer (server-side)
-org.apache.isis.extensions.remoting.http.EncodingOverHttpRemotingViewerInstaller  # "encoding-http"
-
-
-############################################################
-# VIEWERS: DND
-############################################################
-
-org.apache.isis.extensions.dnd.bootstrap.DndViewerInstaller      # "dnd"
-
-
-############################################################
-# PLUGINS: HTML
-############################################################
-
-# viewer
-org.apache.isis.extensions.html.viewer.HtmlViewerInstaller  # "html"  (runs within embedded web server)
+# encoding over sockets 
+org.apache.isis.alternatives.remoting.transport.sockets.client.EncodingOverSocketsProxyInstaller     # "encoding-sockets"
+org.apache.isis.alternatives.remoting.transport.sockets.server.EncodingOverSocketsViewerInstaller     # "encoding-sockets"
 
+# serializing over sockets 
+org.apache.isis.alternatives.remoting.transport.sockets.client.SerializingOverSocketsProxyInstaller  # "serializing-sockets"
+org.apache.isis.alternatives.remoting.transport.sockets.server.SerializingOverSocketsViewerInstaller  # "serializing-sockets"
 
+# xstream over sockets 
+org.apache.isis.alternatives.remoting.marshalling.xstream.client.XStreamOverSocketsProxyDecoratorInstaller      # "xstream"
+org.apache.isis.alternatives.remoting.marshalling.xstream.server.XStreamOverSocketsViewerInstaller      # "xstream"
 
-############################################################
-# PLUGINS: XML-PERSISTOR
-############################################################
+# encoding over http 
+org.apache.isis.alternatives.remoting.transport.http.client.EncodingOverHttpProxyInstaller  # "encoding-http"
+org.apache.isis.alternatives.remoting.transport.http.server.EncodingOverHttpRemotingViewerInstaller  # "encoding-http"
 
-# object persistence
-org.apache.isis.extensions.xml.objectstore.XmlPersistenceMechanismInstaller   # "xml"
-
-# profile store
-org.apache.isis.extensions.xml.profilestore.XmlUserProfileStoreLoaderInstaller # "xml"
 
 
 
 ############################################################
-# PLUGINS: SQL OBJECT STORE
+# ALTERNATIVES: OBJECT STORES & PROFILE STORES
 ############################################################
 
-org.apache.isis.extensions.sql.objectstore.SqlPersistorInstaller
-
-
-############################################################
-# PLUGINS: BERKELEY OBJECT STORE
-############################################################
+# xml 
+org.apache.isis.alternatives.objectstore.xml.XmlPersistenceMechanismInstaller   # "xml"
+org.apache.isis.alternatives.profilestore.xml.XmlUserProfileStoreLoaderInstaller # "xml"
 
-org.apache.isis.extensions.berkeley.BerkeleyPersistorMechanismInstaller
+# sql
+org.apache.isis.alternatives.objectstore.sql.SqlPersistorInstaller
 
+# nosql
+org.apache.isis.alternatives.objectstore.nosql.mongo.MongoPersistorMechanismInstaller   # Mongo DB
+org.apache.isis.alternatives.objectstore.nosql.file.FileServerPersistorMechanismInstaller   # "file"
 
-############################################################
-# PLUGINS: NOSQL OBJECT STORE
-############################################################
 
-org.apache.isis.extensions.mongo.MongoPersistorMechanismInstaller   # Mongo DB
-org.apache.isis.extensions.file.FileServerPersistorMechanismInstaller   # FileServer
 
 ############################################################
-# PLUGINS: HIBERNATE PERSISTOR
+# VIEWERS
 ############################################################
 
-# persistors
-org.apache.isis.extensions.hibernate.objectstore.HibernatePersistenceMechanismInstaller  # "hibernate"
+# dnd
+org.apache.isis.viewer.dnd.DndViewerInstaller      # "dnd"
 
-# authenticator
-org.apache.isis.extensions.hibernate.authentication.DatabaseAuthenticationManagerInstaller  # "database"
+# html
+org.apache.isis.viewer.html.HtmlViewerInstaller  # "html"  (runs within embedded web server)
 
-# authorization
-org.apache.isis.extensions.hibernate.authorization.DatabaseAuthorizationManagerInstaller  # "database"
 
 
-############################################################
-# PLUGINS: REMOTING
-############################################################
 
-org.apache.isis.extensions.remoting.http.EncodingOverHttpRemotingViewerInstaller  # "encoding-http"   (runs within embedded web server)
 
 ############################################################
-# incubating
+# to reinstate?
 ############################################################
 
 # viewers
@@ -160,14 +119,13 @@ org.apache.isis.extensions.remoting.http
 #org.apache.isis.nos.client.cli.awt.AwtConsoleCliClientInstaller
 
 # cache object store
-#org.apache.isis.objstore.cache.CachePersistorInstaller
+#org.apache.isis.alternatives.objectstore.cache.CachePersistorInstaller
 
 # connections
-#org.apache.isis.ejb.client.EjbClientConnection
+#org.apache.isis.alternatives.remoting.transport.ejb.client.EjbClientConnection
 
 # telnet connections
-#org.apache.isis.system.install.server.TelnetConsoleListenerInstaller
-
+#org.apache.isis.viewer.telnet.TelnetConsoleListenerInstaller
 
 
 ####### END #########

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java Wed Nov 17 09:55:22 2010
@@ -32,9 +32,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.core.runtime.testdomain.Movie;
-import org.apache.isis.core.runtime.testdomain.Person;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
 
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java Wed Nov 17 09:55:22 2010
@@ -28,9 +28,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.core.runtime.testdomain.Person;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
 import org.apache.isis.core.runtime.testsystem.TestSpecification;
+import org.apache.isis.core.testsupport.testdomain.Person;
 
 
 

Copied: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Movie.java (from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Movie.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Movie.java?p2=incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Movie.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Movie.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Movie.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Movie.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.runtime.testdomain;
+package org.apache.isis.core.testsupport.testdomain;
 
 import java.util.Vector;
 

Copied: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Person.java (from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Person.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Person.java?p2=incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Person.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Person.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Person.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Person.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.runtime.testdomain;
+package org.apache.isis.core.testsupport.testdomain;
 
 import java.util.Date;
 

Copied: incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Role.java (from r1035745, incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Role.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Role.java?p2=incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Role.java&p1=incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Role.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testdomain/Role.java (original)
+++ incubator/isis/trunk/core/testsupport/src/main/java/org/apache/isis/core/testsupport/testdomain/Role.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.runtime.testdomain;
+package org.apache.isis.core.testsupport.testdomain;
 
 public class Role {
     private Person actor;

Modified: incubator/isis/trunk/defaults/objectstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/pom.xml?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/pom.xml (original)
+++ incubator/isis/trunk/defaults/objectstore/pom.xml Wed Nov 17 09:55:22 2010
@@ -44,6 +44,13 @@
     </reporting>
 
 	<dependencies>
+
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>testsupport</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.isis.core</groupId>
             <artifactId>metamodel</artifactId>

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java Wed Nov 17 09:55:22 2010
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
 
 
 public abstract class AbstractInMemoryObjectStoreTest extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java Wed Nov 17 09:55:22 2010
@@ -27,7 +27,6 @@ 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.PersistenceCommand;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
 
 
 public class InMemoryObjectStore_debug extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java Wed Nov 17 09:55:22 2010
@@ -21,7 +21,6 @@
 package org.apache.isis.defaults.objectstore;
 
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
 
 
 public class InMemoryObjectStore_init extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java Wed Nov 17 09:55:22 2010
@@ -25,7 +25,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
 import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
 
 
 public class InMemoryObjectStore_interactionWithAdapterManager extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java Wed Nov 17 09:55:22 2010
@@ -21,7 +21,6 @@
 package org.apache.isis.defaults.objectstore;
 
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
 
 
 public class InMemoryObjectStore_name extends ProxyJunit3TestCase {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java Wed Nov 17 09:55:22 2010
@@ -20,23 +20,19 @@
 
 package org.apache.isis.defaults.objectstore;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.*;
 
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.runtime.persistence.PersistenceSession;
-import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
-import org.apache.isis.defaults.objectstore.InMemoryPersistenceSessionFactory;
-import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
 
 
 /**

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureFilePersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureFilePersistorTest.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureFilePersistorTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureFilePersistorTest.java Wed Nov 17 09:55:22 2010
@@ -37,8 +37,8 @@ import junit.framework.Assert;
 
 import org.apache.isis.core.runtime.fixture.ObjectFixtureFilePersistor;
 import org.apache.isis.core.runtime.fixturesinstaller.FixtureException;
-import org.apache.isis.core.runtime.testdomain.Movie;
-import org.apache.isis.core.runtime.testdomain.Person;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
 import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -50,6 +50,7 @@ import org.junit.Test;
  */
 public class ObjectFixtureFilePersistorTest {
 
+    private static final String PACKAGE_BASE = "org.apache.isis.core.testsupport";
     private ObjectFixtureFilePersistor persistor;
     private TestProxySystemII system;
     private Person person;
@@ -73,8 +74,7 @@ public class ObjectFixtureFilePersistorT
     @Test
     public void loadInstance() throws Exception {
         StringReader reader =
-            new StringReader(
-                "org.apache.isis.runtime.testdomain.Person#1\n  name: Fred Smith\n  date: 08-Mar-2010 00:00");
+            new StringReader(PACKAGE_BASE + ".testdomain.Person#1\n  name: Fred Smith\n  date: 08-Mar-2010 00:00");
         Set<Object> objects = persistor.loadData(reader);
 
         Assert.assertEquals(1, objects.size());
@@ -87,7 +87,7 @@ public class ObjectFixtureFilePersistorT
     @Test
     public void invalidFieldLine() throws Exception {
         try {
-            StringReader reader = new StringReader("org.apache.isis.runtime.testdomain.Person#1\n  name Fred Smith");
+            StringReader reader = new StringReader(PACKAGE_BASE + ".testdomain.Person#1\n  name Fred Smith");
             persistor.loadData(reader);
             Assert.fail();
         } catch (FixtureException e) {
@@ -98,7 +98,7 @@ public class ObjectFixtureFilePersistorT
 
     @Test
     public void oldFieldNameSkipped() throws Exception {
-        StringReader reader = new StringReader("org.apache.isis.runtime.testdomain.Person#1\n  xname: Fred Smith");
+        StringReader reader = new StringReader(PACKAGE_BASE + ".testdomain.Person#1\n  xname: Fred Smith");
         Set<Object> objects = persistor.loadData(reader);
         Object object = objects.toArray()[0];
         Assert.assertNull(((Person) object).getName());
@@ -121,9 +121,8 @@ public class ObjectFixtureFilePersistorT
 
         StringWriter out = new StringWriter();
         persistor.save(objects, out);
-        String string1 = "org.apache.isis.runtime.testdomain.Person#2\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\n";
-        String string2 =
-            "org.apache.isis.runtime.testdomain.Person#2\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\n";
+        String string1 = PACKAGE_BASE + ".testdomain.Person#2\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\n";
+        String string2 = PACKAGE_BASE + ".testdomain.Person#2\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\n";
         // *nix vs Windows?
         if ((out.toString().compareTo(string1) != 0) && (out.toString().compareTo(string2) != 0)) {
             Assert.assertEquals(string1, out.toString());
@@ -155,9 +154,11 @@ public class ObjectFixtureFilePersistorT
 
         // *nix vs Windows?
         String string1 =
-            "org.apache.isis.runtime.testdomain.Person#2\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\norg.apache.isis.runtime.testdomain.Person#3\n  date: \n  name: \n";
+            PACKAGE_BASE + ".testdomain.Person#2\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\n" + PACKAGE_BASE
+                + ".testdomain.Person#3\n  date: \n  name: \n";
         String string2 =
-            "org.apache.isis.runtime.testdomain.Person#2\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\norg.apache.isis.runtime.testdomain.Person#3\r\n  date: \r\n  name: \r\n";
+            PACKAGE_BASE + ".testdomain.Person#2\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\n" + PACKAGE_BASE
+                + ".testdomain.Person#3\r\n  date: \r\n  name: \r\n";
         if ((out.toString().compareTo(string1) != 0) && (out.toString().compareTo(string2) != 0)) {
             Assert.assertEquals(string1, out.toString());
         }
@@ -187,11 +188,13 @@ public class ObjectFixtureFilePersistorT
         StringWriter out = new StringWriter();
         persistor.save(objects, out);
         String string1 =
-            "org.apache.isis.runtime.testdomain.Movie#2\n  director: org.apache.isis.runtime.testdomain.Person#3\n  name: The Blockbuster\n  roles: \n"
-                + "org.apache.isis.runtime.testdomain.Person#3\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\n";
+            PACKAGE_BASE + ".testdomain.Movie#2\n  director: " + PACKAGE_BASE
+                + ".testdomain.Person#3\n  name: The Blockbuster\n  roles: \n" + PACKAGE_BASE
+                + ".testdomain.Person#3\n  date: 08-Mar-2010 00:00\n  name: Fred Smith\n";
         String string2 =
-            "org.apache.isis.runtime.testdomain.Movie#2\r\n  director: org.apache.isis.runtime.testdomain.Person#3\r\n  name: The Blockbuster\r\n  roles: \r\n"
-                + "org.apache.isis.runtime.testdomain.Person#3\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\n";
+            PACKAGE_BASE + ".testdomain.Movie#2\r\n  director: " + PACKAGE_BASE
+                + ".testdomain.Person#3\r\n  name: The Blockbuster\r\n  roles: \r\n" + PACKAGE_BASE
+                + ".testdomain.Person#3\r\n  date: 08-Mar-2010 00:00\r\n  name: Fred Smith\r\n";
         if ((out.toString().compareTo(string1) != 0) && (out.toString().compareTo(string2) != 0)) {
             Assert.assertEquals(string1, out.toString());
         }

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureServiceTest.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/fixture/ObjectFixtureServiceTest.java Wed Nov 17 09:55:22 2010
@@ -31,9 +31,9 @@ import junit.framework.Assert;
 
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.fixture.ObjectFixtureService;
-import org.apache.isis.core.runtime.testdomain.Movie;
-import org.apache.isis.core.runtime.testdomain.Person;
-import org.apache.isis.core.runtime.testdomain.Role;
+import org.apache.isis.core.testsupport.testdomain.Movie;
+import org.apache.isis.core.testsupport.testdomain.Person;
+import org.apache.isis.core.testsupport.testdomain.Role;
 import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java Wed Nov 17 09:55:22 2010
@@ -22,6 +22,10 @@ package org.apache.isis.defaults.objects
 
 import java.util.List;
 
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
@@ -30,11 +34,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
-import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
 
 import com.google.common.collect.Lists;
 

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java Wed Nov 17 09:55:22 2010
@@ -26,15 +26,14 @@ import static org.junit.Assert.assertTha
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
 
 /**
  * Tested in style of <i>Working Effectively with Legacy Code</i> (Feathers) 

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java Wed Nov 17 09:55:22 2010
@@ -26,6 +26,11 @@ import static org.junit.Assert.assertTha
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
@@ -33,12 +38,6 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
 
 /**
  * Tested in style of <i>Working Effectively with Legacy Code</i> (Feathers) 

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java Wed Nov 17 09:55:22 2010
@@ -23,6 +23,7 @@ package org.apache.isis.defaults.objects
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
@@ -30,9 +31,6 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
-import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjectsDefault;
 
 @RunWith(JMock.class)
 public class ObjectStorePersistedObjectsDefault_instances {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java Wed Nov 17 09:55:22 2010
@@ -24,14 +24,13 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
+import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
-import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
-import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjectsDefault;
 
 public class ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento {
 

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java Wed Nov 17 09:55:22 2010
@@ -24,14 +24,13 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjectsDefault;
 
 @RunWith(JMock.class)
 public class ObjectStorePersistedObjectsDefault_services {

Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/testsystem/TestProxySystemII.java Wed Nov 17 09:55:22 2010
@@ -23,10 +23,6 @@ package org.apache.isis.defaults.objects
 import java.util.Collections;
 import java.util.List;
 
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.jmock.lib.legacy.ClassImposteriser;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -43,6 +39,10 @@ import org.apache.isis.core.runtime.syst
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
 import org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller;
 import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.lib.legacy.ClassImposteriser;
 
 /*
  * TODO allow to be created with specific requirements for components being set up rather than using mocks.

Modified: incubator/isis/trunk/defaults/objectstore/test.data
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/test.data?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/test.data (original)
+++ incubator/isis/trunk/defaults/objectstore/test.data Wed Nov 17 09:55:22 2010
@@ -1,4 +1,4 @@
-org.apache.isis.runtime.testdomain.Person#1
+org.apache.isis.core.testsupport.testdomain.Person#1
   name: Fred Smith
   # ignores: data
   date: 08-Mar-2010 13:32
\ No newline at end of file

Copied: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java (from r1035745, incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java?p2=incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java&p1=incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewer.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.viewer.dnd.bootstrap;
+package org.apache.isis.viewer.dnd;
 
 import java.awt.Dimension;
 import java.util.StringTokenizer;

Copied: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewerInstaller.java (from r1035745, incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewerInstaller.java?p2=incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewerInstaller.java&p1=incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/bootstrap/DndViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/DndViewerInstaller.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.viewer.dnd.bootstrap;
+package org.apache.isis.viewer.dnd;
 
 import org.apache.isis.core.runtime.viewer.IsisViewer;
 import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract;

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java (from r1035745, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerConstants.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.viewer.html.viewer;
+package org.apache.isis.viewer.html;
 
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 

Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java (from r1035745, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java&r1=1035745&r2=1035964&rev=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java Wed Nov 17 09:55:22 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.viewer.html.viewer;
+package org.apache.isis.viewer.html;
 
 import org.apache.isis.core.commons.lang.MapUtils;
 import org.apache.isis.core.runtime.Isis;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java?rev=1035964&r1=1035963&r2=1035964&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java Wed Nov 17 09:55:22 2010
@@ -41,7 +41,7 @@ import org.apache.isis.viewer.html.compo
 import org.apache.isis.viewer.html.component.Page;
 import org.apache.isis.viewer.html.component.Table;
 
-import static org.apache.isis.viewer.html.viewer.HtmlViewerConstants.*;
+import static org.apache.isis.viewer.html.HtmlViewerConstants.*;
 
 
 public class HtmlComponentFactory implements ComponentFactory {



Mime
View raw message