svn commit: r1032543 [18/26] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassi...

[da...@apache.org]

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerNoop.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.viewer;
 
 import org.apache.isis.core.commons.components.Noop;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.web.WebAppSpecification;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/web/EmbeddedWebServerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/web/EmbeddedWebServerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/web/EmbeddedWebServerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/web/EmbeddedWebServerAbstract.java Mon Nov  8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.context.IsisContext;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorAbstractTest.java Mon Nov  8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.runtime.authentication.AuthenticationRequestAbstract;
 import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/MultiUserExplorationSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/MultiUserExplorationSessionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/MultiUserExplorationSessionTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/MultiUserExplorationSessionTest.java Mon Nov  8 11:23:08 2010
@@ -36,8 +36,8 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
 import org.apache.isis.runtime.authentication.standard.exploration.ExplorationAuthenticator;
 import org.apache.isis.runtime.authentication.standard.exploration.ExplorationAuthenticatorConstants;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java Mon Nov  8 11:23:08 2010
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTha
 
 import org.jmock.integration.junit4.JMock;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 @RunWith(JMock.class)
 public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabilityTestAbstract {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java Mon Nov  8 11:23:08 2010
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
 
 public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.authenti
 
 import org.jmock.integration.junit4.JMock;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 @RunWith(JMock.class)
 public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodabilityTestAbstract {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java Mon Nov  8 11:23:08 2010
@@ -33,8 +33,8 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTha
 
 import java.util.List;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.runtime.authentication.NoAuthenticatorException;
 import org.jmock.Mockery;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/exploration/ExplorationAuthenticatorTest.java Mon Nov  8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.AuthenticationRequestAbstract;
 import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.isis.runtime.system.SystemConstants;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/fixture/LogonFixtureAuthenticatorTest.java Mon Nov  8 11:23:08 2010
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.authentication.AuthenticationRequestAbstract;
 import org.apache.isis.runtime.authentication.standard.exploration.MultiUserExplorationSession;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/context/IsisContextTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/context/IsisContextTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/context/IsisContextTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/context/IsisContextTest.java Mon Nov  8 11:23:08 2010
@@ -31,9 +31,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java Mon Nov  8 11:23:08 2010
@@ -27,8 +27,8 @@ import java.io.StringReader;
 import junit.framework.TestCase;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
 
 
 public class SimpleHelpManagerTest extends TestCase {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNot
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java Mon Nov  8 11:23:08 2010
@@ -30,16 +30,16 @@ import org.jmock.integration.junit4.JUni
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.context.IsisContextStatic;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java Mon Nov  8 11:23:08 2010
@@ -33,16 +33,16 @@ import org.jmock.lib.legacy.ClassImposte
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.context.IsisContextStatic;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtilTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtilTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtilTest.java Mon Nov  8 11:23:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.runtime.persistence;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.runtime.testsystem.TestPojo;
 import org.apache.isis.runtime.testsystem.TestProxyOid;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/PersistorUtil_ValueAdapterTest.java Mon Nov  8 11:23:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.runtime.persistence;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 import org.apache.isis.metamodel.facets.FacetUtil;
 import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacetAlways;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.persistence.adapterfactory.pojo;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.runtime.persistence.ConcurrencyException;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.runtime.testsystem.TestPojo;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java Mon Nov  8 11:23:08 2010
@@ -26,10 +26,10 @@ import java.util.Vector;
 import junit.framework.Assert;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.runtime.persistence.ObjectNotFoundException;
 import org.apache.isis.runtime.persistence.UnsupportedFindException;
 import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEqu
 
 import java.util.Collections;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.runtime.persistence.PersistenceSessionFactory;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmContractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmContractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmContractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmContractTest.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.persiste
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapter;
 import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java Mon Nov  8 11:23:08 2010
@@ -23,13 +23,13 @@ package org.apache.isis.runtime.persiste
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.runtime.persistence.NotPersistableException;
 import org.apache.isis.runtime.persistence.adapterfactory.pojo.PojoAdapter;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dummy/DummyPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dummy/DummyPersistAlgorithm.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dummy/DummyPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dummy/DummyPersistAlgorithm.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.persistence.objectstore.algorithm.dummy;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithm;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java Mon Nov  8 11:23:08 2010
@@ -32,7 +32,7 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtime.persistence.objectstore.ObjectStoreSpy;
 import org.apache.isis.runtime.testsystem.TestProxySystem;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidDeStringTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidDeStringTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidDeStringTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidDeStringTest.java Mon Nov  8 11:23:08 2010
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.
 import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
 public class SerialOidDeStringTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityAbstractTest.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.persiste
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
 
 public abstract class SerialOidEncodabilityAbstractTest extends EncodabilityContractTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentTest.java Mon Nov  8 11:23:08 2010
@@ -24,8 +24,8 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.metamodel.encoding.EncodabilityContractTest;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public class SerialOidEncodabilityWhenPersistentTest extends SerialOidEncodabilityAbstractTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenPersistentWithPreviousTest.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.persistence.oidgenerator.simple;
 
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public class SerialOidEncodabilityWhenPersistentWithPreviousTest extends SerialOidEncodabilityAbstractTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOidEncodabilityWhenTransientTest.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.persistence.oidgenerator.simple;
 
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.Encodable;
 
 public class SerialOidEncodabilityWhenTransientTest extends SerialOidEncodabilityAbstractTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionImplTest.java Mon Nov  8 11:23:08 2010
@@ -29,13 +29,13 @@ import org.jmock.integration.junit4.JUni
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
 import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.internal.ObjectActionImpl;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java Mon Nov  8 11:23:08 2010
@@ -29,11 +29,13 @@ import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
 import org.apache.isis.metamodel.facets.When;
 import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetAbstract;
 import org.apache.isis.metamodel.facets.hide.HiddenFacetAbstract;
@@ -51,8 +53,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.identifier.IdentifiedImpl;
 import org.apache.isis.runtime.testsystem.TestProxySystem;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationImplTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationImplTest.java Mon Nov  8 11:23:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.runtime.system;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.metamodel.specloader.internal.OneToManyAssociationImpl;
 import org.apache.isis.runtime.system.specpeer.DummyOneToManyPeer;
 import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionParamPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionParamPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionParamPeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionParamPeer.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.system.specpeer;
 
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionPeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyActionPeer.java Mon Nov  8 11:23:08 2010
@@ -22,14 +22,14 @@ package org.apache.isis.runtime.system.s
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
 import org.apache.isis.runtime.testsystem.TestSpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToManyPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToManyPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToManyPeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToManyPeer.java Mon Nov  8 11:23:08 2010
@@ -26,14 +26,14 @@ import junit.framework.Assert;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 
 
 public class DummyOneToManyPeer extends FacetHolderImpl implements ObjectAssociationPeer {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToOnePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToOnePeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToOnePeer.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/specpeer/DummyOneToOnePeer.java Mon Nov  8 11:23:08 2010
@@ -26,12 +26,12 @@ import junit.framework.Assert;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/MovieSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/MovieSpecification.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/MovieSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/MovieSpecification.java Mon Nov  8 11:23:08 2010
@@ -20,17 +20,17 @@
 
 package org.apache.isis.runtime.testspec;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+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.metamodel.interactions.InteractionContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.testdomain.Movie;
 import org.apache.isis.runtime.testdomain.Person;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/OneToOneAssociationTest.java Mon Nov  8 11:23:08 2010
@@ -22,19 +22,19 @@ package org.apache.isis.runtime.testspec
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.FacetHolderNoop;
 import org.apache.isis.metamodel.interactions.PropertyAccessContext;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.ValidityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/PersonSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/PersonSpecification.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/PersonSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/PersonSpecification.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.runtime.testspec;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+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.runtime.testdomain.Person;
 import org.apache.isis.runtime.testsystem.TestProxyAdapter;
 import org.apache.isis.runtime.testsystem.TestSpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/ValueFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/ValueFieldTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/ValueFieldTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/ValueFieldTest.java Mon Nov  8 11:23:08 2010
@@ -21,19 +21,19 @@
 package org.apache.isis.runtime.testspec;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.FacetHolderNoop;
 import org.apache.isis.metamodel.interactions.PropertyAccessContext;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.ValidityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthenticationManagerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthenticationManagerNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthenticationManagerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthenticationManagerNoop.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.testsystem;
 
 import org.apache.isis.core.commons.components.Noop;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthorizationManagerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthorizationManagerNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthorizationManagerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/AuthorizationManagerNoop.java Mon Nov  8 11:23:08 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.runtime.testsystem;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 
 public class AuthorizationManagerNoop implements AuthorizationManager {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ObjectAssociationNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ObjectAssociationNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ObjectAssociationNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ObjectAssociationNoop.java Mon Nov  8 11:23:08 2010
@@ -21,16 +21,16 @@
 package org.apache.isis.runtime.testsystem;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.identifier.IdentifiedImpl;
 
 
 public class ObjectAssociationNoop extends ObjectAssociationAbstract {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAction.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAction.java Mon Nov  8 11:23:08 2010
@@ -22,23 +22,23 @@ package org.apache.isis.runtime.testsyst
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.facets.FacetHolderNoop;
 import org.apache.isis.metamodel.interactions.ActionInvocationContext;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
 
 
 public class TestProxyAction extends FacetHolderNoop implements ObjectAction {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAdapter.java Mon Nov  8 11:23:08 2010
@@ -24,16 +24,16 @@ import java.util.Hashtable;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Specification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.runtime.persistence.ConcurrencyException;
 
 public class TestProxyAdapter implements ObjectAdapter {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyAssociation.java Mon Nov  8 11:23:08 2010
@@ -26,14 +26,17 @@ import junit.framework.Assert;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.ConsentAbstract;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.ConsentAbstract;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolderNoop;
 import org.apache.isis.metamodel.interactions.InteractionContext;
@@ -43,9 +46,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 
 
 public class TestProxyAssociation extends FacetHolderNoop implements OneToOneAssociation {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyCollectionAdapter.java Mon Nov  8 11:23:08 2010
@@ -31,18 +31,18 @@ import org.apache.commons.collections.En
 import org.apache.commons.collections.iterators.IteratorEnumeration;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ObjectList;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectList;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Specification;
 import org.apache.isis.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyConfiguration.java Mon Nov  8 11:23:08 2010
@@ -30,7 +30,7 @@ import junit.framework.AssertionFailedEr
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 
 
 public class TestProxyConfiguration implements IsisConfiguration {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyField.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyField.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyField.java Mon Nov  8 11:23:08 2010
@@ -21,22 +21,22 @@
 package org.apache.isis.runtime.testsystem;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
-import org.apache.isis.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.ValidityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
 
 
 public class TestProxyField extends FacetHolderImpl implements ObjectAssociation {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyIdentityMapOriginal.java Mon Nov  8 11:23:08 2010
@@ -27,10 +27,10 @@ import java.util.Vector;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOid.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOid.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOid.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.testsystem;
 
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 
 public class TestProxyOid implements Oid {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOidGenerator.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyOidGenerator.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.testsystem;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java Mon Nov  8 11:23:08 2010
@@ -27,13 +27,13 @@ import java.util.Hashtable;
 import java.util.Vector;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyReflector.java Mon Nov  8 11:23:08 2010
@@ -25,11 +25,12 @@ import java.util.List;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.services.ServicesInjector;
 import org.apache.isis.metamodel.services.ServicesInjectorNoop;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
@@ -37,7 +38,6 @@ import org.apache.isis.metamodel.specloa
 import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
 import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySession.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySession.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.testsystem;
 
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
 
 
 public class TestProxySession extends AuthenticationSessionAbstract {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java Mon Nov  8 11:23:08 2010
@@ -25,14 +25,14 @@ import java.util.List;
 import java.util.Vector;
 
 import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;
 import org.apache.isis.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyVersion.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyVersion.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyVersion.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.testsyst
 
 import java.util.Date;
 
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.version.Version;
 
 
 public class TestProxyVersion implements Version {