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/08 13:59:33 UTC
svn commit: r1032561 [17/19] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/
alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/...
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstaller.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstaller.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.transaction.facetdecorator;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
public interface TransactionFacetDecoratorInstaller extends FacetDecoratorInstaller {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.transaction.facetdecorator;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.runtime.installers.InstallerAbstract;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java Mon Nov 8 12:58:33 2010
@@ -21,14 +21,14 @@
package org.apache.isis.runtime.transaction.facetdecorator.standard;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.runtime.transaction.facetdecorator.TransactionFacetDecoratorAbstract;
import org.apache.isis.runtime.transaction.facets.ActionInvocationFacetWrapTransaction;
import org.apache.isis.runtime.transaction.facets.CollectionAddToFacetWrapTransaction;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.transact
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.transaction.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.transaction.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.transaction.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.transaction.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.transaction.facets;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.DecoratingFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.facets.DecoratingFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetAbstract;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java Mon Nov 8 12:58:33 2010
@@ -28,6 +28,8 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationFacets;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -37,8 +39,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
import org.apache.isis.core.metamodel.util.SpecUtils;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
public final class Dump {
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
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.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtime.imageloader.TemplateImageLoader;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -36,11 +36,11 @@ import org.apache.isis.core.metamodel.ad
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.facets.object.encodeable.EncodableFacet;
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.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.runtime.context.IsisContextStatic;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.session.IsisSession;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -39,11 +39,11 @@ import org.apache.isis.core.metamodel.ad
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.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
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.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.runtime.context.IsisContextStatic;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.session.IsisSession;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.persiste
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.core.metamodel.facets.FacetUtil;
import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacetAlways;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.testsystem.TestProxyField;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertEqu
import java.util.Collections;
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.core.metamodel.services.ServicesInjectorDefault;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java Mon Nov 8 12:58:33 2010
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.apache.isis.core.commons.lang.MethodUtils;
-import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.specloader.internal.introspector.MethodFinderUtils;
+import org.apache.isis.core.metamodel.facets.MethodScope;
+import org.apache.isis.core.metamodel.specloader.internal.introspector.MethodFinderUtils;
@RunWith(Parameterized.class)
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -30,14 +30,14 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
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.specloader.internal.ObjectActionImpl;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
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/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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -34,9 +34,16 @@ import org.apache.isis.core.metamodel.ad
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.facets.When;
+import org.apache.isis.core.metamodel.interactions.PropertyUsabilityContext;
+import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
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;
import org.apache.isis.metamodel.facets.hide.HiddenFacetAlways;
@@ -46,13 +53,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.hide.HideForSessionFacetAbstract;
import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
-import org.apache.isis.metamodel.interactions.PropertyUsabilityContext;
-import org.apache.isis.metamodel.interactions.PropertyVisibilityContext;
-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.runtimecontext.spec.feature.ObjectMemberAbstract;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -21,10 +21,10 @@
package org.apache.isis.runtime.system;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
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.specloader.internal.OneToManyAssociationImpl;
+import org.apache.isis.core.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/TypeExtractorMethodReturnTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java Mon Nov 8 12:58:33 2010
@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
import java.util.List;
import org.junit.Test;
-import org.apache.isis.metamodel.specloader.internal.TypeExtractorMethodReturn;
+import org.apache.isis.core.metamodel.specloader.internal.TypeExtractorMethodReturn;
public class TypeExtractorMethodReturnTest {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java Mon Nov 8 12:58:33 2010
@@ -29,7 +29,7 @@ import java.util.List;
import org.junit.Test;
import org.apache.isis.core.commons.matchers.NofMatchers;
-import org.apache.isis.metamodel.specloader.internal.TypeExtractorMethodParameters;
+import org.apache.isis.core.metamodel.specloader.internal.TypeExtractorMethodParameters;
public class TypeExtractorMethodsParametersTest {
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.runtime.system.specpeer;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
public class DummyActionParamPeer extends FacetHolderImpl implements 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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -26,12 +26,12 @@ import org.apache.isis.core.metamodel.ad
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.facets.FacetHolderImpl;
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.specloader.internal.peer.ObjectActionParamPeer;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
+import org.apache.isis.core.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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -30,10 +30,10 @@ import org.apache.isis.core.metamodel.ad
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.facets.FacetHolderImpl;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -30,9 +30,9 @@ import org.apache.isis.core.metamodel.ad
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.facets.FacetHolderImpl;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
@SuppressWarnings("unchecked")
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -25,12 +25,12 @@ import org.apache.isis.core.metamodel.au
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.interactions.InteractionContext;
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.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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -28,13 +28,13 @@ import org.apache.isis.core.metamodel.au
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.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
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.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/ValueFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testspec/ValueFieldTest.java?rev=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -27,13 +27,13 @@ import org.apache.isis.core.metamodel.au
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.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
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.runtime.persistence.internal.RuntimeContextFromSession;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -25,12 +25,12 @@ import org.apache.isis.core.metamodel.ad
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.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
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;
public class ObjectAssociationNoop extends ObjectAssociationAbstract {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestClassSubstitutor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestClassSubstitutor.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestClassSubstitutor.java Mon Nov 8 12:58:33 2010
@@ -19,7 +19,7 @@
package org.apache.isis.runtime.testsystem;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
public class TestClassSubstitutor extends ClassSubstitutorAbstract {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestObjectFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestObjectFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestObjectFactory.java Mon Nov 8 12:58:33 2010
@@ -21,7 +21,7 @@ package org.apache.isis.runtime.testsyst
import java.lang.reflect.Modifier;
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
import org.apache.isis.runtime.persistence.objectfactory.ObjectFactoryAbstract;
import org.apache.isis.runtime.persistence.objectfactory.ObjectFactoryAbstract.Mode;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -28,17 +28,17 @@ import org.apache.isis.core.metamodel.au
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.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
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;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -29,11 +29,11 @@ import org.apache.isis.core.metamodel.ad
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.facets.actcoll.typeof.TypeOfFacet;
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.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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -34,18 +34,18 @@ import org.apache.isis.core.metamodel.co
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.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
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;
-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.runtimecontext.noruntime.RuntimeContextNoRuntime;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -37,12 +37,12 @@ import org.apache.isis.core.metamodel.ad
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.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
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.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -29,14 +29,14 @@ import org.apache.isis.core.metamodel.co
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.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
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;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.ad
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.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -30,10 +30,10 @@ import org.apache.isis.core.commons.exce
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.services.ServicesInjectorDefault;
+import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
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.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/TestProxyPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSessionFactory.java Mon Nov 8 12:58:33 2010
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.system.DeploymentType;
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=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -26,18 +26,18 @@ import java.util.List;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjectorNoop;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
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.specloader.ObjectReflector;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.internal.cache.SpecificationCache;
-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.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/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java?rev=1032561&r1=1032560&r2=1032561&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 12:58:33 2010
@@ -30,9 +30,9 @@ import org.apache.isis.core.metamodel.ad
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.specloader.ObjectReflector;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
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/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java Mon Nov 8 12:58:33 2010
@@ -35,6 +35,11 @@ import org.apache.isis.core.metamodel.au
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.facets.FacetHolderNoop;
+import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -44,11 +49,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.metamodel.interactions.ObjectValidityContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
/**
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/CglibObjectFactory.java Mon Nov 8 12:58:33 2010
@@ -20,7 +20,7 @@
package org.apache.isis.bytecode.cglib.persistence.objectfactory;
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
-import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
import org.apache.isis.runtime.persistence.container.DomainObjectContainerObjectChanged;
import org.apache.isis.runtime.persistence.container.DomainObjectContainerResolve;
import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Mon Nov 8 12:58:33 2010
@@ -30,12 +30,12 @@ import net.sf.cglib.proxy.MethodIntercep
import net.sf.cglib.proxy.MethodProxy;
import org.apache.isis.core.commons.lang.ArrayUtils;
+import org.apache.isis.core.metamodel.java5.ImperativeFacet;
+import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
+import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.java5.ImperativeFacet;
-import org.apache.isis.metamodel.java5.ImperativeFacetUtils;
-import org.apache.isis.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java Mon Nov 8 12:58:33 2010
@@ -21,8 +21,8 @@
package org.apache.isis.bytecode.cglib.specloader.classsubstitutor;
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.CglibEnhanced;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
import org.apache.isis.core.metamodel.util.ClassUtil;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
public class CglibClassSubstitutor extends ClassSubstitutorAbstract {
Modified: incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/test/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ClassEnhancerTest.java Mon Nov 8 12:58:33 2010
@@ -37,7 +37,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
Modified: 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/runtime/objectstore/inmemory/InMemoryObjectStore.java?rev=1032561&r1=1032560&r2=1032561&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/runtime/objectstore/inmemory/InMemoryObjectStore.java Mon Nov 8 12:58:33 2010
@@ -32,10 +32,10 @@ import org.apache.isis.core.metamodel.ad
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.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java Mon Nov 8 12:58:33 2010
@@ -28,8 +28,8 @@ import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.standard.SimpleSession;
import org.apache.isis.runtime.authorization.AuthorizationManager;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java Mon Nov 8 12:58:33 2010
@@ -27,13 +27,14 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.internal.instances.InstanceCollectionSpecification;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
public class JavaReflector extends ObjectReflectorAbstract {
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java Mon Nov 8 12:58:33 2010
@@ -20,6 +20,13 @@
package org.apache.isis.metamodel.specloader.progmodelfacets;
+import org.apache.isis.core.metamodel.java5.RemoveGetClassMethodFacetFactory;
+import org.apache.isis.core.metamodel.java5.RemoveInitMethodFacetFactory;
+import org.apache.isis.core.metamodel.java5.RemoveJavaLangObjectMethodsFacetFactory;
+import org.apache.isis.core.metamodel.java5.RemoveSetDomainObjectContainerMethodFacetFactory;
+import org.apache.isis.core.metamodel.java5.RemoveStaticGettersAndSettersFacetFactory;
+import org.apache.isis.core.metamodel.java5.RemoveSuperclassMethodsFacetFactory;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsAbstract;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.actions.ActionMethodsFacetFactory;
import org.apache.isis.metamodel.facets.actions.IteratorFilteringFacetFactory;
@@ -83,12 +90,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.propparam.validate.regex.RegExAnnotationFacetFactory;
import org.apache.isis.metamodel.java5.FallbackFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveGetClassMethodFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveInitMethodFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveJavaLangObjectMethodsFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveSetDomainObjectContainerMethodFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveStaticGettersAndSettersFacetFactory;
-import org.apache.isis.metamodel.java5.RemoveSuperclassMethodsFacetFactory;
import org.apache.isis.metamodel.value.BigDecimalValueTypeFacetFactory;
import org.apache.isis.metamodel.value.BigIntegerValueTypeFacetFactory;
import org.apache.isis.metamodel.value.BooleanPrimitiveValueTypeFacetFactory;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java Mon Nov 8 12:58:33 2010
@@ -30,19 +30,19 @@ import org.apache.isis.core.commons.fact
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
+import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
+import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorComposite;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.metamodel.specloader.JavaReflector;
-import org.apache.isis.metamodel.specloader.ObjectReflector;
-import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
-import org.apache.isis.metamodel.specloader.ReflectorConstants;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorComposite;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
-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.runtime.installers.InstallerAbstract;
import org.apache.isis.runtime.installers.InstallerLookup;
import org.apache.isis.runtime.installers.InstallerLookupAware;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Mon Nov 8 12:58:33 2010
@@ -25,17 +25,17 @@ import java.util.List;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
+import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverserDefault;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorNoop;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authorization.AuthorizationManager;
import org.apache.isis.runtime.context.IsisContextStatic;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.speclo
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.specloader.JavaReflector;
import org.apache.isis.runtime.testsystem.TestPojo;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java Mon Nov 8 12:58:33 2010
@@ -24,10 +24,10 @@ import java.util.Vector;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.specloader.JavaReflector;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java Mon Nov 8 12:58:33 2010
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.speclo
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.metamodel.facets.object.notpersistable.NotPersistableFacet;