incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053871 [18/22] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode...
Date Thu, 30 Dec 2010 12:30:25 GMT
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/PersistorUtil_ValueAdapterTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/PersistorUtil_ValueAdapterTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/PersistorUtil_ValueAdapterTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/PersistorUtil_ValueAdapterTest.java Thu Dec 30 12:29:53 2010
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.per
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
 import org.apache.isis.core.progmodel.facets.object.aggregated.AggregatedFacetAlways;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.core.runtime.testsystem.TestProxyField;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithmTest.java Thu Dec 30 12:29:53 2010
@@ -26,8 +26,8 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java Thu Dec 30 12:29:53 2010
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.apache.isis.core.commons.lang.MethodUtils;
-import org.apache.isis.core.metamodel.facets.MethodScope;
-import org.apache.isis.core.metamodel.specloader.internal.introspector.MethodFinderUtils;
+import org.apache.isis.core.metamodel.facetapi.MethodScope;
+import org.apache.isis.core.metamodel.peer.MethodFinderUtils;
 
 
 @RunWith(Parameterized.class)

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionImplTest.java Thu Dec 30 12:29:53 2010
@@ -32,10 +32,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
@@ -43,7 +43,8 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectActionImpl;
 import org.apache.isis.core.progmodel.facets.actions.invoke.ActionInvocationFacetAbstract;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
@@ -89,7 +90,7 @@ public class ObjectActionImplTest extend
             }
         });
 
-        action = new ObjectActionImpl(mockFacetedMethod, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockServicesProvider, mockQuerySubmitter);
+        action = new ObjectActionImpl(mockFacetedMethod, new ObjectMemberContext(mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter), mockServicesProvider);
     }
 
     @Test

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java Thu Dec 30 12:29:53 2010
@@ -30,21 +30,23 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-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.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacetAbstract;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-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.VisibilityContext;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
+import org.apache.isis.core.metamodel.interactions2.PropertyUsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.PropertyVisibilityContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.peer.ObjectMemberAbstract;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.identifier.IdentifiedImpl;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
 import org.apache.isis.core.progmodel.facets.disable.DisableForSessionFacetAbstract;
 import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAbstract;
 import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAlways;
@@ -52,7 +54,6 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.hide.HiddenFacetNever;
 import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetNone;
 import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetAbstract;
-import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsFacetAbstract;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 
 
