You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/16 16:41:32 UTC
svn commit: r1035661 [5/5] - in /incubator/isis/trunk:
alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/
alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/runtime/testsystem/
alternatives/remoting/comm...
Modified: incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java (original)
+++ incubator/isis/trunk/alternatives/security/ldap/src/test/java/org/apache/isis/runtime/authentication/standard/ldap/LdapAuthenticatorTester.java Tue Nov 16 15:41:23 2010
@@ -20,6 +20,7 @@
package org.apache.isis.runtime.authentication.standard.ldap;
+import org.apache.isis.alternatives.security.ldap.authentication.LdapAuthenticator;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.context.IsisContext;
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=1035661&r1=1035660&r2=1035661&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 Tue Nov 16 15:41:23 2010
@@ -32,14 +32,14 @@ org.apache.isis.core.webserver.embedded.
############################################################
# security
-org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller # "noop"
-org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller # "noop"
+org.apache.isis.defaults.security.authentication.NoopAuthenticationManagerInstaller # "noop"
+org.apache.isis.defaults.security.authorization.NoopAuthorizationManagerInstaller # "noop"
# prog model
org.apache.isis.defaults.progmodel.JavaReflectorInstaller # "java"
# objectstore
-org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller # "in-memory"
+org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller # "in-memory"
@@ -48,12 +48,12 @@ org.apache.isis.runtime.objectstore.inme
############################################################
# file
-org.apache.isis.runtime.authentication.standard.file.FileAuthenticationManagerInstaller # "file"
-org.apache.isis.runtime.authorization.standard.file.FileAuthorizationManagerInstaller # "file"
+org.apache.isis.alternatives.security.file.authentication.FileAuthenticationManagerInstaller # "file"
+org.apache.isis.alternatives.security.file.authorization.FileAuthorizationManagerInstaller # "file"
# ldap
-org.apache.isis.runtime.authorization.standard.ldap.LdapAuthorizationManagerInstaller # "ldap"
-org.apache.isis.runtime.authentication.standard.ldap.LdapAuthenticationManagerInstaller # "ldap"
+org.apache.isis.alternatives.security.ldap.authorization.LdapAuthorizationManagerInstaller # "ldap"
+org.apache.isis.alternatives.security.ldap.authentication.LdapAuthenticationManagerInstaller # "ldap"
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import java.text.MessageFormat;
import java.util.Iterator;
@@ -52,12 +52,12 @@ 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.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjectsDefault;
-import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemoryCreateObjectCommand;
-import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemoryDestroyObjectCommand;
-import org.apache.isis.runtime.objectstore.inmemory.internal.commands.InMemorySaveObjectCommand;
+import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjectsDefault;
+import org.apache.isis.defaults.objectstore.internal.commands.InMemoryCreateObjectCommand;
+import org.apache.isis.defaults.objectstore.internal.commands.InMemoryDestroyObjectCommand;
+import org.apache.isis.defaults.objectstore.internal.commands.InMemorySaveObjectCommand;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceMechanismInstaller.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceMechanismInstaller.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceMechanismInstaller.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceMechanismInstaller.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceSessionFactory.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceSessionFactory.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceSessionFactory.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryPersistenceSessionFactory.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.runtime.persistence.PersistenceSession;
import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
@@ -26,9 +26,9 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.persistence.oidgenerator.OidGenerator;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjectsDefault;
+import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjectsDefault;
public class InMemoryPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import java.util.ArrayList;
import java.util.Collections;
@@ -43,7 +43,7 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
+import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
/*
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjects.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjects.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjects.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjects.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
Copied: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault.java?p2=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault.java&p1=incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java Tue Nov 16 15:41:23 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
+package org.apache.isis.defaults.objectstore.internal.commands;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
public abstract class AbstractInMemoryPersistenceCommand extends PersistenceCommandAbstract {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryCreateObjectCommand.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryCreateObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryCreateObjectCommand.java Tue Nov 16 15:41:23 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
+package org.apache.isis.defaults.objectstore.internal.commands;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersistenceCommand implements
CreateObjectCommand {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryDestroyObjectCommand.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemoryDestroyObjectCommand.java Tue Nov 16 15:41:23 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
+package org.apache.isis.defaults.objectstore.internal.commands;
import org.apache.log4j.Logger;
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.transaction.ObjectPersistenceException;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
public final class InMemoryDestroyObjectCommand
extends AbstractInMemoryPersistenceCommand
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemorySaveObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemorySaveObjectCommand.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemorySaveObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/InMemorySaveObjectCommand.java Tue Nov 16 15:41:23 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
+package org.apache.isis.defaults.objectstore.internal.commands;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
public final class InMemorySaveObjectCommand
extends AbstractInMemoryPersistenceCommand
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/AbstractInMemoryObjectStoreTest.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import java.util.Collections;
@@ -26,6 +26,7 @@ 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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_debug.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import java.util.Collections;
@@ -27,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.PersistenceCommand;
import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
+import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
public class InMemoryObjectStore_debug extends ProxyJunit3TestCase {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_init.java Tue Nov 16 15:41:23 2010
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_interactionWithAdapterManager.java Tue Nov 16 15:41:23 2010
@@ -18,13 +18,14 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_name.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_name.java Tue Nov 16 15:41:23 2010
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_openAndClose.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_openAndClose.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
@@ -34,7 +34,9 @@ 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.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.InMemoryObjectStore;
+import org.apache.isis.defaults.objectstore.InMemoryPersistenceSessionFactory;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
/**
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_persist.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_persist.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_persist.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_persist.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import java.util.Collections;
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_reset.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_reset.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_reset.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_reset.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_retrieve.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_retrieve.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_retrieve.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_retrieve.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_serviceRegistry.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_serviceRegistry.java?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_serviceRegistry.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore_serviceRegistry.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory;
+package org.apache.isis.defaults.objectstore;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
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=1035661&r1=1035653&r2=1035661&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 Tue Nov 16 15:41:23 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.fixture;
+package org.apache.isis.defaults.objectstore.fixture;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -39,7 +39,7 @@ import org.apache.isis.core.runtime.fixt
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.runtime.testsystem.TestProxySystemII;
+import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
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=1035661&r1=1035653&r2=1035661&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 Tue Nov 16 15:41:23 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.fixture;
+package org.apache.isis.defaults.objectstore.fixture;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -34,7 +34,7 @@ import org.apache.isis.core.runtime.fixt
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.runtime.testsystem.TestProxySystemII;
+import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_findInstancesAndAdd.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import java.util.List;
@@ -34,6 +34,7 @@ import org.apache.isis.core.metamodel.ad
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;
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_init.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -34,6 +34,7 @@ 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)
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStoreInstances_save.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -38,6 +38,7 @@ import org.apache.isis.core.metamodel.ad
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)
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_instances.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -31,6 +31,8 @@ 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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_savesOidGeneratorAsMemento.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
@@ -31,6 +31,7 @@ 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 {
Copied: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java (from r1035653, incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/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?p2=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java&p1=incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java&r1=1035653&r2=1035661&rev=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/defaults/objectstore/internal/ObjectStorePersistedObjectsDefault_services.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.objectstore.inmemory.internal;
+package org.apache.isis.defaults.objectstore.internal;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
@@ -31,6 +31,7 @@ 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=1035661&r1=1035653&r2=1035661&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 Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.testsystem;
+package org.apache.isis.defaults.objectstore.testsystem;
import java.util.Collections;
import java.util.List;
@@ -41,8 +41,8 @@ import org.apache.isis.core.runtime.pers
import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller;
import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
/*
* TODO allow to be created with specific requirements for components being set up rather than using mocks.
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java Tue Nov 16 15:41:23 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.defaults.progmodel;
import java.util.Collections;
import java.util.HashSet;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.defaults.progmodel;
import org.junit.Assert;
import org.junit.Test;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.defaults.progmodel;
import java.util.Vector;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.defaults.progmodel;
import org.junit.Assert;
import org.junit.Test;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.specloader;
+package org.apache.isis.defaults.progmodel;
import org.junit.Assert;
import org.junit.Test;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/AuthenticatorNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/AuthenticatorNoop.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/AuthenticatorNoop.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/AuthenticatorNoop.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication.standard.noop;
+package org.apache.isis.defaults.security.authentication;
import org.apache.isis.core.commons.components.Noop;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/NoopAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/NoopAuthenticationManagerInstaller.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/NoopAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authentication/NoopAuthenticationManagerInstaller.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authentication.standard.noop;
+package org.apache.isis.defaults.security.authentication;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizationManagerInstaller.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizationManagerInstaller.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authorization.standard.noop;
+package org.apache.isis.defaults.security.authorization;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizor.java?rev=1035661&r1=1035653&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizor.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/defaults/security/authorization/NoopAuthorizor.java Tue Nov 16 15:41:23 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.runtime.authorization.standard.noop;
+package org.apache.isis.defaults.security.authorization;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java Tue Nov 16 15:41:23 2010
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.bdd.commo
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.core.runtime.authentication.standard.Authenticator;
-import org.apache.isis.runtime.authentication.standard.noop.AuthenticatorNoop;
+import org.apache.isis.defaults.security.authentication.AuthenticatorNoop;
public class StoryAuthenticationManagerInstaller extends
AuthenticationManagerStandardInstallerAbstract {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceMechanismInstaller.java Tue Nov 16 15:41:23 2010
@@ -2,7 +2,7 @@ package org.apache.isis.viewer.bdd.commo
import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
+import org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller;
public class StoryInMemoryPersistenceMechanismInstaller extends
InMemoryPersistenceMechanismInstaller {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java Tue Nov 16 15:41:23 2010
@@ -4,8 +4,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceSessionFactory;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.InMemoryPersistenceSessionFactory;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
/**
* As per {@link InMemoryPersistenceSessionFactory}, but uses the
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java Tue Nov 16 15:41:23 2010
@@ -8,8 +8,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
-import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
+import org.apache.isis.defaults.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.defaults.objectstore.internal.ObjectStorePersistedObjects;
import com.google.common.collect.Iterables;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java Tue Nov 16 15:41:23 2010
@@ -72,6 +72,10 @@ public class SetUpObjectsPeer extends Ab
private final List<String> cellTextList = new ArrayList<String>();
private String alias;
+ // ///////////////////////////////////////////////////////////////////////
+ // constructor
+ // ///////////////////////////////////////////////////////////////////////
+
public SetUpObjectsPeer(AliasRegistry aliasRegistry, final String className, final SetUpObjectsPeer.Mode mode,
final CellBinding aliasBinding) {
super(aliasRegistry, aliasBinding);
@@ -102,6 +106,10 @@ public class SetUpObjectsPeer extends Ab
return aliasBinding;
}
+ // ///////////////////////////////////////////////////////////////////////
+ // header
+ // ///////////////////////////////////////////////////////////////////////
+
public PropertyResult definePropertyOrAlias(String heading, int colNum) {
OneToOneAssociation otoa = null;
@@ -133,10 +141,9 @@ public class SetUpObjectsPeer extends Ab
}
}
- public void resetForNextObject() {
- cellTextList.clear();
- this.alias = null;
- }
+ // ///////////////////////////////////////////////////////////////////////
+ // each row
+ // ///////////////////////////////////////////////////////////////////////
/**
* Used by Concordion only.
@@ -161,6 +168,11 @@ public class SetUpObjectsPeer extends Ab
resetForNextObject();
}
+ public void resetForNextObject() {
+ cellTextList.clear();
+ this.alias = null;
+ }
+
public ObjectAdapter createInstance() {
if (spec == null) {
return null;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/toolbar/ToolbarTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/toolbar/ToolbarTest.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/toolbar/ToolbarTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/toolbar/ToolbarTest.java Tue Nov 16 15:41:23 2010
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
import org.apache.isis.extensions.dnd.DummyView;
import org.apache.isis.extensions.dnd.TestToolkit;
import org.apache.isis.extensions.dnd.drawing.Location;
@@ -32,7 +33,6 @@ import org.apache.isis.extensions.dnd.dr
import org.apache.isis.extensions.dnd.view.View;
import org.apache.isis.extensions.dnd.view.content.NullContent;
import org.apache.isis.extensions.dnd.view.look.LookFactory;
-import org.apache.isis.runtime.testsystem.TestProxySystemII;
import static org.junit.Assert.assertEquals;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java Tue Nov 16 15:41:23 2010
@@ -25,7 +25,7 @@ import org.apache.log4j.Logger;
import org.junit.Ignore;
import org.junit.Test;
import org.apache.isis.core.runtime.userprofile.Options;
-import org.apache.isis.runtime.testsystem.TestProxySystemII;
+import org.apache.isis.defaults.objectstore.testsystem.TestProxySystemII;
import static org.junit.Assert.*;
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java Tue Nov 16 15:41:23 2010
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.junit.int
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.defaults.objectstore.InMemoryPersistenceMechanismInstaller;
import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
public class InMemoryPersistenceMechanismInstallerWithinJunit extends InMemoryPersistenceMechanismInstaller {
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1035661&r1=1035660&r2=1035661&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java Tue Nov 16 15:41:23 2010
@@ -25,8 +25,8 @@ import org.apache.isis.core.runtime.inst
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.installers.IsisSystemUsingInstallers;
import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
-import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller;
-import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller;
+import org.apache.isis.defaults.security.authentication.NoopAuthenticationManagerInstaller;
+import org.apache.isis.defaults.security.authorization.NoopAuthorizationManagerInstaller;
import org.junit.internal.runners.TestClass;
public class IsisSystemUsingInstallersWithinJunit extends IsisSystemUsingInstallers {