incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032561 [18/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/...
Date Mon, 08 Nov 2010 12:59:33 GMT
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java Mon Nov  8 12:58:33 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.metamodel.examples.facets.namefile;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
 
 
 public class NameFileFacet extends FacetAbstract implements NamedFacet {

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java Mon Nov  8 12:58:33 2010
@@ -23,12 +23,12 @@ package org.apache.isis.metamodel.exampl
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
 
 
 public class NameFileFacetFactory implements FacetFactory {

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.examples.facets.namefile;
 
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
 
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java Mon Nov  8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.examples.facets.namefile.NameFileFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
 
 
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java Mon Nov  8 12:58:33 2010
@@ -32,12 +32,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 import static org.apache.isis.core.commons.matchers.NofMatchers.anInstanceOf;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.MethodRemover;
 
 
 @RunWith(JMock.class)

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java Mon Nov  8 12:58:33 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.exampl
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
 import org.apache.isis.metamodel.examples.facets.namefile.NameFileFacet;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
 
 
 public class NameFileFacetInstantiationTest {

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java Mon Nov  8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.examples.facets.namefile.NameFileFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
 
 
 

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java Mon Nov  8 12:58:33 2010
@@ -1,7 +1,7 @@
 package org.apache.isis.viewer.bdd.common.components;
 
+import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.object.cached.CachedFacet;
 import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceSessionFactory;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
 import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java Mon Nov  8 12:58:33 2010
@@ -5,8 +5,8 @@ import java.util.Map;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.facets.object.cached.CachedFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.object.cached.CachedFacet;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
 import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
 import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Mon Nov  8 12:58:33 2010
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-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.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java Mon Nov  8 12:58:33 2010
@@ -1,8 +1,8 @@
 package org.apache.isis.viewer.bdd.common.fixtures;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java Mon Nov  8 12:58:33 2010
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryValueException;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java Mon Nov  8 12:58:33 2010
@@ -5,12 +5,12 @@ import java.util.List;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 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.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java Mon Nov  8 12:58:33 2010
@@ -7,13 +7,13 @@ import java.util.Map;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
 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.ObjectActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectActionSet;
 import org.apache.isis.viewer.bdd.common.AliasRegistry;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java Mon Nov  8 12:58:33 2010
@@ -3,9 +3,9 @@ package org.apache.isis.viewer.bdd.commo
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
 import org.apache.isis.viewer.bdd.common.StoryCell;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java Mon Nov  8 12:58:33 2010
@@ -2,9 +2,9 @@ package org.apache.isis.viewer.bdd.commo
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
 

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/RemoveFromCollection.java Mon Nov  8 12:58:33 2010
@@ -5,9 +5,9 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
 import org.apache.isis.viewer.bdd.common.StoryCell;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SetProperty.java Mon Nov  8 12:58:33 2010
@@ -4,9 +4,9 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.viewer.bdd.common.CellBinding;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
 import org.apache.isis.viewer.bdd.common.StoryCell;

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/collections/ThatAbstract.java Mon Nov  8 12:58:33 2010
@@ -1,8 +1,8 @@
 package org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.collections;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
 import org.apache.isis.viewer.bdd.common.fixtures.perform.PerformContext;
 import org.apache.isis.viewer.bdd.common.fixtures.perform.checkthat.ThatSubcommandAbstract;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java Mon Nov  8 12:58:33 2010
@@ -23,10 +23,10 @@ package org.apache.isis.extensions.dnd.c
 
 import java.util.Date;
 
-import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.value.DateValueFacet;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.extensions.dnd.drawing.Canvas;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/form/ExpandableViewBorder.java Mon Nov  8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.extensions.dnd.f
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Shape;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/HistogramAxis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/HistogramAxis.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/HistogramAxis.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/HistogramAxis.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.dnd.h
 
 import java.util.List;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ViewAxis;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/list/InternalCollectionBorder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/list/InternalCollectionBorder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/list/InternalCollectionBorder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/list/InternalCollectionBorder.java Mon Nov  8 12:58:33 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.dnd.l
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedCollectionNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedCollectionNodeSpecification.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedCollectionNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/ClosedCollectionNodeSpecification.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.extensions.dnd.tree;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenCollectionNodeSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenCollectionNodeSpecification.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenCollectionNodeSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/tree/OpenCollectionNodeSpecification.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.extensions.dnd.tree;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.extensions.dnd.view.Axes;
 import org.apache.isis.extensions.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java Mon Nov  8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.extensions.dnd.u
 
 import java.util.StringTokenizer;
 
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.ConfigurationException;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Size;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/ViewRequirement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/ViewRequirement.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/ViewRequirement.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/ViewRequirement.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.dnd.v
 
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
 
 
 public class ViewRequirement {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/TextParseableParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/TextParseableParameterImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/TextParseableParameterImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/TextParseableParameterImpl.java Mon Nov  8 12:58:33 2010
@@ -27,10 +27,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 import org.apache.isis.core.metamodel.util.IsisUtils;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.extensions.dnd.drawing.Image;
 import org.apache.isis.extensions.dnd.drawing.ImageFactory;
 import org.apache.isis.extensions.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java Mon Nov  8 12:58:33 2010
@@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.ConsentAbstract;
 import org.apache.isis.core.metamodel.consent.Veto;
+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.ObjectActionType;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.extensions.dnd.drawing.Bounds;
 import org.apache.isis.extensions.dnd.drawing.Canvas;
 import org.apache.isis.extensions.dnd.drawing.Color;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java Mon Nov  8 12:58:33 2010
@@ -28,12 +28,12 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.ConsentAbstract;
+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.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.extensions.dnd.drawing.Image;
 import org.apache.isis.extensions.dnd.drawing.ImageFactory;
 import org.apache.isis.extensions.dnd.drawing.Location;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java Mon Nov  8 12:58:33 2010
@@ -27,6 +27,8 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.ConsentAbstract;
 import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 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;
@@ -34,8 +36,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.extensions.dnd.drawing.Image;
 import org.apache.isis.extensions.dnd.drawing.ImageFactory;
 import org.apache.isis.extensions.dnd.drawing.Location;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java Mon Nov  8 12:58:33 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.extensions.dnd.view.content;
 
-import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 import org.apache.isis.extensions.dnd.drawing.Image;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/field/TextParseableFieldImpl.java Mon Nov  8 12:58:33 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
 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.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineFacet;
-import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
-import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
 import org.apache.isis.extensions.dnd.view.Content;
 import org.apache.isis.extensions.dnd.view.ObjectContent;
 import org.apache.isis.extensions.dnd.view.content.AbstractTextParsableContent;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/undo/SetValueCommand.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.extensions.dnd.view.undo;
 
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.extensions.dnd.view.Command;
 import org.apache.isis.runtime.context.IsisContext;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java Mon Nov  8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.extensions.dnd.dialog.ActionDialogSpecification;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.interaction.ContentDragImpl;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java Mon Nov  8 12:58:33 2010
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.Vector;
 
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ObjectList;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
@@ -34,6 +33,7 @@ import org.apache.isis.core.metamodel.co
 import org.apache.isis.core.metamodel.consent.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Padding;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.dnd.v
 
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.drawing.Size;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java Mon Nov  8 12:58:33 2010
@@ -33,8 +33,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.view.text.CursorPosition;
 import org.apache.isis.extensions.dnd.view.text.TextBlockTarget;
 import org.apache.isis.extensions.dnd.view.text.TextContent;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java Mon Nov  8 12:58:33 2010
@@ -35,8 +35,8 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.drawing.Location;
 import org.apache.isis.extensions.dnd.view.text.CursorPosition;
 import org.apache.isis.extensions.dnd.view.text.TextBlockTarget;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java Mon Nov  8 12:58:33 2010
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.DummyView;
 import org.apache.isis.extensions.dnd.DummyWorkspaceView;
 import org.apache.isis.extensions.dnd.view.View;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java Mon Nov  8 12:58:33 2010
@@ -34,10 +34,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 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.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.DummyView;
 import org.apache.isis.extensions.dnd.dialog.ActionFieldBuilder;
 import org.apache.isis.extensions.dnd.view.Axes;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java Mon Nov  8 12:58:33 2010
@@ -33,8 +33,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.extensions.dnd.DummyView;
 import org.apache.isis.extensions.dnd.TestToolkit;
 import org.apache.isis.extensions.dnd.drawing.Location;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/content/TextParseableField_ParseTextEntry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/content/TextParseableField_ParseTextEntry.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/content/TextParseableField_ParseTextEntry.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/content/TextParseableField_ParseTextEntry.java Mon Nov  8 12:58:33 2010
@@ -33,11 +33,11 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
 import org.apache.isis.extensions.dnd.view.field.TextParseableFieldImpl;
 import org.apache.isis.runtime.testsystem.TestProxySystem;
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/CollectionView.java Mon Nov  8 12:58:33 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.extensions.html.action.view;
 
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+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.feature.ObjectAssociationFilters;
 import org.apache.isis.extensions.html.action.Action;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/util/TableUtil.java Mon Nov  8 12:58:33 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.extensions.html.action.view.util;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 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.OneToManyAssociation;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/CollectionIcon.java Mon Nov  8 12:58:33 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.html.
 
 import java.io.PrintWriter;
 
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.extensions.html.component.Component;
 import org.apache.isis.extensions.html.image.ImageLookup;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java Mon Nov  8 12:58:33 2010
@@ -26,11 +26,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.metamodel.facets.value.BooleanValueFacet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.extensions.html.component.Block;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/CollectionMapping.java Mon Nov  8 12:58:33 2010
@@ -25,10 +25,10 @@ import java.util.Vector;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+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.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 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/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/AddItemToCollectionTask.java Mon Nov  8 12:58:33 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.extensions.html.task;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.extensions.html.component.Page;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/EditTask.java Mon Nov  8 12:58:33 2010
@@ -20,12 +20,12 @@
 
 package org.apache.isis.extensions.html.task;
 
-import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineFacet;
-import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
-import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
 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;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java Mon Nov  8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.extensions.html.
 
 import java.util.List;
 
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.util.CollectionFacetUtils;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java Mon Nov  8 12:58:33 2010
@@ -24,9 +24,9 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.metamodel.facets.value.PasswordValueFacet;
 import org.apache.isis.extensions.html.component.Page;
 import org.apache.isis.extensions.html.context.Context;

Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java Mon Nov  8 12:58:33 2010
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilderDefault;
 import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
-import org.apache.isis.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.runtime.authentication.standard.SimpleSession;
 import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java Mon Nov  8 12:58:33 2010
@@ -4,7 +4,7 @@
 package org.apache.isis.viewer.restful.viewer.facets;
 
 
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java Mon Nov  8 12:58:33 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java Mon Nov  8 12:58:33 2010
@@ -4,7 +4,7 @@ import java.text.MessageFormat;
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java Mon Nov  8 12:58:33 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java Mon Nov  8 12:58:33 2010
@@ -2,7 +2,7 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java Mon Nov  8 12:58:33 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.java5.ImperativeFacetUtils;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java Mon Nov  8 12:58:33 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java Mon Nov  8 12:58:33 2010
@@ -27,12 +27,12 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetFilters;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetFilters;
-import org.apache.isis.metamodel.facets.FacetHolder;
-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.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java Mon Nov  8 12:58:33 2010
@@ -16,6 +16,9 @@ import nu.xom.Element;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 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.ObjectActionParameter;
@@ -25,9 +28,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.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.viewer.restful.applib.resources.ObjectResource;
 import org.apache.isis.viewer.restful.viewer.Constants;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java Mon Nov  8 12:58:33 2010
@@ -7,9 +7,9 @@ import nu.xom.Element;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
 import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java Mon Nov  8 12:58:33 2010
@@ -4,8 +4,8 @@ import nu.xom.Element;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
 import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java Mon Nov  8 12:58:33 2010
@@ -19,7 +19,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-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.viewer.restful.applib.resources.SpecsResource;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java Mon Nov  8 12:58:33 2010
@@ -3,9 +3,9 @@ package org.apache.isis.viewer.restful.v
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectActionSet;
 
 
 public final class ActionUtils {



Mime
View raw message