incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032561 [6/19] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/metamodel/specloader/classsubstitutor/ alternatives/bytecode/identity/src/main/java/org/apache/isis/runtime/persistence/objectfactory/ ...
Date Mon, 08 Nov 2010 12:59:33 GMT
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAbstract.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAbstract.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.collectiontyperegistry;
+package org.apache.isis.core.metamodel.specloader.collectiontyperegistry;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAware.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryAware.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.collectiontyperegistry;
+package org.apache.isis.core.metamodel.specloader.collectiontyperegistry;
 
 public interface CollectionTypeRegistryAware {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryDefault.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/collectiontyperegistry/CollectionTypeRegistryDefault.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.collectiontyperegistry;
+package org.apache.isis.core.metamodel.specloader.collectiontyperegistry;
 
 import java.util.ArrayList;
 import java.util.Collection;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionImpl.java (from r1032543, 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/core/metamodel/specloader/internal/ObjectActionImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionImpl.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/ObjectActionImpl.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,31 +35,31 @@ import org.apache.isis.core.metamodel.co
 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.facets.actions.choices.ActionChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
+import org.apache.isis.core.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
+import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
+import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet.Where;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.ActionUsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ActionVisibilityContext;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.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;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedFacet.Where;
-import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
-import org.apache.isis.metamodel.interactions.ActionInvocationContext;
-import org.apache.isis.metamodel.interactions.ActionUsabilityContext;
-import org.apache.isis.metamodel.interactions.ActionVisibilityContext;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
-import org.apache.isis.metamodel.interactions.VisibilityContext;
-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.specloader.internal.peer.ObjectActionParamPeer;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer;
 
 
 public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectAction {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java (from r1032543, 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/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterAbstract.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,21 +31,21 @@ import org.apache.isis.core.metamodel.co
 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.facets.Facet;
+import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
+import org.apache.isis.core.metamodel.facets.actions.choices.ActionParameterChoicesFacet;
+import org.apache.isis.core.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.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;
-import org.apache.isis.metamodel.facets.actions.defaults.ActionParameterDefaultsFacet;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-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.specloader.internal.peer.ObjectActionParamPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 
 public abstract class ObjectActionParameterAbstract implements ObjectActionParameter {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterParseable.java (from r1032543, 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/core/metamodel/specloader/internal/ObjectActionParameterParseable.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterParseable.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/ObjectActionParameterParseable.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/ObjectActionParameterParseable.java Mon Nov  8 12:58:33 2010
@@ -18,24 +18,24 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 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.facets.object.parseable.ParseableFacet;
+import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
 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.specloader.internal.peer.ObjectActionParamPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 
 public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java (from r1032543, 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/core/metamodel/specloader/internal/OneToManyAssociationImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToManyAssociationImpl.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/OneToManyAssociationImpl.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
@@ -29,24 +29,24 @@ import org.apache.isis.core.metamodel.au
 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.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.interactions.CollectionAddToContext;
+import org.apache.isis.core.metamodel.interactions.CollectionRemoveFromContext;
+import org.apache.isis.core.metamodel.interactions.CollectionUsabilityContext;
+import org.apache.isis.core.metamodel.interactions.CollectionVisibilityContext;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
 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;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet;
-import org.apache.isis.metamodel.interactions.CollectionAddToContext;
-import org.apache.isis.metamodel.interactions.CollectionRemoveFromContext;
-import org.apache.isis.metamodel.interactions.CollectionUsabilityContext;
-import org.apache.isis.metamodel.interactions.CollectionVisibilityContext;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
-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.specloader.internal.peer.ObjectAssociationPeer;
 
 
 public class OneToManyAssociationImpl extends ObjectAssociationAbstract implements OneToManyAssociation {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java (from r1032543, 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/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneActionParameterImpl.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java Mon Nov  8 12:58:33 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 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;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionParamPeer;
 
 
 public class OneToOneActionParameterImpl extends ObjectActionParameterAbstract implements OneToOneActionParameter {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java (from r1032543, 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/core/metamodel/specloader/internal/OneToOneAssociationImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/OneToOneAssociationImpl.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/OneToOneAssociationImpl.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.util.List;
 
@@ -31,27 +31,27 @@ import org.apache.isis.core.metamodel.au
 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.facets.propcoll.access.PropertyAccessorFacet;
+import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
+import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
+import org.apache.isis.core.metamodel.interactions.PropertyUsabilityContext;
+import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
+import org.apache.isis.core.metamodel.services.container.query.QueryFindAllInstances;
 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;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertyInitializationFacet;
-import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
-import org.apache.isis.metamodel.interactions.InteractionUtils;
-import org.apache.isis.metamodel.interactions.PropertyAccessContext;
-import org.apache.isis.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.metamodel.interactions.PropertyUsabilityContext;
-import org.apache.isis.metamodel.interactions.PropertyVisibilityContext;
-import org.apache.isis.metamodel.interactions.UsabilityContext;
-import org.apache.isis.metamodel.interactions.ValidityContext;
-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.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
+import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer;
 
 
 public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorAbstract.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodParameters.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodParameters.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodParameters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java (from r1032513, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodReturn.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodReturn.java&r1=1032513&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/TypeExtractorMethodReturn.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal;
+package org.apache.isis.core.metamodel.specloader.internal;
 
 import java.lang.reflect.Method;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java (from r1032543, 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/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SimpleSpecificationCache.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/cache/SimpleSpecificationCache.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.cache;
+package org.apache.isis.core.metamodel.specloader.internal.cache;
 
 import java.util.Enumeration;
 import java.util.Hashtable;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java (from r1032543, 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/core/metamodel/specloader/internal/cache/SpecificationCache.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/SpecificationCache.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/SpecificationCache.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/cache/SpecificationCache.java Mon Nov  8 12:58:33 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.cache;
+package org.apache.isis.core.metamodel.specloader.internal.cache;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/StaticSpecificationCache.java (from r1032543, 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/core/metamodel/specloader/internal/cache/StaticSpecificationCache.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/cache/StaticSpecificationCache.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/cache/StaticSpecificationCache.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/cache/StaticSpecificationCache.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.cache;
+package org.apache.isis.core.metamodel.specloader.internal.cache;
 
 import java.util.Enumeration;
 import java.util.Hashtable;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java (from r1032543, 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/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/facetprocessor/FacetProcessor.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/facetprocessor/FacetProcessor.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.facetprocessor;
+package org.apache.isis.core.metamodel.specloader.internal.facetprocessor;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
 import static org.hamcrest.CoreMatchers.is;
@@ -34,19 +34,19 @@ import java.util.Set;
 
 import org.apache.isis.core.commons.lang.ListUtils;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodFilteringFacetFactory;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.facets.MethodRemoverConstants;
+import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
+import org.apache.isis.core.metamodel.java5.MethodPrefixBasedFacetFactory;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
 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;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.facets.MethodRemoverConstants;
-import org.apache.isis.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
-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.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 
 
 public class FacetProcessor implements RuntimeContextAware {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/introspector/MethodFinderUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/introspector/MethodFinderUtils.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/introspector/MethodFinderUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/introspector/MethodFinderUtils.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.introspector;
+package org.apache.isis.core.metamodel.specloader.internal.introspector;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -29,7 +29,7 @@ import java.util.Map;
 
 import org.apache.isis.core.commons.lang.JavaClassUtils;
 import org.apache.isis.core.commons.lang.WrapperUtils;
-import org.apache.isis.metamodel.facets.MethodScope;
+import org.apache.isis.core.metamodel.facets.MethodScope;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/JavaObjectActionParamPeer.java Mon Nov  8 12:58:33 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
 
 
 public class JavaObjectActionParamPeer extends FacetHolderImpl implements ObjectActionParamPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectActionPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/JavaObjectActionPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectActionPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectActionPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/JavaObjectActionPeer.java Mon Nov  8 12:58:33 2010
@@ -18,19 +18,19 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
+import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacet;
+import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 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.specloader.ReflectiveActionException;
+import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
 
 
 /*

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/JavaObjectAssociationPeer.java Mon Nov  8 12:58:33 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 
 public abstract class JavaObjectAssociationPeer extends JavaObjectMemberPeer implements ObjectAssociationPeer {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectMemberPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectMemberPeer.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectMemberPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaObjectMemberPeer.java Mon Nov  8 12:58:33 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
 
 
 public abstract class JavaObjectMemberPeer extends FacetHolderImpl implements ObjectMemberPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/JavaOneToManyAssociationPeer.java Mon Nov  8 12:58:33 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 
 public class JavaOneToManyAssociationPeer extends JavaObjectAssociationPeer implements ObjectAssociationPeer {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToOneAssociationPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToOneAssociationPeer.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToOneAssociationPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/JavaOneToOneAssociationPeer.java Mon Nov  8 12:58:33 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 
 public class JavaOneToOneAssociationPeer extends JavaObjectAssociationPeer implements ObjectAssociationPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionParamPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/ObjectActionParamPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionParamPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionParamPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/ObjectActionParamPeer.java Mon Nov  8 12:58:33 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
+import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.FacetHolder;
 
 
 public interface ObjectActionParamPeer extends FacetHolder {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/ObjectActionPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/ObjectActionPeer.java Mon Nov  8 12:58:33 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.specloader.ReflectiveActionException;
+import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
 
 
 public interface ObjectActionPeer extends ObjectMemberPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java (from r1032543, 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/core/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/ObjectActionPeerDecorator.java Mon Nov  8 12:58:33 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.specloader.ReflectiveActionException;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
 
 
 public abstract class ObjectActionPeerDecorator implements ObjectActionPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeer.java (from r1032543, 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/core/metamodel/specloader/internal/peer/ObjectAssociationPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeer.java&r1=1032543&r2=1032561&rev=1032561&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/core/metamodel/specloader/internal/peer/ObjectAssociationPeer.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.sp
 /**
  * Additional reflective details about field members.
  * 
- * @see org.apache.isis.metamodel.specloader.internal.peer.ObjectMemberPeer
+ * @see org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer
  */
 public interface ObjectAssociationPeer extends ObjectMemberPeer {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectAssociationPeerDecorator.java Mon Nov  8 12:58:33 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.Facet;
 
 
 public abstract class ObjectAssociationPeerDecorator implements ObjectAssociationPeer {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/internal/peer/ObjectMemberPeer.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/peer/ObjectMemberPeer.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.internal.peer;
+package org.apache.isis.core.metamodel.specloader.internal.peer;
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.spec.identifier.Identified;
@@ -27,8 +27,8 @@ import org.apache.isis.core.metamodel.sp
 /**
  * Details about action and field members gained via reflection.
  * 
- * @see org.apache.isis.metamodel.specloader.internal.peer.ObjectActionPeer
- * @see org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer
+ * @see org.apache.isis.core.metamodel.specloader.internal.peer.ObjectActionPeer
+ * @see org.apache.isis.core.metamodel.specloader.internal.peer.ObjectAssociationPeer
  */
 public interface ObjectMemberPeer extends Identified {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/package-info.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java Mon Nov  8 12:58:33 2010
@@ -29,11 +29,11 @@
  * Concrete implementations are in the <tt>programmingmodel-xxx-impl</tt> modules.  These
  * are expected to be based heavily on <tt>ObjectReflectorAbstract</tt>, defined in
  * <tt>nof-core</tt>.  This implementation defines two further sub-APIs which are based on 
- * the {@link org.apache.isis.metamodel.facets.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
+ * the {@link org.apache.isis.core.metamodel.facets.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
  * <ul>
- * <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.metamodel.facets.FacetFactory}s
+ * <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.core.metamodel.facets.FacetFactory}s
  *      that will be used to actually process and build up the metamodel.
- * <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.metamodel.facets.Facet}, once created, 
+ * <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.core.metamodel.facets.Facet}, once created, 
  *      can be additionally decorated to modify their behaviour.  A number of other components are implemented as
  *      {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
  *      {@link org.apache.isis.help.HelpFacetDecorator help}, and {@link org.apache.isis.transaction.facetdecorator.TransactionFacetDecorator transactions}.  However
@@ -41,4 +41,4 @@
  * </ul>
  * 
  */
-package org.apache.isis.metamodel.specloader;
\ No newline at end of file
+package org.apache.isis.core.metamodel.specloader;
\ No newline at end of file

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacets.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacets.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacets.java Mon Nov  8 12:58:33 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.progmodelfacets;
+package org.apache.isis.core.metamodel.specloader.progmodelfacets;
 
 import java.util.List;
 
-import org.apache.isis.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
 
 
 public interface ProgrammingModelFacets {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsAbstract.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsAbstract.java Mon Nov  8 12:58:33 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.progmodelfacets;
+package org.apache.isis.core.metamodel.specloader.progmodelfacets;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
 
 
 public abstract class ProgrammingModelFacetsAbstract implements ProgrammingModelFacets {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverser.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.traverser;
+package org.apache.isis.core.metamodel.specloader.traverser;
 
 import java.lang.reflect.Method;
 import java.util.List;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java (from r1032543, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/traverser/SpecificationTraverserDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.traverser;
+package org.apache.isis.core.metamodel.specloader.traverser;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -28,9 +28,9 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
-import org.apache.isis.metamodel.specloader.internal.TypeExtractorMethodReturn;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.internal.TypeExtractorMethodReturn;
 
 public class SpecificationTraverserDefault implements SpecificationTraverser, SpecificationLoaderAware {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelInvalidException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelInvalidException.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelInvalidException.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelInvalidException.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.validator;
+package org.apache.isis.core.metamodel.specloader.validator;
 
 public class MetaModelInvalidException extends IllegalStateException {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java Mon Nov  8 12:58:33 2010
@@ -18,10 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.validator;
+package org.apache.isis.core.metamodel.specloader.validator;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
 
 public interface MetaModelValidator extends SpecificationLoaderAware, ApplicationScopedComponent {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java Mon Nov  8 12:58:33 2010
@@ -18,13 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.validator;
+package org.apache.isis.core.metamodel.specloader.validator;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
 
-import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
 
 public abstract class MetaModelValidatorAbstract implements MetaModelValidator {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.validator;
+package org.apache.isis.core.metamodel.specloader.validator;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorNoop.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorNoop.java Mon Nov  8 12:58:33 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.metamodel.specloader.validator;
+package org.apache.isis.core.metamodel.specloader.validator;
 
 
 public class MetaModelValidatorNoop extends MetaModelValidatorAbstract {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CallbackUtils.java Mon Nov  8 12:58:33 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.core.metamodel.util;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.object.callbacks.CallbackFacet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
 
 public final class CallbackUtils {
 	

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/CollectionFacetUtils.java Mon Nov  8 12:58:33 2010
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 
 
 public final class CollectionFacetUtils {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java Mon Nov  8 12:58:33 2010
@@ -29,7 +29,7 @@ import org.apache.isis.applib.Applicatio
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 import org.apache.isis.core.commons.lang.WrapperUtils;
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.metamodel.specloader.internal.introspector.MethodFinderUtils;
+import org.apache.isis.core.metamodel.specloader.internal.introspector.MethodFinderUtils;
 
 /**
  * TODO: remove duplication with {@link WrapperUtils} and {@link MethodFinderUtils}.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectAdapterUtils.java Mon Nov  8 12:58:33 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.core.metamodel.util;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
 
 
 public final class ObjectAdapterUtils {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/LifeCycleEventTest.java Mon Nov  8 12:58:33 2010
@@ -23,15 +23,15 @@ package org.apache.isis.core.metamodel.a
 import junit.framework.TestCase;
 
 import org.apache.isis.core.metamodel.adapter.LifeCycleEvent;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.RemovingCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
 
 
 public class LifeCycleEventTest extends TestCase {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectActionNoop.java Mon Nov  8 12:58:33 2010
@@ -28,17 +28,17 @@ import org.apache.isis.core.metamodel.au
 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.facets.Facet;
+import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
+import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 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;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java?rev=1032561&r1=1032560&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ObjectNoop.java Mon Nov  8 12:58:33 2010
@@ -25,9 +25,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java Mon Nov  8 12:58:33 2010
@@ -18,8 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
+import org.apache.isis.core.metamodel.facets.EnumerationAbstract;
+
 import junit.framework.TestCase;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java (from r1032543, incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java?p2=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java&p1=incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java&r1=1032543&r2=1032561&rev=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/FacetAbstractTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetAbstractTest.java Mon Nov  8 12:58:33 2010
@@ -18,12 +18,16 @@
  */
 
 
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import junit.framework.TestCase;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ObjectNoop;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
 
 
 public class FacetAbstractTest extends TestCase {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetFiltersTest.java Mon Nov  8 12:58:33 2010
@@ -18,12 +18,17 @@
  */
 
 
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import junit.framework.TestCase;
 
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.commons.filters.Filters;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetFilters;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
 
 
 public class FacetFiltersTest extends TestCase {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/FacetHolderNoop.java Mon Nov  8 12:58:33 2010
@@ -18,10 +18,13 @@
  */
 
 
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImplTest.java?rev=1032561&r1=1032513&r2=1032561&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImplTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/NamedAndDescribedFacetHolderImplTest.java Mon Nov  8 12:58:33 2010
@@ -18,8 +18,10 @@
  */
 
 
-package org.apache.isis.metamodel.facets;
+package org.apache.isis.core.metamodel.facets;
 
+import org.apache.isis.core.metamodel.facets.NamedAndDescribedFacetHolderImpl;
+
 import junit.framework.TestCase;
 
 



Mime
View raw message