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 12:23:54 UTC
svn commit: r1032543 [9/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/javassis...
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.speclo
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
public abstract class ObjectAssociationPeerDecorator implements ObjectAssociationPeer {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.metamodel.specloader.internal.peer;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
/**
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java Mon Nov 8 11:23:08 2010
@@ -29,15 +29,15 @@
* Concrete implementations are in the <tt>programmingmodel-xxx-impl</tt> modules. These
* are expected to be based heavily on <tt>ObjectReflectorAbstract</tt>, defined in
* <tt>nof-core</tt>. This implementation defines two further sub-APIs which are based on
- * the {@link org.apache.isis.metamodel.facets.Facet}s and {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s:
+ * the {@link org.apache.isis.metamodel.facets.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
* <ul>
* <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.metamodel.facets.FacetFactory}s
* that will be used to actually process and build up the metamodel.
* <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.metamodel.facets.Facet}, once created,
* can be additionally decorated to modify their behaviour. A number of other components are implemented as
- * {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
+ * {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
* {@link org.apache.isis.help.HelpFacetDecorator help}, and {@link org.apache.isis.transaction.facetdecorator.TransactionFacetDecorator transactions}. However
- * it is possible for other {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
+ * it is possible for other {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
* </ul>
*
*/
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public interface SpecificationTraverser extends ApplicationScopedComponent {
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import static org.apache.isis.core.commo
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
import org.apache.isis.metamodel.specloader.internal.TypeExtractorMethodReturn;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/LifeCycleEventTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/LifeCycleEventTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/LifeCycleEventTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java Mon Nov 8 11:23:08 2010
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import junit.framework.TestCase;
+import org.apache.isis.core.metamodel.adapter.LifeCycleEvent;
import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet;
import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java (from r1032505, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectActionNoop.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectActionNoop.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java Mon Nov 8 11:23:08 2010
@@ -18,25 +18,27 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.filters.Filter;
-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.Facet;
import org.apache.isis.metamodel.facets.MultiTypedFacet;
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.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;
/**
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectNoop.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectNoop.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ObjectNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java Mon Nov 8 11:23:08 2010
@@ -18,13 +18,16 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
-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.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Specification;
/**
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateCouldResolveTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateCouldResolveTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateCouldResolveTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateGetEndStateTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateGetEndStateTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateGetEndStateTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsDestroyedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsDestroyedTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsDestroyedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsGhostTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsGhostTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsGhostTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsGhostTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsNewTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsNewTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsNewTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsNewTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPartlyResolvedTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPersistentTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPersistentTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsPersistentTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsPersistentTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvableOrDeserializableTest.java Mon Nov 8 11:23:08 2010
@@ -18,29 +18,31 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveException;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvedTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvedTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvedTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvingTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvingTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsResolvingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsResolvingTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsSerializingTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsSerializingTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsSerializingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsSerializingTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsTransientTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsTransientTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsTransientTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsTransientTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsValidToChangeToTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsValidToChangeToTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateIsValidToChangeToTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsValidToChangeToTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateRespondToChangesInPersistentObjectsTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateSerializeFromTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateSerializeFromTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/adapter/ResolveStateSerializeFromTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateSerializeFromTest.java Mon Nov 8 11:23:08 2010
@@ -18,28 +18,29 @@
*/
-package org.apache.isis.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.apache.isis.metamodel.adapter.ResolveState.DESTROYED;
-import static org.apache.isis.metamodel.adapter.ResolveState.GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.NEW;
-import static org.apache.isis.metamodel.adapter.ResolveState.PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING;
-import static org.apache.isis.metamodel.adapter.ResolveState.RESOLVING_PART;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
-import static org.apache.isis.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.TRANSIENT;
-import static org.apache.isis.metamodel.adapter.ResolveState.UPDATING;
-import static org.apache.isis.metamodel.adapter.ResolveState.VALUE;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.RESOLVING_PART;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_GHOST;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_PART_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_RESOLVED;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.SERIALIZING_TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
+import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java Mon Nov 8 11:23:08 2010
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
-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.adapter.oid.stringable.directly.DirectlyStringableOid;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public abstract class DirectlyStringableOidAbstract implements DirectlyStringableOid {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectCanRoundtripTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectCanRoundtripTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectCanRoundtripTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectCanRoundtripTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -28,7 +28,9 @@ import static org.junit.Assert.assertTha
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.OidStringifierDirect;
public class GivenOidStringifierDirectCanRoundtripTest {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectWhenInstantiateTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectWhenInstantiateTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectWhenInstantiateTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectWhenInstantiateTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -26,6 +26,7 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.OidStringifierDirect;
import org.junit.Test;
public class GivenOidStringifierDirectWhenInstantiateTest {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class OidConformant extends DirectlyStringableOidAbstract {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
public class OidWithNonPublicDestringMethod extends DirectlyStringableOidAbstract implements DirectlyStringableOid {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java Mon Nov 8 11:23:08 2010
@@ -18,9 +18,10 @@
*/
-package org.apache.isis.metamodel.adapter.oid.stringable.directly;
+package org.apache.isis.core.metamodel.adapter.oid.stringable.directly;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
public class OidWithNonStaticDestringMethod extends DirectlyStringableOidAbstract implements DirectlyStringableOid {
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java (from r1032498, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java&r1=1032498&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java Mon Nov 8 11:23:08 2010
@@ -17,11 +17,13 @@
* under the License.
*/
-package org.apache.isis.metamodel.config;
+package org.apache.isis.core.metamodel.config;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderResourceStreams;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
import org.junit.Test;
public class ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderTwoDirectoriesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderTwoDirectoriesTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderTwoDirectoriesTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationBuilderTwoDirectoriesTest.java Mon Nov 8 11:23:08 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.config.loader;
+package org.apache.isis.core.metamodel.config.loader;
import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.NotFoundPolicy;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
public class ConfigurationBuilderTwoDirectoriesTest extends TestCase {
Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java (from r1032505, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java&r1=1032505&r2=1032543&rev=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/loader/ConfigurationLoaderFileSystemTest.java Mon Nov 8 11:23:08 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.metamodel.config.loader;
+package org.apache.isis.core.metamodel.config.loader;
import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.NotFoundPolicy;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
public class ConfigurationLoaderFileSystemTest extends TestCase {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.config.prop;
+package org.apache.isis.core.metamodel.config.prop;
import java.util.Properties;
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
public class PropertiesConfigurationTest extends TestCase {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationWhitespaceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationWhitespaceTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationWhitespaceTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/config/prop/PropertiesConfigurationWhitespaceTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.config.prop;
+package org.apache.isis.core.metamodel.config.prop;
import java.util.Properties;
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
public class PropertiesConfigurationWhitespaceTest extends TestCase {
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java Mon Nov 8 11:23:08 2010
@@ -18,12 +18,14 @@
*/
-package org.apache.isis.metamodel.consent;
+package org.apache.isis.core.metamodel.consent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/ByteEncoderDecoderRoundtripTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/ByteEncoderDecoderRoundtripTest.java?rev=1032543&r1=1032498&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/ByteEncoderDecoderRoundtripTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/encoding/ByteEncoderDecoderRoundtripTest.java Mon Nov 8 11:23:08 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.encoding;
+package org.apache.isis.core.metamodel.encoding;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -33,11 +33,11 @@ import java.io.PipedOutputStream;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputStreamExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
+import org.apache.isis.core.metamodel.encoding.Encodable;
public class ByteEncoderDecoderRoundtripTest {