You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/12/22 17:22:32 UTC

svn commit: r1051971 [9/18] - in /incubator/isis/trunk: alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javas...

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java Wed Dec 22 16:22:08 2010
@@ -20,17 +20,37 @@
 
 package org.apache.isis.core.metamodel.spec.feature;
 
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
-import org.apache.isis.core.metamodel.spec.NamedAndDescribed;
-import org.apache.isis.core.metamodel.spec.TypedSpecification;
+import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
 
 
-/**
- * Base interface for fields, collections, actions and action parameters.
- * 
- */
-public interface ObjectFeature extends TypedSpecification, NamedAndDescribed {
+/**
+ * A specification representing a non-{@link FeatureType#OBJECT object}, 
+ * that therefore has an underlying type (the type of the property, collection)
+ * 
+ * <p>
+ * For a property or action parameter, is the type.  For a collection is the element type.
+ * For an action it is always <tt>null</tt>.
+ */
+public interface ObjectFeature extends Specification {
+
+    /**
+     * The specification of the underlying type.
+     * 
+     * <p>
+     * For example:
+     * <ul>
+     * <li>for a {@link OneToOneAssociation property}, will return the {@link ObjectSpecification} 
+     *     of the type that the accessor returns.
+     * <li>for a {@link OneToManyAssociation collection} it will be the type of element
+     *     the collection holds (not the type of collection).
+     * <li>for a {@link ObjectAction action}, will always return <tt>null</tt>.  See instead {@link ObjectAction#getReturnType()} and {@link ObjectAction#getParameterTypes()}.
+     * <li>for a {@link ObjectActionParameter action}, will return the type of the parameter}.
+     * </ul>
+     */
+    ObjectSpecification getSpecification();
+
 
-    FeatureType getFeatureType();
 
 }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflector.java Wed Dec 22 16:22:08 2010
@@ -23,12 +23,14 @@ package org.apache.isis.core.metamodel.s
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 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;
 
-public interface ObjectReflector extends SpecificationLoader,
+public interface ObjectReflector extends SpecificationLoader, SpecificationLookup,
 		ApplicationScopedComponent, RuntimeContextAware {
 
 	/**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java (from r1051471, incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java&p1=incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflector.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflector.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java Wed Dec 22 16:22:08 2010
@@ -18,69 +18,602 @@
  */
 
 
-package org.apache.isis.defaults.progmodel;
+package org.apache.isis.core.metamodel.specloader;
 
+import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
 
+import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.ensure.Assert;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.commons.lang.JavaClassUtils;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ObjectList;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.java5.JavaSpecification;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.core.metamodel.spec.InstanceCollectionSpecification;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.spec.SpecificationLookupAware;
 import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
 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.internal.cache.SimpleSpecificationCache;
+import org.apache.isis.core.metamodel.specloader.internal.cache.SpecificationCache;
+import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
 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.progmodel.spec.JavaSpecification;
-import org.apache.isis.core.progmodel.specloader.internal.instances.InstanceCollectionSpecification;
 
+/**
+ * Builds the meta-model.
+ * 
+ * <p>
+ * The implementation provides for a degree of pluggability:
+ * <ul>
+ * <li>The most important plug-in point is {@link ProgrammingModelFacets} that
+ * specifies the set of {@link Facet} that make up programming model. If not
+ * specified then defaults to {@link ProgrammingModelFacetsJava5} (which should
+ * be used as a starting point for your own customizations).
+ * <li>The only mandatory plug-in point is {@link ClassSubstitutor}, which
+ * allows the class to be loaded to be substituted if required. This is used in
+ * conjunction with some <tt>PersistenceMechanism</tt>s that do class
+ * enhancement.
+ * <li>The {@link CollectionTypeRegistry} specifies the types that should be
+ * considered as collections. If not specified then will
+ * {@link CollectionTypeRegistryDefault default}. (Note: this extension point
+ * has not been tested, so should be considered more of a &quot;statement of
+ * intent&quot; than actual API. Also, we may use annotations (similar to the
+ * way in which Values are specified) as an alternative mechanism).
+ * </ul>
+ * 
+ * <p>
+ * In addition, the {@link RuntimeContext} can optionally be injected, but will
+ * default to {@link RuntimeContextNoRuntime} if not provided prior to
+ * {@link #init() initialization}. The purpose of {@link RuntimeContext} is to
+ * allow the metamodel to be used standalone, for example in a Maven plugin. The
+ * {@link RuntimeContextNoRuntime} implementation will through an exception for
+ * any methods (such as finding an {@link ObjectAdapter adapter}) because there is
+ * no runtime session. In the case of the metamodel being used by the framework
+ * (that is, when there <i>is</i> a runtime), then the framework injects an
+ * implementation of {@link RuntimeContext} that acts like a bridge to its
+ * <tt>IsisContext</tt>.
+ */
 
-public class JavaReflector extends ObjectReflectorAbstract {
+public class ObjectReflectorDefault implements ObjectReflector, DebugInfo {
 
     @SuppressWarnings("unused")
-    private final static Logger LOG = Logger.getLogger(JavaReflector.class);
-
-    // /////////////////////////////////////////////////////////////
-    // constructor
-    // /////////////////////////////////////////////////////////////
-
-    public JavaReflector(
-            final IsisConfiguration configuration,
-            final ClassSubstitutor classSubstitutor,
-            final CollectionTypeRegistry collectionTypeRegistry,
-            final SpecificationTraverser specificationTraverser,
-            final ProgrammingModelFacets programmingModelFacets, 
-            final Set<FacetDecorator> facetDecorators, 
-            final MetaModelValidator metaModelValidator) {
-        super(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
-    }
-
-	/**
-	 * Overridable method for language-specific subclass to create the
-	 * appropriate type of {@link ObjectSpecification}.
-	 */
-	@Override
-    protected ObjectSpecification createSpecification(final Class<?> cls) {
-
-		if (ObjectList.class.isAssignableFrom(cls)) {
-			return new InstanceCollectionSpecification(this,
-					getRuntimeContext().getAuthenticationSessionProvider(),
-					getRuntimeContext().getServicesProvider(),
-					getRuntimeContext().getObjectInstantiator());
-		}
-
-		return new JavaSpecification(cls, this, 
-		    getRuntimeContext().getAuthenticationSessionProvider(), 
-		    getRuntimeContext().getSpecificationLookup(),
-		    getRuntimeContext().getServicesProvider(),
-		    getRuntimeContext().getAdapterMap(), 
-		    getRuntimeContext().getObjectInstantiator(),
-		    getRuntimeContext().getDependencyInjector(),
-		    getRuntimeContext().getQuerySubmitter());
-	}
+    private final static Logger LOG = Logger.getLogger(ObjectReflectorDefault.class);
 
+
+   /**
+     * Injected in the constructor.
+     */
+    private final IsisConfiguration configuration;
+    /**
+     * Injected in the constructor.
+     */
+    private final ClassSubstitutor classSubstitutor;
+    /**
+     * Injected in the constructor.
+     */
+    private final CollectionTypeRegistry collectionTypeRegistry;
+    /**
+     * Injected in the constructor.
+     */
+    private final ProgrammingModelFacets programmingModelFacets;
+
+    /**
+     * Defaulted in the constructor.
+     */
+    private final FacetProcessor facetProcessor;
+
+    /**
+     * Defaulted in the constructor, so can be added to via
+     * {@link #setFacetDecorators(FacetDecoratorSet)} or
+     * {@link #addFacetDecorator(FacetDecorator)}.
+     * 
+     * <p>
+     * {@link FacetDecorator}s must be added prior to {@link #init()
+     * initialization.}
+     */
+    private final FacetDecoratorSet facetDecoratorSet;
+
+    /**
+     * Can optionally be injected, but will default (to
+     * {@link RuntimeContextNoRuntime}) otherwise.
+     * 
+     * <p>
+     * Should be injected when used by framework, but will default to a no-op
+     * implementation if the metamodel is being used standalone (eg for a
+     * code-generator).
+     */
+    private RuntimeContext runtimeContext;
+
+    private SpecificationTraverser specificationTraverser;
+
+    /**
+     * Priming cache, optionally {@link #setServiceClasses(List) injected}.
+     */
+    private List<Class<?>> serviceClasses = new ArrayList<Class<?>>();
+
+    /**
+     * Optionally {@link #setValidator(MetaModelValidator) injected}.
+     */
+    private MetaModelValidator metaModelValidator;
+
+    /**
+     * Defaulted in the constructor.
+     */
+    private final SpecificationCache cache;
+
+    
+    // /////////////////////////////////////////////////////////////
+    // Constructor
+    // /////////////////////////////////////////////////////////////
+
+    public ObjectReflectorDefault(
+            final IsisConfiguration configuration,
+            final ClassSubstitutor classSubstitutor,
+            final CollectionTypeRegistry collectionTypeRegistry,
+            final SpecificationTraverser specificationTraverser,
+            final ProgrammingModelFacets programmingModelFacets, 
+            final Set<FacetDecorator> facetDecorators, 
+            final MetaModelValidator metaModelValidator) {
+        
+        ensureThatArg(configuration, is(notNullValue()));
+        ensureThatArg(classSubstitutor, is(notNullValue()));
+        ensureThatArg(collectionTypeRegistry, is(notNullValue()));
+        ensureThatArg(programmingModelFacets, is(notNullValue()));
+        ensureThatArg(specificationTraverser, is(notNullValue()));
+        ensureThatArg(facetDecorators, is(notNullValue()));
+        ensureThatArg(metaModelValidator, is(notNullValue()));
+
+        this.configuration = configuration;
+        this.classSubstitutor = classSubstitutor;
+        this.collectionTypeRegistry = collectionTypeRegistry;
+        this.programmingModelFacets = programmingModelFacets;
+        this.specificationTraverser = specificationTraverser;
+        
+        this.facetDecoratorSet = new FacetDecoratorSet();
+        for (final FacetDecorator facetDecorator : facetDecorators) {
+            this.facetDecoratorSet.add(facetDecorator);
+        }
+
+        this.metaModelValidator = metaModelValidator;
+        
+        this.facetProcessor = new FacetProcessor(configuration, this,
+                collectionTypeRegistry, programmingModelFacets);
+        
+        this.cache = new SimpleSpecificationCache();
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        LOG.info("finalizing reflector factory " + this);
+    }
+
+    // /////////////////////////////////////////////////////////////
+    // init, shutdown
+    // /////////////////////////////////////////////////////////////
+
+    /**
+     * Initializes and wires up, and primes the cache based on
+     * any service classes that may have been {@link #setServiceClasses(List) injected}.
+     */
+    @Override
+    public void init() {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("initialising " + this);
+        }
+
+        // default subcomponents
+        if (runtimeContext == null) {
+            runtimeContext = new RuntimeContextNoRuntime();
+        }
+        injectInto(runtimeContext);
+        injectInto(specificationTraverser);
+        injectInto(metaModelValidator);
+
+        // wire subcomponents into each other
+        runtimeContext.injectInto(facetProcessor);
+
+        // initialize subcomponents
+        facetDecoratorSet.init();
+        classSubstitutor.init();
+        collectionTypeRegistry.init();
+        specificationTraverser.init();
+        facetProcessor.init();
+        programmingModelFacets.init();
+        metaModelValidator.init();
+        
+        // prime cache and validate
+        primeCache();
+        metaModelValidator.validate();
+    }
+
+    /**
+     * load the service specifications and then, using the {@link #getSpecificationTraverser() traverser},
+     * keep loading all referenced specifications until we can find no more.
+     */
+    private void primeCache() {
+        for (Class<?> serviceClass : serviceClasses) {
+            internalLoadSpecification(serviceClass);
+        }
+        loadAllSpecifications();
+    }
+
+    private void loadAllSpecifications() {
+        List<Class<?>> newlyDiscoveredClasses = newlyDiscoveredClasses();
+        
+        while(newlyDiscoveredClasses.size() > 0) {
+            for(Class<?> newClass: newlyDiscoveredClasses) {
+                internalLoadSpecification(newClass);
+            }
+            newlyDiscoveredClasses = newlyDiscoveredClasses();
+        }
+    }
+
+    private List<Class<?>> newlyDiscoveredClasses() {
+        List<Class<?>> newlyDiscoveredClasses = new ArrayList<Class<?>>();
+        
+        ObjectSpecification[] noSpecs = allSpecifications();
+        try {
+            for(ObjectSpecification noSpec: noSpecs) {
+                getSpecificationTraverser().traverseReferencedClasses(noSpec, newlyDiscoveredClasses);
+            }
+        } catch (ClassNotFoundException ex) {
+            throw new IsisException(ex);
+        }
+        return newlyDiscoveredClasses;
+    }
+
+
+
+    @Override
+    public void shutdown() {
+        LOG.info("shutting down " + this);
+        getCache().clear();
+        facetDecoratorSet.shutdown();
+    }
+
+    // /////////////////////////////////////////////////////////////
+    // install, load, allSpecifications
+    // /////////////////////////////////////////////////////////////
+
+    /**
+     * API: Return the specification for the specified class of object.
+     */
+    @Override
+    public final ObjectSpecification loadSpecification(
+            final String className) {
+        ensureThatArg(className, is(notNullValue()),
+                "specification class name must be specified");
+
+        try {
+            final Class<?> cls = loadBuiltIn(className);
+            return internalLoadSpecification(cls);
+        } catch (final ClassNotFoundException e) {
+            final ObjectSpecification spec = getCache().get(className);
+            if (spec == null) {
+                throw new IsisException(
+                        "No such class available: " + className);
+            }
+            return spec;
+        }
+    }
+
+    /**
+     * API: Return specification.
+     */
+    @Override
+    public ObjectSpecification loadSpecification(final Class<?> type) {
+        return internalLoadSpecification(type);
+    }
+
+    private ObjectSpecification internalLoadSpecification(final Class<?> type) {
+        Class<?> substitutedType = getClassSubstitutor().getClass(type);
+        return substitutedType != null ? loadSpecificationForSubstitutedClass(substitutedType)
+                : null;
+    }
+
+    private ObjectSpecification loadSpecificationForSubstitutedClass(
+            final Class<?> type) {
+        Assert.assertNotNull(type);
+        String typeName = type.getName();
+        
+        SpecificationCache specificationCache = getCache();
+        synchronized (specificationCache) {
+            final ObjectSpecification spec = specificationCache.get(typeName);
+            if (spec != null) {
+                return spec;
+            }
+            ObjectSpecification specification = createSpecification(type);
+            if (specification == null) {
+                throw new IsisException(
+                        "Failed to create specification for class "
+                                + typeName);
+            }
+
+            // put into the cache prior to introspecting, to prevent
+            // infinite loops
+            specificationCache.cache(typeName, specification);
+            
+            introspectSpecificationIfRequired(specification);
+
+            return specification;
+        }
+    }
+
+
+    /**
+     * Loads the specifications of the specified types except the one specified
+     * (to prevent an infinite loop).
+     */
+    public boolean loadSpecifications(List<Class<?>> typesToLoad,
+            final Class<?> typeToIgnore) {
+        boolean anyLoadedAsNull = false;
+        for (Class<?> typeToLoad: typesToLoad) {
+            if (typeToLoad != typeToIgnore) {
+                ObjectSpecification noSpec = internalLoadSpecification(typeToLoad);
+                boolean loadedAsNull = (noSpec == null);
+                anyLoadedAsNull = loadedAsNull || anyLoadedAsNull;
+            }
+        }
+        return anyLoadedAsNull;
+    }
+    
+    public boolean loadSpecifications(List<Class<?>> typesToLoad) {
+        return loadSpecifications(typesToLoad, null);
+    }
+
+
+    /**
+     * Creates the appropriate type of {@link ObjectSpecification}.
+     */
+    private ObjectSpecification createSpecification(final Class<?> cls) {
+
+        if (ObjectList.class.isAssignableFrom(cls)) {
+            return new InstanceCollectionSpecification(this,
+                    getRuntimeContext().getAuthenticationSessionProvider(),
+                    getRuntimeContext().getServicesProvider(),
+                    getRuntimeContext().getObjectInstantiator());
+        } else {
+            return new JavaSpecification(cls, this, 
+                getRuntimeContext().getAuthenticationSessionProvider(), 
+                getRuntimeContext().getServicesProvider(),
+                getRuntimeContext().getAdapterMap(), 
+                getRuntimeContext().getObjectInstantiator(),
+                getRuntimeContext().getDependencyInjector(),
+                getRuntimeContext().getQuerySubmitter());
+        }
+    }
+
+
+
+
+    private Class<?> loadBuiltIn(final String className)
+            throws ClassNotFoundException {
+        Class<?> builtIn = JavaClassUtils.getBuiltIn(className);
+        if (builtIn != null) {
+            return builtIn;
+        }
+        return Class.forName(className);
+    }
+
+    /**
+     * Return all the loaded specifications.
+     */
+    @Override
+    public ObjectSpecification[] allSpecifications() {
+        return getCache().allSpecifications();
+    }
+
+    @Override
+    public boolean loaded(Class<?> cls) {
+        return loaded(cls.getName());
+    }
+
+    @Override
+    public boolean loaded(String fullyQualifiedClassName) {
+        return getCache().get(fullyQualifiedClassName) != null;
+    }
+
+    
+    // added to try to track down a race condition
+    // TODO: should probably remove 
+    private ObjectSpecification introspectSpecificationIfRequired(
+            ObjectSpecification spec) {
+        if (spec instanceof IntrospectableSpecificationAbstract) {
+            IntrospectableSpecificationAbstract introspectableSpec = (IntrospectableSpecificationAbstract) spec;
+            if(!introspectableSpec.isIntrospected()) {
+                introspectableSpec.introspectTypeHierarchyAndMembers();
+                facetDecoratorSet.decorate(introspectableSpec);
+                introspectableSpec.completeIntrospection();
+            }
+        }
+        return spec;        
+    }
+
+
+    // ////////////////////////////////////////////////////////////////////
+    // injectInto
+    // ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Injects self into candidate if required, and instructs its subcomponents
+     * to do so also.
+     */
+    @Override
+    public void injectInto(Object candidate) {
+        Class<?> candidateClass = candidate.getClass();
+        if (SpecificationLoaderAware.class.isAssignableFrom(candidateClass)) {
+            SpecificationLoaderAware cast = SpecificationLoaderAware.class
+                    .cast(candidate);
+            cast.setSpecificationLoader(this);
+        }
+        if (SpecificationLookupAware.class.isAssignableFrom(candidateClass)) {
+            SpecificationLookupAware cast = SpecificationLookupAware.class
+                    .cast(candidate);
+            cast.setSpecificationLookup(this);
+        }
+
+        getClassSubstitutor().injectInto(candidate);
+        getCollectionTypeRegistry().injectInto(candidate);
+        
+    }
+
+    // /////////////////////////////////////////////////////////////
+    // Debugging
+    // /////////////////////////////////////////////////////////////
+
+    @Override
+    public void debugData(final DebugString str) {
+        facetDecoratorSet.debugData(str);
+        str.appendln();
+
+        str.appendTitle("Specifications");
+        final ObjectSpecification[] specs = allSpecifications();
+        Arrays.sort(specs, new Comparator<ObjectSpecification>() {
+            @Override
+            public int compare(final ObjectSpecification s1,
+                    final ObjectSpecification s2) {
+                return s1.getShortName().compareToIgnoreCase(s2.getShortName());
+            }
+        });
+        for (int i = 0; i < specs.length; i++) {
+            final ObjectSpecification specification = specs[i];
+            str.append(specification.isAbstract() ? "A" : ".");
+            str.append(specification.isService() ? "S" : ".");
+            str.append(SpecificationFacets.isBoundedSet(specification) ? "B"
+                    : ".");
+            str.append(specification.isCollection() ? "C" : ".");
+            str.append(specification.isNotCollection() ? "O" : ".");
+            str.append("."); // placeholder for future support of maps
+            str.append(specification.isParseable() ? "P" : ".");
+            str.append(specification.isEncodeable() ? "E" : ".");
+            str.append(specification.isValueOrIsAggregated() ? "A" : ".");
+            str.append(!specification.isCollectionOrIsAggregated() ? "I" : ".");
+            str.append("  ");
+            str.append(specification.getShortName());
+            str.append("  [fqc=");
+            str.append(specification.getFullName());
+            str.append(",type=");
+            str.append(specification.getClass().getName());
+            str.appendln("]");
+        }
+    }
+
+    @Override
+    public String debugTitle() {
+        return "Reflector";
+    }
+
+    // /////////////////////////////////////////////////////////////
+    // Helpers (were previously injected, but no longer required)
+    // /////////////////////////////////////////////////////////////
+
+    /**
+     * Provides access to the registered {@link Facet}s.
+     */
+    public FacetProcessor getFacetProcessor() {
+        return facetProcessor;
+    }
+
+    private SpecificationCache getCache() {
+        return cache;
+    }
+
+
+    // ////////////////////////////////////////////////////////////////////
+    // Dependencies (injected by setter due to *Aware)
+    // ////////////////////////////////////////////////////////////////////
+
+    /**
+     * As per {@link #setRuntimeContext(RuntimeContext)}.
+     */
+    @Override
+    public RuntimeContext getRuntimeContext() {
+        return runtimeContext;
+    }
+
+    /**
+     * Due to {@link RuntimeContextAware}.
+     */
+    @Override
+    public void setRuntimeContext(RuntimeContext runtimeContext) {
+        this.runtimeContext = runtimeContext;
+    }
+
+    // ////////////////////////////////////////////////////////////////////
+    // Dependencies (setters, optional)
+    // ////////////////////////////////////////////////////////////////////
+
+    public List<Class<?>> getServiceClasses() {
+        return Collections.unmodifiableList(serviceClasses);
+    }
+    
+    @Override
+    public void setServiceClasses(List<Class<?>> serviceClasses) {
+        this.serviceClasses = serviceClasses;
+    }
+
+    
+
+    // ////////////////////////////////////////////////////////////////////
+    // Dependencies (injected from constructor)
+    // ////////////////////////////////////////////////////////////////////
+
+    public IsisConfiguration getIsisConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public ClassSubstitutor getClassSubstitutor() {
+        return classSubstitutor;
+    }
+
+    public CollectionTypeRegistry getCollectionTypeRegistry() {
+        return collectionTypeRegistry;
+    }
+
+    @Override
+    public SpecificationTraverser getSpecificationTraverser() {
+        return specificationTraverser;
+    }
+    
+    @Override
+    public ProgrammingModelFacets getProgrammingModelFacets() {
+        return programmingModelFacets;
+    }
+
+    public Set<FacetDecorator> getFacetDecoratorSet() {
+        return facetDecoratorSet.getFacetDecorators();
+    }
+
+    @Override
+    public MetaModelValidator getMetaModelValidator() {
+        return metaModelValidator;
+    }
 
 }

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.metamodel.specloader.classsubstitutor;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.isis.applib.DomainObjectContainer;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.isis.applib.DomainObjectContainer;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite.java Wed Dec 22 16:22:08 2010
@@ -23,9 +23,6 @@ package org.apache.isis.core.metamodel.s
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAware;
-
 import com.google.common.collect.Lists;
 
 public class ClassSubstitutorComposite implements ClassSubstitutor {

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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.specloader.collectiontyperegistry;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionImpl.java Wed Dec 22 16:22:08 2010
@@ -32,13 +32,18 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.Instance;
 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.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
 import org.apache.isis.core.metamodel.exceptions.ModelException;
+import org.apache.isis.core.metamodel.facets.TypedHolder;
 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;
@@ -46,6 +51,7 @@ import org.apache.isis.core.metamodel.fa
 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.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.ActionInvocationContext;
 import org.apache.isis.core.metamodel.interactions.ActionUsabilityContext;
 import org.apache.isis.core.metamodel.interactions.ActionVisibilityContext;
@@ -53,21 +59,16 @@ import org.apache.isis.core.metamodel.in
 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.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProvider;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
+import org.apache.isis.core.metamodel.peer.FacetedMethodParameter;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 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.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.metamodel.specloader.internal.peer.TypedHolder;
 
 
 public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectAction {
@@ -82,7 +83,7 @@ public class ObjectActionImpl extends Ob
     }
 
     private final ServicesProvider servicesProvider;
-    private final ObjectMemberPeer memberPeer;
+    private final FacetedMethod memberPeer;
     
     /**
      * Lazily initialized by {@link #getParameters()} (so don't use directly!)
@@ -105,14 +106,13 @@ public class ObjectActionImpl extends Ob
     // //////////////////////////////////////////////////////////////////
 
     public ObjectActionImpl(
-    		final String methodId, 
-    		final ObjectMemberPeer memberPeer, 
+    		final FacetedMethod memberPeer, 
             final AuthenticationSessionProvider authenticationSessionProvider,
             final SpecificationLookup specificationLookup, 
             final AdapterMap adapterManager,
             final ServicesProvider servicesProvider,
             final QuerySubmitter querySubmitter) {
-        super(methodId, memberPeer, FeatureType.ACTION, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
+        super(memberPeer.getIdentifier().getMemberName(), memberPeer, FeatureType.ACTION, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
         this.memberPeer = memberPeer;
         this.servicesProvider = servicesProvider;
     }
@@ -215,7 +215,7 @@ public class ObjectActionImpl extends Ob
 
     @Override
     public int getParameterCount() {
-        return memberPeer.getChildren().size();
+        return memberPeer.getParameters().size();
     }
 
     @Override
@@ -240,7 +240,7 @@ public class ObjectActionImpl extends Ob
         if (this.parameters == null) {
             final int parameterCount = getParameterCount();
             final List<ObjectActionParameter> parameters = Lists.newArrayList();
-            final List<TypedHolder> paramPeers = memberPeer.getChildren();
+            final List<FacetedMethodParameter> paramPeers = memberPeer.getParameters();
             for (int i = 0; i < parameterCount; i++) {
                 TypedHolder paramPeer = paramPeers.get(i);
                 final ObjectSpecification specification = ObjectMemberAbstract.getSpecification(getSpecificationLookup(), paramPeer.getType());

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterAbstract.java Wed Dec 22 16:22:08 2010
@@ -27,30 +27,30 @@ import org.apache.isis.applib.Identifier
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.applib.query.QueryFindAllInstances;
 import org.apache.isis.core.commons.filters.Filter;
+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.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Allow;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.exceptions.ModelException;
 import org.apache.isis.core.metamodel.facets.Facet;
 import org.apache.isis.core.metamodel.facets.MultiTypedFacet;
+import org.apache.isis.core.metamodel.facets.TypedHolder;
 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.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectMemberAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.specloader.internal.peer.TypedHolder;
 
 
 public abstract class ObjectActionParameterAbstract implements ObjectActionParameter {
@@ -111,7 +111,7 @@ public abstract class ObjectActionParame
     public String getName() {
         final NamedFacet facet = getFacet(NamedFacet.class);
         String name = facet == null ? null : facet.value();
-        name = name == null ? getSpecification().getSingularName() : name;
+        name = name == null ? getSpecification().getName() : name;
         return name;
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterParseable.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/ObjectActionParameterParseable.java Wed Dec 22 16:22:08 2010
@@ -25,18 +25,18 @@ import org.apache.isis.core.metamodel.ad
 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.TypedHolder;
 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.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.InteractionUtils;
 import org.apache.isis.core.metamodel.interactions.ValidityContext;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 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.core.metamodel.specloader.internal.peer.TypedHolder;
 
 
 public class ObjectActionParameterParseable extends ObjectActionParameterAbstract implements
@@ -171,9 +171,6 @@ public class ObjectActionParameterParsea
         return proposedHolder;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.isis.core.metamodel.spec.feature.ObjectFeature#getFeatureType()
-     */
     @Override
     public FeatureType getFeatureType() {
         return FeatureType.ACTION_PARAMETER;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToManyAssociationImpl.java Wed Dec 22 16:22:08 2010
@@ -23,17 +23,22 @@ package org.apache.isis.core.metamodel.s
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 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.CollectionFacetUtils;
 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.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.CollectionAddToContext;
 import org.apache.isis.core.metamodel.interactions.CollectionRemoveFromContext;
 import org.apache.isis.core.metamodel.interactions.CollectionUsabilityContext;
@@ -42,34 +47,29 @@ import org.apache.isis.core.metamodel.in
 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.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 
 
 public class OneToManyAssociationImpl extends ObjectAssociationAbstract implements OneToManyAssociation {
 
-    private final ObjectMemberPeer reflectiveAdapter;
+    private final FacetedMethod facetedMethod;
     
     public OneToManyAssociationImpl(
-    		final ObjectMemberPeer association,
+    		final FacetedMethod facetedMethod,
             final AuthenticationSessionProvider authenticationSessionProvider,
     		final SpecificationLookup specificationLookup,
     		final AdapterMap adapterManager,
             final QuerySubmitter querySubmitter) {
-        super(association.getIdentifier().getMemberName(), getSpecification(specificationLookup, association.getType()), FeatureType.COLLECTION, association, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
-        this.reflectiveAdapter = association;
+        super(facetedMethod.getIdentifier().getMemberName(), getSpecification(specificationLookup, facetedMethod.getType()), FeatureType.COLLECTION, facetedMethod, authenticationSessionProvider, specificationLookup, adapterManager, querySubmitter);
+        this.facetedMethod = facetedMethod;
     }
 
 
-    public ObjectMemberPeer getAssociationPeer(){
-    	return reflectiveAdapter;
+    public FacetedMethod getFacetedMethod(){
+    	return facetedMethod;
     }
 
     // /////////////////////////////////////////////////////////////
@@ -277,7 +277,7 @@ public class OneToManyAssociationImpl ex
         final DebugString debugString = new DebugString();
         debugString.indent();
         debugString.indent();
-        reflectiveAdapter.debugData(debugString);
+        facetedMethod.debugData(debugString);
         return debugString.toString();
     }
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneActionParameterImpl.java Wed Dec 22 16:22:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.core.metamodel.s
 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.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.facets.TypedHolder;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
-import org.apache.isis.core.metamodel.specloader.internal.peer.TypedHolder;
 
 
 public class OneToOneActionParameterImpl extends ObjectActionParameterAbstract implements OneToOneActionParameter {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/OneToOneAssociationImpl.java Wed Dec 22 16:22:08 2010
@@ -26,9 +26,12 @@ import org.apache.isis.applib.query.Quer
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.Instance;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -39,6 +42,7 @@ import org.apache.isis.core.metamodel.fa
 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.feature.FeatureType;
 import org.apache.isis.core.metamodel.interactions.InteractionUtils;
 import org.apache.isis.core.metamodel.interactions.PropertyAccessContext;
 import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
@@ -47,23 +51,19 @@ import org.apache.isis.core.metamodel.in
 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.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.runtimecontext.spec.feature.ObjectAssociationAbstract;
 import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 
 
 public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {
 
-    private final ObjectMemberPeer associationPeer;
+    private final FacetedMethod associationPeer;
 
     public OneToOneAssociationImpl(
-    		final ObjectMemberPeer association, 
+    		final FacetedMethod association, 
             final AuthenticationSessionProvider authenticationSessionProvider,
             final SpecificationLookup specificationLookup,
             final AdapterMap adapterManager,

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorAbstract.java Wed Dec 22 16:22:08 2010
@@ -20,13 +20,13 @@
 
 package org.apache.isis.core.metamodel.specloader.internal;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Abstract base class factoring out common functionality for

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodParameters.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.specloader.internal;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 
 /**
  * Helper that finds all parameter types (including generic types) for the

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/internal/TypeExtractorMethodReturn.java Wed Dec 22 16:22:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.metamodel.specloader.internal;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Method;
 
 /**
  * Helper that finds all return types (including generic types) for the

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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 Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.specloader.internal.cache;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
-
+import java.util.Enumeration;
+import java.util.Hashtable;
+
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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 Wed Dec 22 16:22:08 2010
@@ -23,7 +23,6 @@ package org.apache.isis.core.metamodel.s
 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.core.metamodel.specloader.ObjectReflectorAbstract;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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 Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.specloader.internal.cache;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
-
+import java.util.Enumeration;
+import java.util.Hashtable;
+
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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 Wed Dec 22 16:22:08 2010
@@ -37,14 +37,14 @@ import org.apache.isis.core.metamodel.co
 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.MethodPrefixBasedFacetFactory;
 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.feature.FeatureType;
 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.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
 import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
 
@@ -111,7 +111,7 @@ public class FacetProcessor implements R
      * Lazily initialized, then cached. The lists remain in the same order that the factories were
      * {@link #registerFactory(FacetFactory) registered}.
      */
-    private Map<ObjectFeatureType, List<FacetFactory>> factoryListByFeatureType = null;
+    private Map<FeatureType, List<FacetFactory>> factoryListByFeatureType = null;
 
     
     public FacetProcessor(
@@ -264,7 +264,7 @@ public class FacetProcessor implements R
     }
 
     /**
-     * Attaches all facets applicable to the provided {@link ObjectFeatureType#OBJECT object}) to the
+     * Attaches all facets applicable to the provided {@link FeatureType#OBJECT object}) to the
      * supplied {@link FacetHolder}.
      * 
      * <p>
@@ -281,7 +281,7 @@ public class FacetProcessor implements R
      */
     public boolean process(final Class<?> cls, final MethodRemover methodRemover, final FacetHolder facetHolder) {
         boolean facetsAdded = false;
-        final List<FacetFactory> factoryList = getFactoryListByFeatureType(ObjectFeatureType.OBJECT);
+        final List<FacetFactory> factoryList = getFactoryListByFeatureType(FeatureType.OBJECT);
         for (final FacetFactory facetFactory : factoryList) {
             facetsAdded = facetFactory.process(cls, removerElseNullRemover(methodRemover), facetHolder) | facetsAdded;
         }
@@ -289,7 +289,7 @@ public class FacetProcessor implements R
     }
 
     /**
-     * Attaches all facets applicable to the provided {@link ObjectFeatureType type of feature} to the
+     * Attaches all facets applicable to the provided {@link FeatureType type of feature} to the
      * supplied {@link FacetHolder}.
      * 
      * <p>
@@ -313,7 +313,7 @@ public class FacetProcessor implements R
             final Method method,
             final MethodRemover methodRemover,
             final FacetHolder facetHolder,
-            final ObjectFeatureType featureType) {
+            final FeatureType featureType) {
         boolean facetsAdded = false;
         final List<FacetFactory> factoryList = getFactoryListByFeatureType(featureType);
         for (final FacetFactory facetFactory : factoryList) {
@@ -323,7 +323,7 @@ public class FacetProcessor implements R
     }
 
     /**
-     * Attaches all facets applicable to the provided {@link ObjectFeatureType#ACTION_PARAMETER
+     * Attaches all facets applicable to the provided {@link FeatureType#ACTION_PARAMETER
      * parameter}), to the supplied {@link FacetHolder}.
      * 
      * <p>
@@ -342,14 +342,14 @@ public class FacetProcessor implements R
      */
     public boolean processParams(final Method method, final int paramNum, final FacetHolder facetHolder) {
         boolean facetsAdded = false;
-        final List<FacetFactory> factoryList = getFactoryListByFeatureType(ObjectFeatureType.ACTION_PARAMETER);
+        final List<FacetFactory> factoryList = getFactoryListByFeatureType(FeatureType.ACTION_PARAMETER);
         for (final FacetFactory facetFactory : factoryList) {
             facetsAdded = facetFactory.processParams(method, paramNum, facetHolder) | facetsAdded;
         }
         return facetsAdded;
     }
 
-    private List<FacetFactory> getFactoryListByFeatureType(final ObjectFeatureType featureType) {
+    private List<FacetFactory> getFactoryListByFeatureType(final FeatureType featureType) {
         cacheByFeatureTypeIfRequired();
         return factoryListByFeatureType.get(featureType);
     }
@@ -365,10 +365,10 @@ public class FacetProcessor implements R
         if (factoryListByFeatureType != null) {
             return;
         }
-        factoryListByFeatureType = new HashMap<ObjectFeatureType, List<FacetFactory>>();
+        factoryListByFeatureType = new HashMap<FeatureType, List<FacetFactory>>();
         for (final FacetFactory factory : factories) {
-            final List<ObjectFeatureType> featureTypes = factory.getFeatureTypes();
-            for (ObjectFeatureType featureType: featureTypes) {
+            final List<FeatureType> featureTypes = factory.getFeatureTypes();
+            for (FeatureType featureType: featureTypes) {
                 final List<FacetFactory> factoryList = getList(factoryListByFeatureType, featureType);
                 factoryList.add(factory);
             }
@@ -383,7 +383,7 @@ public class FacetProcessor implements R
         for (final FacetFactory facetFactory : factories) {
             if (facetFactory instanceof MethodPrefixBasedFacetFactory) {
                 final MethodPrefixBasedFacetFactory methodPrefixBasedFacetFactory = (MethodPrefixBasedFacetFactory) facetFactory;
-                ListUtils.combine(cachedMethodPrefixes, methodPrefixBasedFacetFactory.getPrefixes());
+                ListUtils.merge(cachedMethodPrefixes, methodPrefixBasedFacetFactory.getPrefixes());
             }
         }
     }

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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.specloader.progmodelfacets;
 
-import java.util.List;
-
+import java.util.List;
+
 import org.apache.isis.core.metamodel.facets.FacetFactory;
 
 

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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.specloader.progmodelfacets;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.isis.core.commons.factory.InstanceFactory;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverser.java Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.specloader.traverser;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
+import java.lang.reflect.Method;
+import java.util.List;
+
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/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?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/traverser/SpecificationTraverserDefault.java Wed Dec 22 16:22:08 2010
@@ -20,16 +20,16 @@
 
 package org.apache.isis.core.metamodel.specloader.traverser;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.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/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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.core.metamodel.specloader.validator;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.spec.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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,11 +20,11 @@
 
 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.core.metamodel.specloader.SpecificationLoader;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import org.apache.isis.core.metamodel.spec.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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.core.metamodel.specloader.validator;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 
 public class MetaModelValidatorComposite extends MetaModelValidatorAbstract {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.util;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+
 import org.apache.isis.core.commons.exceptions.IsisException;
 
 

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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import junit.framework.TestCase;
-
-import org.apache.isis.core.metamodel.adapter.LifeCycleEvent;
+import junit.framework.TestCase;
+
 import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.LifeCycleEvent;
 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;

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=1051971&r1=1051970&r2=1051971&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 Wed Dec 22 16:22:08 2010
@@ -30,11 +30,11 @@ import org.apache.isis.core.metamodel.co
 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.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.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.spec.feature.FeatureType;
 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;

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateCouldResolveTest.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,6 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -36,15 +34,16 @@ import static org.apache.isis.core.metam
 import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
 public class ResolveStateCouldResolveTest  {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateGetEndStateTest.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,6 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -36,15 +34,16 @@ import static org.apache.isis.core.metam
 import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
 public class ResolveStateGetEndStateTest  {

Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveStateIsDestroyedTest.java Wed Dec 22 16:22:08 2010
@@ -20,8 +20,6 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -36,15 +34,16 @@ import static org.apache.isis.core.metam
 import static org.apache.isis.core.metamodel.adapter.ResolveState.TRANSIENT;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.UPDATING;
 import static org.apache.isis.core.metamodel.adapter.ResolveState.VALUE;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
 public class ResolveStateIsDestroyedTest  {