@@ -193,8 +194,15 @@ public class ObjectMemberAbstractTest {
 
 class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
 
+    public static class Customer{
+        private String firstName;
+        public String getFirstName() {
+            return firstName;
+        }
+    }
+    
     protected ObjectMemberAbstractImpl(final String id) {
-        super(id, new IdentifiedImpl(), FeatureType.PROPERTY, null, null, null, null);
+        super(FacetedMethod.createProperty(Customer.class, "firstName"), FeatureType.PROPERTY, new ObjectMemberContext(null, null, null, null));
     }
 
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationImplTest.java Thu Dec 30 12:29:53 2010
@@ -33,9 +33,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
@@ -43,8 +43,9 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.specloader.internal.OneToManyAssociationImpl;
+import org.apache.isis.core.metamodel.specloader.internal.spec.OneToManyAssociationImpl;
 
 @RunWith(JMock.class)
 public class OneToManyAssociationImplTest {
@@ -96,7 +97,7 @@ public class OneToManyAssociationImplTes
         allowingPeerToReturnCollectionType();
         allowingPeerToReturnIdentifier();
         allowingSpecLoaderToReturnSpecs();
-        association = new OneToManyAssociationImpl(mockPeer, mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter);
+        association = new OneToManyAssociationImpl(mockPeer, new ObjectMemberContext(mockAuthenticationSessionProvider, mockSpecificationLookup, mockAdapterManager, mockQuerySubmitter));
     }
 
     private void allowingSpecLoaderToReturnSpecs() {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java Thu Dec 30 12:29:53 2010
@@ -29,7 +29,8 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import org.junit.Test;
-import org.apache.isis.core.metamodel.specloader.internal.TypeExtractorMethodReturn;
+
+import org.apache.isis.core.metamodel.specloader.traverser.TypeExtractorMethodReturn;
 
 public class TypeExtractorMethodReturnTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java Thu Dec 30 12:29:53 2010
@@ -29,7 +29,7 @@ import java.util.List;
 
 import org.junit.Test;
 import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.core.metamodel.specloader.internal.TypeExtractorMethodParameters;
+import org.apache.isis.core.metamodel.specloader.traverser.TypeExtractorMethodParameters;
 
 public class TypeExtractorMethodsParametersTest {
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/MovieSpecification.java Thu Dec 30 12:29:53 2010
@@ -25,14 +25,14 @@ import java.util.List;
 
 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.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.interactions2.InteractionContext;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -193,32 +193,32 @@ public class MovieSpecification extends 
 
     @Override
     public ObjectAction getClassAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final ObjectSpecification[] parameters) {
         return null;
     }
 
     @Override
-    public String getFullName() {
+    public String getFullIdentifier() {
         return Movie.class.getName();
     }
 
     @Override
-    public ObjectAction getObjectAction(final ObjectActionType type, final String name) {
+    public ObjectAction getObjectAction(final ActionType type, final String name) {
         return null;
     }
 
     @Override
     public ObjectAction getObjectAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final List<ObjectSpecification> parameters) {
         return null;
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final ObjectActionType... type) {
+    public List<ObjectAction> getObjectActions(final ActionType... type) {
         return null;
     }
 
@@ -228,12 +228,12 @@ public class MovieSpecification extends 
     }
 
     @Override
-    public String getShortName() {
+    public String getShortIdentifier() {
         return "movie";
     }
 
     @Override
-    public String getName() {
+    public String getSingularName() {
         return "Movie";
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/OneToOneAssociationTest.java Thu Dec 30 12:29:53 2010
@@ -22,18 +22,18 @@ package org.apache.isis.core.runtime.tes
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-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.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
-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.interactions2.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/PersonSpecification.java Thu Dec 30 12:29:53 2010
@@ -24,12 +24,12 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
@@ -111,25 +111,25 @@ public class PersonSpecification extends
     }
 
     @Override
-    public String getFullName() {
+    public String getFullIdentifier() {
         return Person.class.getName();
     }
 
     @Override
-    public ObjectAction getObjectAction(final ObjectActionType type, final String name) {
+    public ObjectAction getObjectAction(final ActionType type, final String name) {
         return null;
     }
 
     @Override
     public ObjectAction getObjectAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final List<ObjectSpecification> parameters) {
         return null;
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final ObjectActionType... type) {
+    public List<ObjectAction> getObjectActions(final ActionType... type) {
         return null;
     }
 
@@ -139,12 +139,12 @@ public class PersonSpecification extends
     }
 
     @Override
-    public String getShortName() {
+    public String getShortIdentifier() {
         return "person";
     }
 
     @Override
-    public String getName() {
+    public String getSingularName() {
         return "Person";
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testspec/ValueFieldTest.java Thu Dec 30 12:29:53 2010
@@ -21,18 +21,18 @@
 package org.apache.isis.core.runtime.testspec;
 
 import org.apache.isis.applib.Identifier;
-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.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
-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.interactions2.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.persistence.internal.RuntimeContextFromSession;
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAction.java Thu Dec 30 12:29:53 2010
@@ -24,24 +24,24 @@ import java.util.List;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.filters.Filter;
-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.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-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.interactions2.ActionInvocationContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.Instance;
 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;
 
 
 public class TestProxyAction extends FacetHolderNoop implements ObjectAction {
@@ -110,7 +110,7 @@ public class TestProxyAction extends Fac
     }
 
     @Override
-    public ObjectActionType getType() {
+    public ActionType getType() {
         return null;
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAdapter.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAdapter.java Thu Dec 30 12:29:53 2010
@@ -24,12 +24,12 @@ import java.util.Hashtable;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.ElementSpecificationProvider;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Specification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -173,15 +173,11 @@ public class TestProxyAdapter implements
     }
 
     @Override
-    public TypeOfFacet getTypeOfFacet() {
+    public ObjectSpecification getElementSpecification() {
         return null;
     }
 
     @Override
-    public void setTypeOfFacet(final TypeOfFacet typeOfFacet) {
-    }
-
-    @Override
     public ObjectAdapter getOwner() {
         return null;
     }
@@ -201,4 +197,9 @@ public class TestProxyAdapter implements
         return this;
     }
 
+    @Override
+    public void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider) {
+    }
+
+
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyAssociation.java Thu Dec 30 12:29:53 2010
@@ -26,24 +26,24 @@ import junit.framework.Assert;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-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.ConsentAbstract;
-import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.core.metamodel.consent.InteractionResult;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
-import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
-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.interactions2.InteractionContext;
+import org.apache.isis.core.metamodel.interactions2.PropertyAccessContext;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyCollectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyCollectionAdapter.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyCollectionAdapter.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyCollectionAdapter.java Thu Dec 30 12:29:53 2010
@@ -29,19 +29,21 @@ import java.util.Vector;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.EnumerationUtils;
 import org.apache.commons.collections.iterators.IteratorEnumeration;
+
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectList;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
 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.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.ObjectList;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Specification;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -99,10 +101,6 @@ public class TestProxyCollectionAdapter 
         }
     }
 
-    public ObjectSpecification getElementSpecification() {
-        return null;
-    }
-
     @Override
     public String getIconName() {
         return null;
@@ -222,13 +220,11 @@ public class TestProxyCollectionAdapter 
     public void fireChangedEvent() {}
 
     @Override
-    public void setTypeOfFacet(final TypeOfFacet typeOfFacet) {}
-
-    @Override
-    public TypeOfFacet getTypeOfFacet() {
+    public ObjectSpecification getElementSpecification() {
         return null;
     }
 
+
     @Override
     public ObjectAdapter getOwner() {
         return null;
@@ -263,6 +259,15 @@ public class TestProxyCollectionAdapter 
         return IsisContext.getPersistenceSession();
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.isis.core.metamodel.spec.ObjectMetaModel#setElementTypeProvider(org.apache.isis.core.metamodel.spec.ElementTypeProvider)
+     */
+    @Override
+    public void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider) {
+        // TODO Auto-generated method stub
+        
+    }
+
 }
 
 class TestProxyCollectionFacet implements CollectionFacet {
@@ -356,4 +361,5 @@ class TestProxyCollectionFacet implement
 	}
 
 
+
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyField.java Thu Dec 30 12:29:53 2010
@@ -21,21 +21,21 @@
 package org.apache.isis.core.runtime.testsystem;
 
 import org.apache.isis.applib.Identifier;
-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.consent.InteractionResult;
-import org.apache.isis.core.metamodel.consent.InteractionResultSet;
-import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-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.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.consent2.InteractionResultSet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.interactions2.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions2.ValidityContext;
+import org.apache.isis.core.metamodel.interactions2.VisibilityContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 
@@ -50,7 +50,7 @@ public class TestProxyField extends Face
     public TestProxyField(final String name, final ObjectSpecification spec) {
         this.name = name;
         this.spec = spec;
-        identifier = Identifier.propertyOrCollectionIdentifier(spec.getFullName(), name);
+        identifier = Identifier.propertyOrCollectionIdentifier(spec.getFullIdentifier(), name);
 		runtimeContext = new RuntimeContextNoRuntime();
     }
 

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyIdentityMapOriginal.java Thu Dec 30 12:29:53 2010
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestProxyReflector.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,6 @@ import java.util.Hashtable;
 import java.util.List;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -34,9 +33,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
-import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactory;
@@ -77,7 +73,7 @@ public class TestProxyReflector implemen
     public void debugData(final DebugString debug) {
         final ObjectSpecification[] list = allSpecifications();
         for (int i = 0; i < list.length; i++) {
-            debug.appendln(list[i].getFullName());
+            debug.appendln(list[i].getFullIdentifier());
         }
     }
 
@@ -100,7 +96,7 @@ public class TestProxyReflector implemen
             return specificationByFullName.get(name);
         } else {
             final TestProxySpecification specification = new TestProxySpecification(name);
-            specificationByFullName.put(specification.getFullName(), specification);
+            specificationByFullName.put(specification.getFullIdentifier(), specification);
             return specification;
 
             // throw new ObjectAdapterRuntimeException("no specification for " + name);
@@ -116,7 +112,7 @@ public class TestProxyReflector implemen
     }
 
     public void addSpecification(final ObjectSpecification specification) {
-        specificationByFullName.put(specification.getFullName(), specification);
+        specificationByFullName.put(specification.getFullIdentifier(), specification);
     }
 
     public ObjectFactory getObjectFactory() {
@@ -149,8 +145,7 @@ public class TestProxyReflector implemen
         }
     }
 
-    @Override
-    public ClassSubstitutor getClassSubstitutor() {
+    protected ClassSubstitutor getClassSubstitutor() {
         return classSubstitutor;
     }
 
@@ -160,28 +155,18 @@ public class TestProxyReflector implemen
     }
 
     @Override
-    public RuntimeContext getRuntimeContext() {
-        throw new NotYetImplementedException();
-    }
-
-    @Override
     public void setServiceClasses(List<Class<?>> serviceClasses) {
         // ignored.
     }
 
     @Override
-    public MetaModelValidator getMetaModelValidator() {
-        throw new NotYetImplementedException();
-    }
-
-    @Override
-    public ProgrammingModelFacets getProgrammingModelFacets() {
-        throw new NotYetImplementedException();
+    public boolean loadSpecifications(List<Class<?>> typesToLoad, Class<?> typeToIgnore) {
+        return false;
     }
 
     @Override
-    public SpecificationTraverser getSpecificationTraverser() {
-        throw new NotYetImplementedException();
+    public boolean loadSpecifications(List<Class<?>> typesToLoad) {
+        return false;
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/TestSpecification.java Thu Dec 30 12:29:53 2010
@@ -30,20 +30,20 @@ import org.apache.isis.applib.Identifier
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.commons.filters.Filter;
-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.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent2.InteractionResult;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetHolderNoop;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.interactions2.ObjectTitleContext;
+import org.apache.isis.core.metamodel.interactions2.ObjectValidityContext;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.Instance;
 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.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -81,6 +81,16 @@ public class TestSpecification extends F
     }
 
     @Override
+    public Class<?> getCorrespondingClass() {
+        try {
+            return Class.forName(name);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    @Override
     public void clearDirty(final ObjectAdapter object) {}
 
     @Override
@@ -89,7 +99,7 @@ public class TestSpecification extends F
     }
 
     @Override
-    public List<ObjectAction> getServiceActionsReturning(final ObjectActionType... type) {
+    public List<ObjectAction> getServiceActionsReturning(final ActionType... type) {
         return null;
     }
 
@@ -149,7 +159,7 @@ public class TestSpecification extends F
     }
 
     @Override
-    public String getFullName() {
+    public String getFullIdentifier() {
         return name;
     }
 
@@ -160,7 +170,7 @@ public class TestSpecification extends F
 
     @Override
     public ObjectAction getObjectAction(
-            final ObjectActionType type,
+            final ActionType type,
             final String name,
             final List<ObjectSpecification> parameters) {
         if (action != null && action.getId().equals(name)) {
@@ -170,12 +180,12 @@ public class TestSpecification extends F
     }
 
     @Override
-    public ObjectAction getObjectAction(final ObjectActionType type, final String name) {
+    public ObjectAction getObjectAction(final ActionType type, final String name) {
         return getObjectAction(type, name, ObjectSpecification.EMPTY_LIST);
     }
 
     @Override
-    public List<ObjectAction> getObjectActions(final ObjectActionType... type) {
+    public List<ObjectAction> getObjectActions(final ActionType... type) {
         return null;
     }
 
@@ -189,18 +199,18 @@ public class TestSpecification extends F
     }
 
     @Override
-    public String getShortName() {
+    public String getShortIdentifier() {
         return name.substring(name.lastIndexOf('.') + 1);
     }
 
     @Override
-    public String getName() {
+    public String getSingularName() {
         return name + " (singular)";
     }
 
     @Override
     public String getDescription() {
-        return getName();
+        return getSingularName();
     }
 
     @Override
@@ -257,7 +267,7 @@ public class TestSpecification extends F
     public void markDirty(final ObjectAdapter object) {}
 
     public Object newInstance() {
-        throw new IsisException("Not able to create instance of " + getFullName()
+        throw new IsisException("Not able to create instance of " + getFullIdentifier()
                 + "; newInstance() method should be overridden");
     }
 
@@ -282,7 +292,7 @@ public class TestSpecification extends F
 
     @Override
     public String toString() {
-        return getFullName();
+        return getFullIdentifier();
     }
 
     @Override
@@ -363,4 +373,36 @@ public class TestSpecification extends F
     }
 
 
+    // /////////////////////////////////////////////////////////////
+    // introspection
+    // /////////////////////////////////////////////////////////////
+
+    @Override
+    public void introspectTypeHierarchyAndMembers() {
+    }
+
+    @Override
+    public void updateFromFacetValues() {
+    }
+
+    @Override
+    public void markAsService() {
+    }
+
+    @Override
+    public boolean isIntrospected() {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer#getObjectActionsAll()
+     */
+    @Override
+    public List<ObjectAction> getObjectActionsAll() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+
+
 }

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreatePersistentObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreatePersistentObjectsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreatePersistentObjectsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreatePersistentObjectsTest.java Thu Dec 30 12:29:53 2010
@@ -57,7 +57,7 @@ public class CreatePersistentObjectsTest
 
     public void testSpecification() {
         assertNotNull(adapter.getSpecification());
-        assertNotNull(TestPojo.class.getName(), adapter.getSpecification().getFullName());
+        assertNotNull(TestPojo.class.getName(), adapter.getSpecification().getFullIdentifier());
     }
 
     public void test2ndPersistentCreationHasDifferentOid() {

Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreateTransientObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreateTransientObjectsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreateTransientObjectsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/testsystem/tests/CreateTransientObjectsTest.java Thu Dec 30 12:29:53 2010
@@ -63,7 +63,7 @@ public class CreateTransientObjectsTest 
     @Test
     public void testSpecification() {
         assertNotNull(adapter.getSpecification());
-        assertNotNull(TestPojo.class.getName(), adapter.getSpecification().getFullName());
+        assertNotNull(TestPojo.class.getName(), adapter.getSpecification().getFullIdentifier());
     }
 
     @Test

Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/classsubstitutor/CglibClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/classsubstitutor/CglibClassSubstitutor.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/classsubstitutor/CglibClassSubstitutor.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/classsubstitutor/CglibClassSubstitutor.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.defaults.bytecode.classsubstitutor;
 
+import org.apache.isis.core.commons.lang.ClassUtil;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
-import org.apache.isis.core.metamodel.util.ClassUtil;
 import org.apache.isis.defaults.bytecode.objectfactory.internal.CglibEnhanced;
 
 

Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/defaults/bytecode/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Thu Dec 30 12:29:53 2010
@@ -33,9 +33,9 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.facets.ImperativeFacet;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils.ImperativeFacetFlags;
-import org.apache.isis.core.metamodel.java5.JavaSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.specloader.internal.spec.dflt.ObjectSpecificationDefault;
 import org.apache.isis.core.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectChanger;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectResolver;
@@ -72,7 +72,7 @@ public class ObjectResolveAndObjectChang
 				ImperativeFacetFlags flags = null;
 				
 				if (!ignore) {
-					final JavaSpecification targetObjSpec = getJavaSpecificationOfOwningClass(proxiedMethod);
+					final ObjectSpecificationDefault targetObjSpec = getJavaSpecificationOfOwningClass(proxiedMethod);
 					final ObjectMember member = targetObjSpec.getMember(proxiedMethod);
 					
 					flags = ImperativeFacetUtils.getImperativeFacetFlags(member, proxiedMethod);

Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/InMemoryObjectStore.java Thu Dec 30 12:29:53 2010
@@ -104,7 +104,7 @@ public class InMemoryObjectStore impleme
     protected void recreateAdapters() {
         for(ObjectSpecification noSpec: persistedObjects.specifications()) {
 			if (LOG.isDebugEnabled()) {
-				LOG.debug("recreating adapters for: " + noSpec.getFullName());
+				LOG.debug("recreating adapters for: " + noSpec.getFullIdentifier());
 			}
         	recreateAdapters(persistedObjects.instancesFor(noSpec));
         }
@@ -402,7 +402,7 @@ public class InMemoryObjectStore impleme
     public void debugData(final DebugString debug) {
         debug.appendTitle("Domain Objects");
         for(final ObjectSpecification spec: persistedObjects.specifications()) {
-            debug.appendln(spec.getFullName());
+            debug.appendln(spec.getFullIdentifier());
             final ObjectStoreInstances instances = instancesFor(spec);
             instances.debugData(debug);
         }

Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/defaults/objectstore/internal/commands/AbstractInMemoryPersistenceCommand.java Thu Dec 30 12:29:53 2010
@@ -42,7 +42,7 @@ public abstract class AbstractInMemoryPe
 	protected void save(final ObjectAdapter adapter) throws ObjectPersistenceException {
         final ObjectSpecification specification = adapter.getSpecification();
         if (LOG.isDebugEnabled()) {
-        	LOG.debug("   saving object " + adapter + " as instance of " + specification.getShortName());
+        	LOG.debug("   saving object " + adapter + " as instance of " + specification.getShortIdentifier());
         }
         final ObjectStoreInstances ins = instancesFor(specification);
         ins.save(adapter); // also sets the version
@@ -51,7 +51,7 @@ public abstract class AbstractInMemoryPe
     protected void destroy(final ObjectAdapter adapter) {
         final ObjectSpecification specification = adapter.getSpecification();
         if (LOG.isDebugEnabled()) {
-        	LOG.debug("   destroy object " + adapter + " as instance of " + specification.getShortName());
+        	LOG.debug("   destroy object " + adapter + " as instance of " + specification.getShortIdentifier());
         }
         final ObjectStoreInstances ins = instancesFor(specification);
         ins.remove(adapter.getOid());

Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java Thu Dec 30 12:29:53 2010
@@ -26,29 +26,31 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+
+import com.google.common.collect.Lists;
+
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorComposite;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
-import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.core.runtime.installers.InstallerAbstract;
 import org.apache.isis.core.runtime.installers.InstallerLookup;
 import org.apache.isis.core.runtime.installers.InstallerLookupAware;
 
-import com.google.common.collect.Lists;
-
 
 public class JavaReflectorInstaller extends InstallerAbstract implements ObjectReflectorInstaller, InstallerLookupAware {
 
@@ -84,20 +86,23 @@ public class JavaReflectorInstaller exte
     /**
      * Should call {@link #addFacetDecoratorInstaller(ReflectorDecoratorInstaller)} prior to calling this.
      */
+    @Override
     public ObjectReflectorDefault createReflector() {
         final ClassSubstitutor classSubstitutor = createClassSubstitutor(getConfiguration());
         final CollectionTypeRegistry collectionTypeRegistry = createCollectionTypeRegistry(getConfiguration());
         final SpecificationTraverser specificationTraverser = createSpecificationTraverser(getConfiguration());
-        final ProgrammingModelFacets programmingModelFacets = createProgrammingModelFacets(getConfiguration());
+        final MemberLayoutArranger memberLayoutArranger = createMemberLayoutArranger(getConfiguration());
+        final ProgrammingModel programmingModel = createProgrammingModelFacets(getConfiguration());
         final Set<FacetDecorator> facetDecorators = createFacetDecorators(getConfiguration());
         final MetaModelValidator metaModelValidator = createMetaModelValidator(getConfiguration());
 
 		final ObjectReflectorDefault reflector = doCreateReflector(getConfiguration(), classSubstitutor, collectionTypeRegistry,
-                specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
+                specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
 
         return reflector;
     }
 
+
     /**
      * Hook method to allow subclasses to specify a different implementation of {@link ClassSubstitutor}.
      * 
@@ -139,10 +144,26 @@ public class JavaReflectorInstaller exte
         return specificationTraverser;
     }
 
+    /**
+     * Hook method to allow subclasses to specify a different implementation of {@link MemberLayoutArranger}.
+     * 
+     * <p>
+     * By default, looks up implementation from provided {@link IsisConfiguration} using
+     * {@link ReflectorConstants#MEMBER_LAYOUT_ARRANGER_CLASS_NAME}. If not specified, then defaults to
+     * {@value ReflectorConstants#MEMBER_LAYOUT_ARRANGER_CLASS_NAME_DEFAULT}.
+     */
+    protected MemberLayoutArranger createMemberLayoutArranger(IsisConfiguration configuration) {
+        final String memberLayoutArrangerClassName = configuration.getString(ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME,
+            ReflectorConstants.MEMBER_LAYOUT_ARRANGER_CLASS_NAME_DEFAULT);
+            MemberLayoutArranger memberLayoutArranger = InstanceFactory.createInstance(memberLayoutArrangerClassName,
+                MemberLayoutArranger.class);
+            return memberLayoutArranger;
+    }
+
 
     /**
      * Hook method to allow subclasses to specify a different implementations (that is, sets of
-     * {@link ProgrammingModelFacets}.
+     * {@link ProgrammingModel}.
      * 
      * <p>
      * By default, looks up implementation from provided {@link IsisConfiguration} using
@@ -155,55 +176,55 @@ public class JavaReflectorInstaller exte
      * {@link FacetFactory factories} to include, and
      * {@link ReflectorConstants#FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST} to exclude.
      */
-    protected ProgrammingModelFacets createProgrammingModelFacets(final IsisConfiguration configuration) {
-        ProgrammingModelFacets programmingModelFacets = lookupAndCreateProgrammingModelFacets(configuration);
+    protected ProgrammingModel createProgrammingModelFacets(final IsisConfiguration configuration) {
+        ProgrammingModel programmingModel = lookupAndCreateProgrammingModelFacets(configuration);
 
-        includeFacetFactories(configuration, programmingModelFacets);
+        includeFacetFactories(configuration, programmingModel);
 
-        excludeFacetFactories(configuration, programmingModelFacets);
+        excludeFacetFactories(configuration, programmingModel);
 
-        return programmingModelFacets;
+        return programmingModel;
     }
 
-    private ProgrammingModelFacets lookupAndCreateProgrammingModelFacets(final IsisConfiguration configuration) {
+    private ProgrammingModel lookupAndCreateProgrammingModelFacets(final IsisConfiguration configuration) {
         final String progModelFacetsClassName = configuration.getString(ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME,
                 ReflectorConstants.PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT);
-        ProgrammingModelFacets programmingModelFacets = InstanceFactory.createInstance(progModelFacetsClassName,
-                ProgrammingModelFacets.class);
-        return programmingModelFacets;
+        ProgrammingModel programmingModel = InstanceFactory.createInstance(progModelFacetsClassName,
+                ProgrammingModel.class);
+        return programmingModel;
     }
 
     /**
      * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)} so that subclasses that
-     * choose to override can still support customization of their {@link ProgrammingModelFacets} in a similar
+     * choose to override can still support customization of their {@link ProgrammingModel} in a similar
      * way.
      */
     protected void includeFacetFactories(
             final IsisConfiguration configuration,
-            ProgrammingModelFacets programmingModelFacets) {
+            ProgrammingModel programmingModel) {
         final String[] facetFactoriesIncludeClassNames = configuration
                 .getList(ReflectorConstants.FACET_FACTORY_INCLUDE_CLASS_NAME_LIST);
         if (facetFactoriesIncludeClassNames != null) {
             for (String facetFactoryClassName : facetFactoriesIncludeClassNames) {
                 Class<? extends FacetFactory> facetFactory = InstanceFactory.loadClass(facetFactoryClassName, FacetFactory.class);
-                programmingModelFacets.addFactory(facetFactory);
+                programmingModel.addFactory(facetFactory);
             }
         }
     }
 
     /**
      * Factored out of {@link #createProgrammingModelFacets(IsisConfiguration)} so that subclasses that
-     * choose to override can still support customization of their {@link ProgrammingModelFacets} in a similar
+     * choose to override can still support customization of their {@link ProgrammingModel} in a similar
      * way.
      */
     protected void excludeFacetFactories(
             final IsisConfiguration configuration,
-            ProgrammingModelFacets programmingModelFacets) {
+            ProgrammingModel programmingModel) {
         final String[] facetFactoriesExcludeClassNames = configuration
                 .getList(ReflectorConstants.FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST);
         for (String facetFactoryClassName : facetFactoriesExcludeClassNames) {
             Class<? extends FacetFactory> facetFactory = InstanceFactory.loadClass(facetFactoryClassName, FacetFactory.class);
-            programmingModelFacets.removeFactory(facetFactory);
+            programmingModel.removeFactory(facetFactory);
         }
     }
 
@@ -233,7 +254,7 @@ public class JavaReflectorInstaller exte
     }
 
     private FacetDecoratorInstaller lookupFacetDecorator(final String decoratorClassName) {
-        return (FacetDecoratorInstaller) installerLookup.getInstaller(FacetDecoratorInstaller.class, decoratorClassName);
+        return installerLookup.getInstaller(FacetDecoratorInstaller.class, decoratorClassName);
     }
 
     private Set<FacetDecorator> createFacetDecorators(final Set<FacetDecoratorInstaller> decoratorInstallers) {
@@ -288,10 +309,11 @@ public class JavaReflectorInstaller exte
             final ClassSubstitutor classSubstitutor,
             final CollectionTypeRegistry collectionTypeRegistry,
             final SpecificationTraverser specificationTraverser,
-            final ProgrammingModelFacets programmingModelFacets, 
+            final MemberLayoutArranger memberLayoutArranger,
+            final ProgrammingModel programmingModel, 
             final Set<FacetDecorator> facetDecorators, 
             final MetaModelValidator metaModelValidator) {
-        return new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
+        return new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
     }
 
     // /////////////////////////////////////////////////////
@@ -301,6 +323,7 @@ public class JavaReflectorInstaller exte
     /**
      * Injected by virtue of being {@link InstallerLookupAware}.
      */
+    @Override
     public void setInstallerLookup(InstallerLookup installerLookup) {
         this.installerLookup = installerLookup;
     }
@@ -313,6 +336,7 @@ public class JavaReflectorInstaller exte
      * Adds in {@link FacetDecoratorInstaller}; if <tt>null</tt> or if already added then request will be
      * silently ignored.
      */
+    @Override
     public void addFacetDecoratorInstaller(final FacetDecoratorInstaller decoratorInstaller) {
         if (decoratorInstaller == null) {
             return;

Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/ProgrammingModelFacetsJava5.java Thu Dec 30 12:29:53 2010
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.java5.RemoveInitMethodFacetFactory;
 import org.apache.isis.core.metamodel.facets.object.java5.RemoveJavaLangObjectMethodsFacetFactory;
 import org.apache.isis.core.metamodel.facets.object.java5.RemoveSuperclassMethodsFacetFactory;
-import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsAbstract;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
 import org.apache.isis.core.progmodel.facets.FallbackFacetFactory;
 import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;
 import org.apache.isis.core.progmodel.facets.actions.ActionMethodsFacetFactory;
@@ -125,7 +125,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.value.TimeValueTypeFacetFactory;
 
 
-public class ProgrammingModelFacetsJava5 extends ProgrammingModelFacetsAbstract {
+public class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract {
 	
 	public ProgrammingModelFacetsJava5() {
 		

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflectorTestAbstract.java Thu Dec 30 12:29:53 2010
@@ -23,14 +23,26 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
 import org.apache.isis.core.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.metamodel.layout.dflt.MemberLayoutArrangerDefault;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
@@ -47,17 +59,6 @@ import org.apache.isis.core.runtime.sess
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.testsystem.TestClassSubstitutor;
 import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
 public abstract class JavaReflectorTestAbstract {
@@ -98,7 +99,7 @@ public abstract class JavaReflectorTestA
 
         final ObjectReflectorDefault reflector =
             new ObjectReflectorDefault(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
-                new SpecificationTraverserDefault(), new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(),
+                new SpecificationTraverserDefault(), new MemberLayoutArrangerDefault(), new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(),
                 new MetaModelValidatorNoop());
         reflector.setRuntimeContext(new RuntimeContextFromSession());
         reflector.init();

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ArrayTest.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,8 @@ package org.apache.isis.defaults.progmod
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.isis.core.metamodel.facets.Facet;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -44,7 +45,7 @@ public class JavaReflector_ArrayTest ext
 
     @Test
     public void testName() throws Exception {
-        Assert.assertEquals(TestPojo[].class.getName(), specification.getFullName());
+        Assert.assertEquals(TestPojo[].class.getName(), specification.getFullIdentifier());
     }
 
     @Test

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_CollectionTest.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,8 @@ import java.util.Vector;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.isis.core.metamodel.facets.Facet;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -45,7 +46,7 @@ public class JavaReflector_CollectionTes
 
     @Test
     public void testName() throws Exception {
-        Assert.assertEquals(Vector.class.getName(), specification.getFullName());
+        Assert.assertEquals(Vector.class.getName(), specification.getFullIdentifier());
     }
 
     @Test

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ObjectTest.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,8 @@ package org.apache.isis.defaults.progmod
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.isis.core.metamodel.facets.Facet;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
@@ -51,7 +52,7 @@ public class JavaReflector_ObjectTest ex
 
     @Test
     public void testName() throws Exception {
-        Assert.assertEquals(TestDomainObject.class.getName(), specification.getFullName());
+        Assert.assertEquals(TestDomainObject.class.getName(), specification.getFullIdentifier());
     }
 
     @Test

Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/defaults/progmodel/JavaReflector_ValueTest.java Thu Dec 30 12:29:53 2010
@@ -40,7 +40,7 @@ public class JavaReflector_ValueTest ext
 
     @Test
     public void testName() throws Exception {
-        Assert.assertEquals(String.class.getName(), specification.getFullName());
+        Assert.assertEquals(String.class.getName(), specification.getFullIdentifier());
     }
 
 }

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.metamodel.examples.facets.namefile;
 
-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.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
 
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -24,12 +24,12 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.feature.FeatureType;
-import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 
 
 public class NameFileFacetFactory implements FacetFactory {

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileProgModelFacets.java Thu Dec 30 12:29:53 2010
@@ -20,18 +20,18 @@
 
 package org.apache.isis.metamodel.examples.facets.namefile;
 
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
 
 
 /**
- * Implementation of {@link ProgrammingModelFacets} that additionally just installs support for
+ * Implementation of {@link ProgrammingModel} that additionally just installs support for
  * {@link NameFileFacet name files}.
  * 
  * <p>
  * This implementation is really provided only as an example. Typically you would provide your own
- * {@link ProgrammingModelFacets} implementation that installs other additional {@link FacetFactory facet
+ * {@link ProgrammingModel} implementation that installs other additional {@link FacetFactory facet
  * factories} ass required for your programming model.
  */
 public class NameFileProgModelFacets extends ProgrammingModelFacetsJava5 {



Mime
View raw message