You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/08 13:59:33 UTC
svn commit: r1032561 [15/19] - in /incubator/isis/trunk:
alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/
alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/...
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/dirty/DirtyMethodsFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class DirtyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,10 +23,10 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacetAbstract;
import org.apache.isis.metamodel.facets.object.encodeable.EncoderDecoderUtil;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/facets/FacetsAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,12 +23,12 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Facets;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
public class FacetsAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethodTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethodTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconFacetViaMethodTest.java Mon Nov 8 12:58:33 2010
@@ -35,7 +35,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
@RunWith(JMock.class)
public class IconFacetViaMethodTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/icon/IconMethodFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class IconMethodFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,9 @@
package org.apache.isis.metamodel.facets.object.ident.plural;
import org.apache.isis.applib.annotation.Plural;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class PluralAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/plural/PluralMethodFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class PluralMethodFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/singular/SingularMethodFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
public class SingularMethodFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java Mon Nov 8 12:58:33 2010
@@ -35,7 +35,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
@RunWith(JMock.class)
public class TitleFacetViaMethodTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleMethodFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.runtimecontext.spec.IntrospectableSpecificationAbstract;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.runtimecontext.spec.IntrospectableSpecificationAbstract;
public class TitleMethodFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,10 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.annotation.Immutable;
import org.apache.isis.applib.annotation.When;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ImmutableAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -64,7 +65,7 @@ public class ImmutableAnnotationFacetFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetAnnotation);
final ImmutableFacetAnnotation immutableFacetAnnotation = (ImmutableFacetAnnotation) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ALWAYS, immutableFacetAnnotation.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ALWAYS, immutableFacetAnnotation.value());
assertNoMethodsRemoved();
}
@@ -79,7 +80,7 @@ public class ImmutableAnnotationFacetFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetAnnotation);
final ImmutableFacetAnnotation immutableFacetAnnotation = (ImmutableFacetAnnotation) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ALWAYS, immutableFacetAnnotation.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ALWAYS, immutableFacetAnnotation.value());
assertNoMethodsRemoved();
}
@@ -94,7 +95,7 @@ public class ImmutableAnnotationFacetFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetAnnotation);
final ImmutableFacetAnnotation immutableFacetAnnotation = (ImmutableFacetAnnotation) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.NEVER, immutableFacetAnnotation.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.NEVER, immutableFacetAnnotation.value());
assertNoMethodsRemoved();
}
@@ -109,7 +110,7 @@ public class ImmutableAnnotationFacetFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetAnnotation);
final ImmutableFacetAnnotation immutableFacetAnnotation = (ImmutableFacetAnnotation) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ONCE_PERSISTED, immutableFacetAnnotation.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED, immutableFacetAnnotation.value());
assertNoMethodsRemoved();
}
@@ -124,7 +125,7 @@ public class ImmutableAnnotationFacetFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetAnnotation);
final ImmutableFacetAnnotation immutableFacetAnnotation = (ImmutableFacetAnnotation) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.UNTIL_PERSISTED, immutableFacetAnnotation.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.UNTIL_PERSISTED, immutableFacetAnnotation.value());
assertNoMethodsRemoved();
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/immutable/ImmutableMarkerInterfaceFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,10 @@ import org.apache.isis.applib.marker.Alw
import org.apache.isis.applib.marker.ImmutableOncePersisted;
import org.apache.isis.applib.marker.ImmutableUntilPersisted;
import org.apache.isis.applib.marker.NeverImmutable;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ImmutableMarkerInterfaceFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -65,7 +66,7 @@ public class ImmutableMarkerInterfaceFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetMarkerInterface);
final ImmutableFacetMarkerInterface immutableFacetMarkerInterface = (ImmutableFacetMarkerInterface) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ALWAYS, immutableFacetMarkerInterface.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ALWAYS, immutableFacetMarkerInterface.value());
assertNoMethodsRemoved();
}
@@ -79,7 +80,7 @@ public class ImmutableMarkerInterfaceFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetMarkerInterface);
final ImmutableFacetMarkerInterface immutableFacetMarkerInterface = (ImmutableFacetMarkerInterface) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.ONCE_PERSISTED, immutableFacetMarkerInterface.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED, immutableFacetMarkerInterface.value());
assertNoMethodsRemoved();
}
@@ -93,7 +94,7 @@ public class ImmutableMarkerInterfaceFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetMarkerInterface);
final ImmutableFacetMarkerInterface immutableFacetMarkerInterface = (ImmutableFacetMarkerInterface) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.UNTIL_PERSISTED, immutableFacetMarkerInterface.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.UNTIL_PERSISTED, immutableFacetMarkerInterface.value());
assertNoMethodsRemoved();
}
@@ -107,7 +108,7 @@ public class ImmutableMarkerInterfaceFac
assertNotNull(facet);
assertTrue(facet instanceof ImmutableFacetMarkerInterface);
final ImmutableFacetMarkerInterface immutableFacetMarkerInterface = (ImmutableFacetMarkerInterface) facet;
- assertEquals(org.apache.isis.metamodel.facets.When.NEVER, immutableFacetMarkerInterface.value());
+ assertEquals(org.apache.isis.core.metamodel.facets.When.NEVER, immutableFacetMarkerInterface.value());
assertNoMethodsRemoved();
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.annotation.NotPersistable;
import org.apache.isis.applib.annotation.NotPersistable.By;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NotPersistableAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/notpersistable/NotPersistableMarkerInterfaceFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.marker.NonPersistable;
import org.apache.isis.applib.marker.ProgramPersistable;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NotPersistableMarkerInterfaceFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,6 +23,7 @@ package org.apache.isis.metamodel.facets
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Parseable;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/validate/ObjectValidMethodFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ObjectValidMethodFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/value/ValueFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -26,17 +26,18 @@ import org.apache.isis.applib.adapters.E
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.metamodel.facets.object.ebc.EqualByContentFacet;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
public class ValueFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/actionorder/ActionOrderAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,9 @@
package org.apache.isis.metamodel.facets.ordering.actionorder;
import org.apache.isis.applib.annotation.ActionOrder;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class ActionOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/fieldorder/FieldOrderAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -21,9 +21,9 @@
package org.apache.isis.metamodel.facets.ordering.fieldorder;
import org.apache.isis.applib.annotation.FieldOrder;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class FieldOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java Mon Nov 8 12:58:33 2010
@@ -27,8 +27,8 @@ import junit.framework.TestSuite;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
import org.apache.isis.metamodel.facets.ordering.OrderSet;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectMemberPeer;
public class DeweyOrderSetTest extends TestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class MemberOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberPeerStub.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberPeerStub.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberPeerStub.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ordering/memberorder/MemberPeerStub.java Mon Nov 8 12:58:33 2010
@@ -26,8 +26,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.metamodel.facets.NamedAndDescribedFacetHolderImpl;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectMemberPeer;
+import org.apache.isis.core.metamodel.facets.NamedAndDescribedFacetHolderImpl;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
final class MemberPeerStub extends NamedAndDescribedFacetHolderImpl implements ObjectMemberPeer {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propcoll/notpersisted/NotPersistedAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -24,9 +24,10 @@ import java.lang.reflect.Method;
import java.util.Collection;
import org.apache.isis.applib.annotation.NotPersisted;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class NotPersistedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/properties/PropertyFieldMethodsFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,19 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
+import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actions.DescribedAsFacetViaMethod;
import org.apache.isis.metamodel.facets.actions.NamedFacetViaMethod;
import org.apache.isis.metamodel.facets.disable.DisableForContextFacet;
@@ -34,28 +44,18 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.disable.DisableForSessionFacetViaMethod;
import org.apache.isis.metamodel.facets.disable.DisabledFacet;
import org.apache.isis.metamodel.facets.disable.DisabledFacetAlways;
-import org.apache.isis.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.metamodel.facets.hide.HiddenFacetAlways;
import org.apache.isis.metamodel.facets.hide.HideForContextFacet;
import org.apache.isis.metamodel.facets.hide.HideForContextFacetViaMethod;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacet;
import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacetViaAccessor;
import org.apache.isis.metamodel.facets.propcoll.derived.DerivedFacetInferred;
-import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
-import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacet;
import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetViaClearMethod;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetViaSetterMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyInitializationFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertyInitializationFacetViaSetterMethod;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetViaModifyMethod;
import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetViaSetterMethod;
import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacet;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/multiline/MultiLineAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.MultiLine;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class MultiLineAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessParameterTest.java Mon Nov 8 12:58:33 2010
@@ -33,8 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
@RunWith(JMock.class)
public class MustSatisfySpecificationFacetFactoryProcessParameterTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java Mon Nov 8 12:58:33 2010
@@ -33,8 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
@RunWith(JMock.class)
public class MustSatisfySpecificationFacetFactoryProcessPropertyTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionMoreTest.java Mon Nov 8 12:58:33 2010
@@ -35,9 +35,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.PropertyModifyContext;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/specification/MustSatisfySpecificationValidatingInteractionTest.java Mon Nov 8 12:58:33 2010
@@ -35,9 +35,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
import org.apache.isis.core.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.PropertyModifyContext;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/typicallength/TypicalLengthAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.TypicalLength;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class TypicalLengthAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mandatory/OptionalAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,10 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class OptionalAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,11 +23,11 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.Mask;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExAnnotationFacetFactoryTest.java Mon Nov 8 12:58:33 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
import java.lang.reflect.Method;
import org.apache.isis.applib.annotation.RegEx;
+import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.facets.Facet;
public class RegExAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java Mon Nov 8 12:58:33 2010
@@ -30,7 +30,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigDecimalValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BigIntValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/BooleanValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -28,8 +28,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ByteValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/CharacterValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ColorValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Color;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateTimeValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateTimeValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.DateTime;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class DateTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DateValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.value.Date;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class DateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/DoubleValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/FloatValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ImageValueSemanticsProviderAbstractTest.java Mon Nov 8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.jmock.integration.junit4.JUni
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
@RunWith(JMock.class)
public class ImageValueSemanticsProviderAbstractTest {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/IntValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlDateValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -34,8 +34,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeStampValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeStampValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -28,8 +28,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaSqlTimeValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -32,8 +32,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/JavaUtilDateValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -34,8 +34,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Money;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -27,8 +27,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class PasswordValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -28,8 +28,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/PolishMoneyValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -32,8 +32,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.Money;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@Ignore // TODO once the sematics provide has a way to reset the formatters for the new local then this test can be reinstated.
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -29,8 +29,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/StringValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/StringValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/StringValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/StringValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -26,8 +26,8 @@ import org.jmock.integration.junit4.JMoc
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -30,8 +30,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.value.TestClock;
import org.apache.isis.applib.value.TimeStamp;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class TimeStampValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderTest.java Mon Nov 8 12:58:33 2010
@@ -31,8 +31,8 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.value.TestClock;
import org.apache.isis.applib.value.Time;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
@RunWith(JMock.class)
public class TimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTestCase.java Mon Nov 8 12:58:33 2010
@@ -37,13 +37,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacetUsingEncoderDecoder;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacetUsingParser;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacet.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacet.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacet.java Mon Nov 8 12:58:33 2010
@@ -20,9 +20,9 @@
package org.apache.isis.runtime.authorization.standard;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetAbstract.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/authorization/standard/AuthorizationFacetAbstract.java Mon Nov 8 12:58:33 2010
@@ -22,11 +22,11 @@ package org.apache.isis.runtime.authoriz
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.applib.events.VisibilityEvent;
-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.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
+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.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.runtime.authorization.AuthorizationManager;