isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032543 [8/26] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassis...
Date Mon, 08 Nov 2010 11:23:54 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java Mon Nov  8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.intera
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.metamodel.facets.Facet;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionUtils.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionUtils.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import org.apache.isis.metamodel.consent.InteractionResult;
-import org.apache.isis.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.consent.InteractionResultSet;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetFilters;
 import org.apache.isis.metamodel.facets.FacetHolder;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectTitleContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ObjectValidityContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ParseValueContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ParseValueEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyAccessContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyModifyContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyUsabilityContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/PropertyVisibilityContext.java Mon Nov  8 11:23:08 2010
@@ -20,14 +20,14 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import static org.apache.isis.metamodel.util.IsisUtils.unwrap;
+import static org.apache.isis.core.metamodel.util.IsisUtils.unwrap;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.PropertyVisibilityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ProposedHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ProposedHolder.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ProposedHolder.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.interactions;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.Facet;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/UsabilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/UsabilityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/UsabilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/UsabilityContext.java Mon Nov  8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.intera
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidatingInteractionAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidatingInteractionAdvisor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidatingInteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidatingInteractionAdvisor.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.interactions;
 
 import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.metamodel.consent.InteractionAdvisorFacet;
+import org.apache.isis.core.metamodel.consent.InteractionAdvisorFacet;
 import org.apache.isis.metamodel.facets.Facet;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/ValidityContext.java Mon Nov  8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.intera
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/VisibilityContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/VisibilityContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/VisibilityContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/VisibilityContext.java Mon Nov  8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.intera
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.events.VisibilityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionContextType;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionContextType;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/AnnotationBasedFacetFactoryAbstract.java Mon Nov  8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.metamodel.java5;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 public abstract class AnnotationBasedFacetFactoryAbstract extends FacetFactoryAbstract implements AnnotationBasedFacetFactory {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacet.java Mon Nov  8 11:23:08 2010
@@ -26,10 +26,10 @@ import java.util.List;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacetUtils.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/ImperativeFacetUtils.java Mon Nov  8 11:23:08 2010
@@ -25,9 +25,9 @@ import java.util.List;
 
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.lang.CastUtils;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
 
 
 public final class ImperativeFacetUtils {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveGetClassMethodFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.metamodel.java5;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveInitMethodFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.metamodel.java5;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveJavaLangObjectMethodsFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -22,11 +22,11 @@ package org.apache.isis.metamodel.java5;
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSetDomainObjectContainerMethodFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -21,11 +21,11 @@
 package org.apache.isis.metamodel.java5;
 
 import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveStaticGettersAndSettersFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.metamodel.java5;
 
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
 import org.apache.isis.metamodel.facets.MethodScope;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/java5/RemoveSuperclassMethodsFacetFactory.java Mon Nov  8 11:23:08 2010
@@ -23,11 +23,11 @@ package org.apache.isis.metamodel.java5;
 import java.lang.reflect.Method;
 
 import org.apache.isis.core.commons.lang.JavaClassUtils;
+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.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/RuntimeContext.java Mon Nov  8 11:23:08 2010
@@ -25,11 +25,11 @@ import java.util.List;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/AuthenticationSessionNoRuntime.java Mon Nov  8 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.metamodel.runtim
 
 import java.io.IOException;
 
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
 
 public class AuthenticationSessionNoRuntime extends AuthenticationSessionAbstract {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java Mon Nov  8 11:23:08 2010
@@ -24,13 +24,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.applib.query.Query;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContextAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.identifier.Identified;
 
 public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/IntrospectableSpecificationAbstract.java Mon Nov  8 11:23:08 2010
@@ -27,12 +27,22 @@ import java.util.List;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
 import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -49,16 +59,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.interactions.ObjectValidityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectActionSet;
-import org.apache.isis.metamodel.spec.IntrospectableSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 
 
 // TODO work through all subclasses and remove duplicated overridden methods - this

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/ObjectSpecificationNoMember.java Mon Nov  8 11:23:08 2010
@@ -23,19 +23,19 @@ package org.apache.isis.metamodel.runtim
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.Veto;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.util.NameUtils;
 import org.apache.isis.metamodel.interactions.InteractionContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.util.NameUtils;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectActionSet.java Mon Nov  8 11:23:08 2010
@@ -25,23 +25,23 @@ import java.util.List;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.MultiTypedFacet;
 import org.apache.isis.metamodel.interactions.ActionInvocationContext;
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
 
 
 public class ObjectActionSet implements ObjectAction {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectAssociationAbstract.java Mon Nov  8 11:23:08 2010
@@ -21,14 +21,14 @@
 package org.apache.isis.metamodel.runtimecontext.spec.feature;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacet;
 import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.identifier.Identified;
 
 
 // TODO need to pull up the common methods. like getName(), from subclasses

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/runtimecontext/spec/feature/ObjectMemberAbstract.java Mon Nov  8 11:23:08 2010
@@ -22,11 +22,14 @@ package org.apache.isis.metamodel.runtim
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.util.NameUtils;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.MultiTypedFacet;
 import org.apache.isis.metamodel.facets.help.HelpFacet;
@@ -39,9 +42,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.interactions.UsabilityContext;
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.spec.identifier.Identified;
-import org.apache.isis.metamodel.util.NameUtils;
 
 
 public abstract class ObjectMemberAbstract implements ObjectMember {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/ServicesInjectorAbstract.java Mon Nov  8 11:23:08 2010
@@ -36,7 +36,7 @@ import org.apache.isis.applib.DomainObje
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.exceptions.ReflectionException;
+import org.apache.isis.core.metamodel.exceptions.ReflectionException;
 
 
 public abstract class ServicesInjectorAbstract implements ServicesInjector {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/DomainObjectContainerDefault.java Mon Nov  8 11:23:08 2010
@@ -31,16 +31,16 @@ import org.apache.isis.applib.query.Quer
 import org.apache.isis.applib.security.RoleMemento;
 import org.apache.isis.applib.security.UserMemento;
 import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.util.IsisUtils;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.metamodel.services.container.query.QueryFindByPattern;
 import org.apache.isis.metamodel.services.container.query.QueryFindByTitle;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.util.IsisUtils;
 
 
 public class DomainObjectContainerDefault implements DomainObjectContainer, RuntimeContextAware {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryBuiltInAbstract.java Mon Nov  8 11:23:08 2010
@@ -25,8 +25,8 @@ import java.io.Serializable;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryAbstract;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 /**
  * Although (through this class) the subclasses implements {@link Query} and

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/services/container/query/QueryFindAllInstances.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.servic
 import java.io.Serializable;
 
 import org.apache.isis.applib.query.Query;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 /**
  * Although implements {@link Query} and thus is intended to be (and indeed is) {@link Serializable},

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/FacetDecoratorInstaller.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.speclo
 import java.util.List;
 
 import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java Mon Nov  8 11:23:08 2010
@@ -36,17 +36,17 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
 import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.IntrospectableSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java Mon Nov  8 11:23:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.metamodel.specloader;
 
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoader.java Mon Nov  8 11:23:08 2010
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.debug.DebugInfo;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
 public interface SpecificationLoader extends ApplicationScopedComponent, Injectable, DebugInfo {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionImpl.java Mon Nov  8 11:23:08 2010
@@ -28,13 +28,19 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResultSet;
-import org.apache.isis.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.facets.actions.choices.ActionChoicesFacet;
 import org.apache.isis.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
 import org.apache.isis.metamodel.facets.actions.defaults.ActionDefaultsFacet;
@@ -52,12 +58,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterAbstract.java Mon Nov  8 11:23:08 2010
@@ -25,12 +25,16 @@ import java.util.List;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Allow;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.MultiTypedFacet;
 import org.apache.isis.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
@@ -41,10 +45,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.interactions.ActionArgumentContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterParseable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterParseable.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterParseable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterParseable.java Mon Nov  8 11:23:08 2010
@@ -20,21 +20,21 @@
 
 package org.apache.isis.metamodel.specloader.internal;
 
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.MutableProposedHolder;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.MutableProposedHolder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResultSet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
 import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
 import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
 import org.apache.isis.metamodel.interactions.InteractionUtils;
 import org.apache.isis.metamodel.interactions.ValidityContext;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.OneToOneActionParameter;
-import org.apache.isis.metamodel.spec.feature.ParseableEntryActionParameter;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToManyAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToManyAssociationImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToManyAssociationImpl.java Mon Nov  8 11:23:08 2010
@@ -23,12 +23,14 @@ package org.apache.isis.metamodel.speclo
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
@@ -44,9 +46,7 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.interactions.VisibilityContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 
 
 public class OneToManyAssociationImpl extends ObjectAssociationAbstract implements OneToManyAssociation {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneActionParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneActionParameterImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneActionParameterImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneActionParameterImpl.java Mon Nov  8 11:23:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.metamodel.specloader.internal;
 
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.MutableProposedHolder;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.OneToOneActionParameter;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.MutableProposedHolder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneAssociationImpl.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneAssociationImpl.java Mon Nov  8 11:23:08 2010
@@ -25,12 +25,14 @@ import java.util.List;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
 import org.apache.isis.metamodel.facets.properties.choices.PropertyChoicesFacet;
 import org.apache.isis.metamodel.facets.properties.defaults.PropertyDefaultFacet;
@@ -49,8 +51,6 @@ import org.apache.isis.metamodel.interac
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SimpleSpecificationCache.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SimpleSpecificationCache.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SimpleSpecificationCache.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SimpleSpecificationCache.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.speclo
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
 public class SimpleSpecificationCache implements SpecificationCache {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SpecificationCache.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SpecificationCache.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SpecificationCache.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SpecificationCache.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.speclo
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/StaticSpecificationCache.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/StaticSpecificationCache.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/StaticSpecificationCache.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/StaticSpecificationCache.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.speclo
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
 public class StaticSpecificationCache implements SpecificationCache {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/facetprocessor/FacetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/facetprocessor/FacetProcessor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/facetprocessor/FacetProcessor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/facetprocessor/FacetProcessor.java Mon Nov  8 11:23:08 2010
@@ -33,7 +33,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.facets.FacetFactory;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.MethodFilteringFacetFactory;
@@ -43,7 +44,6 @@ import org.apache.isis.metamodel.facets.
 import org.apache.isis.metamodel.java5.MethodPrefixBasedFacetFactory;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java Mon Nov  8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.metamodel.speclo
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 public class JavaObjectActionParamPeer extends FacetHolderImpl implements ObjectActionParamPeer {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionPeer.java Mon Nov  8 11:23:08 2010
@@ -21,15 +21,15 @@
 package org.apache.isis.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Target;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.debug.DebugFacet;
 import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet;
 import org.apache.isis.metamodel.facets.actions.exploration.ExplorationFacet;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Target;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.metamodel.specloader.ReflectiveActionException;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionParamPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionParamPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionParamPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionParamPeer.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.metamodel.specloader.internal.peer;
 
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 public interface ObjectActionParamPeer extends FacetHolder {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeer.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.specloader.internal.peer;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.specloader.ReflectiveActionException;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.metamodel.speclo
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.specloader.ReflectiveActionException;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeer.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.metamodel.specloader.internal.peer;
 
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
 /**



Mime
View raw message