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

[da...@apache.org]

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongValueSemanticsProviderAbstract.java Mon Nov  8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.LongValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/LongWrapperValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.value;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/MoneyValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -28,10 +28,10 @@ import java.util.Currency;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.Money;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PasswordValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.value;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.Password;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.PasswordValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/PercentageValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -27,10 +27,10 @@ import java.text.ParseException;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.FloatingPointValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortPrimitiveValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.value;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+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.properties.defaults.PropertyDefaultFacet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortValueSemanticsProviderAbstract.java Mon Nov  8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.ShortValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ShortWrapperValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.value;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/StringValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.value;
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.StringValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -26,8 +26,8 @@ import java.util.Hashtable;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.TimeStamp;
-import org.apache.isis.metamodel.adapter.InvalidEntryException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeStampValueSemanticsProviderAbstract.java Mon Nov  8 11:23:08 2010
@@ -26,8 +26,8 @@ import java.util.Hashtable;
 import java.util.Map;
 
 import org.apache.isis.applib.value.TimeStamp;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProvider.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import java.util.Hashtable;
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.value.Time;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/TimeValueSemanticsProviderAbstract.java Mon Nov  8 11:23:08 2010
@@ -24,8 +24,8 @@ import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Map;
 
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstract.java Mon Nov  8 11:23:08 2010
@@ -32,16 +32,16 @@ import org.apache.isis.applib.adapters.V
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.lang.LocaleUtils;
-import org.apache.isis.metamodel.adapter.InvalidEntryException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 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.properties.defaults.PropertyDefaultFacet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueSemanticsProviderAbstractTemporal.java Mon Nov  8 11:23:08 2010
@@ -31,10 +31,10 @@ import java.util.StringTokenizer;
 import java.util.TimeZone;
 
 import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.value.DateValueFacet;

Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/metamodel/value/ValueUsingValueSemanticsProviderFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -20,15 +20,15 @@
 
 package org.apache.isis.metamodel.value;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfigurationAware;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetUtil;
 import org.apache.isis.metamodel.facets.object.value.ValueFacetUsingSemanticsProvider;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public abstract class ValueUsingValueSemanticsProviderFacetFactory extends FacetFactoryAbstract implements RuntimeContextAware,

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java Mon Nov  8 11:23:08 2010
@@ -28,11 +28,11 @@ import org.jmock.integration.junit4.JUni
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneActionParameter;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
 import junit.framework.TestCase;
 
 import org.apache.log4j.BasicConfigurator;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 
 
 public abstract class AbstractFacetFactoryTest extends TestCase {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/ProgrammableReflector.java Mon Nov  8 11:23:08 2010
@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/Utils.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 
 
 class Utils {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actcoll/typeof/TypeOfAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -26,9 +26,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.isis.applib.annotation.TypeOf;
+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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
 
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -27,6 +27,9 @@ import java.util.List;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.Named;
 import org.apache.isis.applib.security.UserMemento;
+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;
 import org.apache.isis.metamodel.facets.When;
@@ -59,12 +62,9 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
 import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.metamodel.facets.naming.named.NamedFacetAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.specloader.internal.peer.JavaObjectActionParamPeer;
 import org.apache.isis.metamodel.specloader.internal.peer.JavaObjectActionPeer;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
 
 
 public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -854,7 +854,7 @@ public class ActionMethodsFacetFactoryTe
         try {
             facetFactory.process(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
             fail("exception expected");
-        } catch (org.apache.isis.metamodel.exceptions.ReflectionException expected) {
+        } catch (org.apache.isis.core.metamodel.exceptions.ReflectionException expected) {
 
         }
     }
@@ -884,7 +884,7 @@ public class ActionMethodsFacetFactoryTe
         try {
             facetFactory.process(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
             fail("exception expected");
-        } catch (org.apache.isis.metamodel.exceptions.ReflectionException expected) {
+        } catch (org.apache.isis.core.metamodel.exceptions.ReflectionException expected) {
 
         }
     }
@@ -914,7 +914,7 @@ public class ActionMethodsFacetFactoryTe
         try {
             facetFactory.process(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
             fail("exception expected");
-        } catch (org.apache.isis.metamodel.exceptions.ReflectionException expected) {
+        } catch (org.apache.isis.core.metamodel.exceptions.ReflectionException expected) {
 
         }
     }
@@ -944,7 +944,7 @@ public class ActionMethodsFacetFactoryTe
         try {
             facetFactory.process(Customer.class, actionMethod, methodRemover, facetHolderWithParms);
             fail("exception expected");
-        } catch (org.apache.isis.metamodel.exceptions.ReflectionException expected) {
+        } catch (org.apache.isis.core.metamodel.exceptions.ReflectionException expected) {
 
         }
     }

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/IteratorFilteringFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 import java.util.Iterator;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class IteratorFilteringFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/debug/DebugAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Debug;
+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.spec.feature.ObjectFeatureType;
 
 
 public class DebugAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/executed/ExecutedAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Executed;
 import org.apache.isis.applib.annotation.Executed.Where;
+import org.apache.isis.core.metamodel.spec.Target;
+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.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class ExecutedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/exploration/ExplorationAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Exploration;
+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.spec.feature.ObjectFeatureType;
 
 
 public class ExplorationAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notcontributed/NotContributedAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -25,9 +25,9 @@ import java.lang.reflect.Method;
 import org.apache.isis.applib.annotation.Exploration;
 import org.apache.isis.applib.annotation.NotContributed;
 import org.apache.isis.applib.annotation.Prototype;
+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.spec.feature.ObjectFeatureType;
 
 
 public class NotContributedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/notinrepositorymenu/NotInRepositoryMenuAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -26,9 +26,9 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.NotContributed;
 import org.apache.isis.applib.annotation.NotInRepositoryMenu;
 import org.apache.isis.applib.annotation.Prototype;
+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.spec.feature.ObjectFeatureType;
 
 
 public class NotInRepositoryMenuAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/actions/prototype/PrototypeAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.facets
 import java.lang.reflect.Method;
 
 import org.apache.isis.applib.annotation.Prototype;
+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.spec.feature.ObjectFeatureType;
 
 
 public class PrototypeAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.isis.applib.security.UserMemento;
+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.When;
@@ -60,7 +61,6 @@ import org.apache.isis.metamodel.facets.
 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.spec.feature.ObjectFeatureType;
 
 
 public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/collections/JavaCollectionFacetTest.java Mon Nov  8 11:23:08 2010
@@ -35,7 +35,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/disable/DisabledAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -25,9 +25,9 @@ import java.util.Collection;
 
 import org.apache.isis.applib.annotation.Disabled;
 import org.apache.isis.applib.annotation.When;
+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.spec.feature.ObjectFeatureType;
 
 
 public class DisabledAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/hide/HiddenAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -25,9 +25,9 @@ import java.util.Collection;
 
 import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.When;
+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.spec.feature.ObjectFeatureType;
 
 
 public class HiddenAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/describedas/DescribedAsAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 
 import org.apache.isis.applib.annotation.DescribedAs;
+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.spec.feature.ObjectFeatureType;
 
 
 public class DescribedAsAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 
 import org.apache.isis.applib.annotation.Named;
+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.spec.feature.ObjectFeatureType;
 
 
 public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/aggregated/AggregatedAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.metamodel.facets.object.aggregated;
 
 import org.apache.isis.applib.annotation.Aggregated;
+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.spec.feature.ObjectFeatureType;
 
 
 public class AggregatedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedAnnotationFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.metamodel.facets.object.bounded;
 
 import org.apache.isis.applib.annotation.Bounded;
+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.spec.feature.ObjectFeatureType;
 
 
 public class BoundedAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/bounded/BoundedMarkerInterfaceFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.metamodel.facets.object.bounded;
 
 import org.apache.isis.applib.marker.Bounded;
+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.spec.feature.ObjectFeatureType;
 
 
 public class BoundedMarkerInterfaceFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/CreatedCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,12 +22,12 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.CreatedCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacetFactory;
 import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class CreatedCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/DeleteCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.DeleteCallbackFacetFactory;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class DeleteCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/LoadCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.LoadCallbackFacetFactory;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class LoadCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/PersistCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.PersistCallbackFacetFactory;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class PersistCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/RemoveCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.RemoveCallbackFacetFactory;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class RemoveCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/SaveCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.PersistedCallbackFacet;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.SaveCallbackFacetFactory;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class SaveCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/callback/UpdateCallbackFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.object.callbacks.UpdateCallbackFacetFactory;
@@ -29,7 +30,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacetViaMethod;
 import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacetViaMethod;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class UpdateCallbackFacetFactoryTest extends AbstractFacetFactoryTest {

Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java Mon Nov  8 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.adapters.DefaultsProvider;
 import org.apache.isis.applib.annotation.Defaulted;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {

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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,13 +22,13 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.annotation.Encodable;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+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;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {

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=1032543&r1=1032542&r2=1032543&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 11:23:08 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.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;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -34,7 +34,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.FacetHolder;
 
 @RunWith(JMock.class)

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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -34,7 +34,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.FacetHolder;
 
 @RunWith(JMock.class)

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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class ImmutableAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {

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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -24,9 +24,9 @@ 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class ImmutableMarkerInterfaceFacetFactoryTest extends AbstractFacetFactoryTest {

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=1032543&r1=1032542&r2=1032543&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 11:23:08 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.annotation.Parseable;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class ParseableFacetFactoryTest extends 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.facets
 
 import java.lang.reflect.Method;
 
+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.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 2010
@@ -25,7 +25,8 @@ import org.apache.isis.applib.adapters.D
 import org.apache.isis.applib.adapters.EncoderDecoder;
 import org.apache.isis.applib.adapters.Parser;
 import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+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;
@@ -36,7 +37,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 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=1032543&r1=1032542&r2=1032543&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 11:23:08 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.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public class ActionOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {