incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1051971 [2/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...
Date Wed, 22 Dec 2010 16:22:32 GMT

Modified: incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ObjectFactoryBasic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ObjectFactoryBasic.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ObjectFactoryBasic.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/identity/src/main/java/org/apache/isis/alternatives/bytecode/identity/objectfactory/ObjectFactoryBasic.java Wed Dec 22 16:22:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.alternatives.byt
 
 import java.lang.reflect.Modifier;
 
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
 import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract;
 
 public class ObjectFactoryBasic extends ObjectFactoryAbstract {

Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/JavassistObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/JavassistObjectFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/JavassistObjectFactory.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/JavassistObjectFactory.java Wed Dec 22 16:22:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.alternatives.bytecode.javassist.objectfactory;
 
 import org.apache.isis.alternatives.bytecode.javassist.objectfactory.internal.ObjectResolveAndObjectChangedEnhancer;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.PersistenceSessionAware;
 import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerObjectChanged;

Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Wed Dec 22 16:22:08 2010
@@ -29,12 +29,12 @@ import javassist.util.proxy.ProxyObject;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.metamodel.java5.ImperativeFacet;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils;
-import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
+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.SpecificationLoader;
-import org.apache.isis.core.progmodel.spec.JavaSpecification;
 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;

Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java Wed Dec 22 16:22:08 2010
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.se
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 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;
@@ -53,7 +53,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
-import org.apache.isis.defaults.progmodel.JavaReflector;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory;
@@ -75,7 +74,7 @@ public class IsisMetaModel implements Ap
 	private final List<Class<?>> serviceTypes = new ArrayList<Class<?>>();
 	private State state = State.NOT_INITIALIZED;
 
-	private ObjectReflectorAbstract reflector;
+	private ObjectReflectorDefault reflector;
 	private RuntimeContextForEmbeddedMetaModel runtimeContext;
 
 	private IsisConfiguration configuration;
@@ -125,7 +124,7 @@ public class IsisMetaModel implements Ap
 	@Override
     public void init() {
 		ensureNotInitialized();
-		reflector = new JavaReflector(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
+		reflector = new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, programmingModelFacets, facetDecorators, metaModelValidator);
 
 		services = createServices(serviceTypes);
 		runtimeContext = new RuntimeContextForEmbeddedMetaModel(context, services);

Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java Wed Dec 22 16:22:08 2010
@@ -27,34 +27,34 @@ import java.util.List;
 import org.apache.isis.alternatives.embedded.EmbeddedContext;
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.AdapterMapAbstract;
+import org.apache.isis.core.metamodel.adapter.DomainObjectServices;
+import org.apache.isis.core.metamodel.adapter.DomainObjectServicesAbstract;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectDirtier;
+import org.apache.isis.core.metamodel.adapter.ObjectDirtierAbstract;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistorAbstract;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.QuerySubmitterAbstract;
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.adapter.ServicesProviderAbstract;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProviderAbstract;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAbstract;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServices;
-import org.apache.isis.core.metamodel.runtimecontext.DomainObjectServicesAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMapAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectDirtier;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectDirtierAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiationException;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiator;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectInstantiatorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitter;
-import org.apache.isis.core.metamodel.runtimecontext.QuerySubmitterAbstract;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProvider;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesProviderAbstract;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiatorAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 /**
  * Acts as a bridge between the {@link RuntimeContext} (as used internally
@@ -108,7 +108,7 @@ public class RuntimeContextForEmbeddedMe
 	        }
 
 	        @Override
-	        public ObjectAdapter adapterFor(Object domainObject, ObjectAdapter ownerAdapter, Identified identified) {
+	        public ObjectAdapter adapterFor(Object domainObject, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
 	            return adapterFor(domainObject);
 	        }
 

Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java Wed Dec 22 16:22:08 2010
@@ -117,7 +117,7 @@ public class StandaloneAdapter implement
         if (title != null) {
         	return title;
         }
-        return "A " + specification.getSingularName().toLowerCase();
+        return "A " + specification.getName().toLowerCase();
 	}
 
 

Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/TrialObjects.java Wed Dec 22 16:22:08 2010
@@ -24,16 +24,17 @@ import java.util.Map;
 
 import com.google.common.collect.Maps;
 
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.AdapterMapDelegator;
 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.config.internal.PropertiesConfiguration;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMapDelegator;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
 import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
@@ -42,13 +43,12 @@ import org.apache.isis.core.runtime.pers
 import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
 import org.apache.isis.core.runtime.testsystem.TestClassSubstitutor;
 import org.apache.isis.core.runtime.testsystem.TestProxyAdapter;
-import org.apache.isis.defaults.progmodel.JavaReflector;
 import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
 
 public class TrialObjects {
 
     private AdapterFactory factory;
-    private JavaReflector reflector;
+    private ObjectReflectorDefault reflector;
 
     private final Map<Object, ObjectAdapter> adapters = Maps.newHashMap();
 
@@ -57,7 +57,7 @@ public class TrialObjects {
         PropertiesConfiguration configuration = new PropertiesConfiguration();
 
         reflector =
-            new JavaReflector(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
+            new ObjectReflectorDefault(configuration, new TestClassSubstitutor(), new CollectionTypeRegistryDefault(),
                 new SpecificationTraverserDefault(), new ProgrammingModelFacetsJava5(), new HashSet<FacetDecorator>(),
                 new MetaModelValidatorNoop());
         reflector.setRuntimeContext(new RuntimeContextNoRuntime() {
@@ -71,7 +71,7 @@ public class TrialObjects {
                     }
 
                     @Override
-                    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, Identified identified) {
+                    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
                         if (adapters.get(pojo) != null) {
                             return adapters.get(pojo);
                         } else {

Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/ObjectMappingLookup.java Wed Dec 22 16:22:08 2010
@@ -51,7 +51,7 @@ public class ObjectMappingLookup impleme
             mapping = (ObjectMapping) objectMappingFactory.createMapper(spec.getFullName(), propertiesBase, fieldMappingLookup, this);
             add(spec, mapping, connection); 
         }
-        LOG.debug("  mapper for " + spec.getSingularName() + " -> " + mapping);
+        LOG.debug("  mapper for " + spec.getName() + " -> " + mapping);
         if (mapping == null) {
             throw new IsisException("No mapper for " + spec + " (no default mapper)");
         }

Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/alternatives/objectstore/sql/auto/MultiColumnCombinedCollectionMapper.java Wed Dec 22 16:22:08 2010
@@ -25,9 +25,9 @@ package org.apache.isis.alternatives.obj
 
 import org.apache.isis.alternatives.objectstore.sql.FieldMappingLookup;
 import org.apache.isis.alternatives.objectstore.sql.ObjectMappingLookup;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.specloader.internal.OneToManyAssociationImpl;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 
 /**
  * @author Kevin
@@ -49,7 +49,7 @@ public class MultiColumnCombinedCollecti
     protected String determineColumnName(ObjectAssociation objectAssociation){
 	    if (objectAssociation instanceof OneToManyAssociationImpl){
 	    	OneToManyAssociationImpl fkAssoc = (OneToManyAssociationImpl) objectAssociation;
-	    	ObjectMemberPeer peer = fkAssoc.getAssociationPeer();
+	    	FacetedMethod peer = fkAssoc.getFacetedMethod();
 	    	String fullClassName = peer.getIdentifier().getClassName();
 	    	int lastPos = fullClassName.lastIndexOf('.');
 	    	return fullClassName.substring(lastPos+1)+"_"+fkAssoc.getId();

Modified: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/tests-common/src/main/java/org/apache/isis/alternatives/objectstore/sql/testsystem/TestProxySystemIII.java Wed Dec 22 16:22:08 2010
@@ -27,12 +27,13 @@ import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jmock.lib.legacy.ClassImposteriser;
+
 import org.apache.isis.alternatives.objectstore.sql.SqlPersistorInstaller;
 import org.apache.isis.alternatives.objectstore.xml.XmlPersistenceMechanismInstaller;
 import org.apache.isis.applib.AbstractFactoryAndRepository;
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.ObjectReflectorAbstract;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -97,7 +98,7 @@ public class TestProxySystemIII {
         javaReflectorInstaller.setConfiguration(configuration);
         mockSpecificationLoader = javaReflectorInstaller.createReflector();
 
-        ((ObjectReflectorAbstract) mockSpecificationLoader).setRuntimeContext(new RuntimeContextFromSession());
+        ((ObjectReflectorDefault) mockSpecificationLoader).setRuntimeContext(new RuntimeContextFromSession());
 
         if (configuration.getString("isis.persistence.sql.jdbc.driver") == null){
         	if (configuration.getString("isis.persistence") == "in-memory"){

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/XmlObjectStore.java Wed Dec 22 16:22:08 2010
@@ -49,12 +49,12 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 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.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/adapter/XmlAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/adapter/XmlAdapterManager.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/adapter/XmlAdapterManager.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/adapter/XmlAdapterManager.java Wed Dec 22 16:22:08 2010
@@ -21,20 +21,20 @@
 package org.apache.isis.alternatives.objectstore.xml.internal.adapter;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManagerDefault;
 
 public class XmlAdapterManager extends AdapterManagerDefault {
 
 	@Override
 	protected ObjectAdapter createAggregatedAdapter(
-			Object pojo, ObjectAdapter ownerAdapter, Identified identified) {
-		if (identified instanceof OneToOneAssociation) {
+			Object pojo, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
+		if (identifiedHolder instanceof OneToOneAssociation) {
 			// do not yet support AggregatedOids for aggregated associations 
 			return adapterFor(pojo);
 		} else {
-			return super.createAggregatedAdapter(pojo, ownerAdapter, identified);
+			return super.createAggregatedAdapter(pojo, ownerAdapter, identifiedHolder);
 		}
 	}
 }

Modified: incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectData.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectData.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/xml/src/main/java/org/apache/isis/alternatives/objectstore/xml/internal/data/ObjectData.java Wed Dec 22 16:22:08 2010
@@ -27,8 +27,8 @@ import org.apache.isis.alternatives.obje
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 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.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
 
 /**

Modified: incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java (original)
+++ incubator/isis/trunk/alternatives/profilestore/xml/src/test/java/org/apache/isis/alternatives/profilestore/xml/internal/UserProfileDataHandlerTest.java Wed Dec 22 16:22:08 2010
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.context.IsisContextStatic;

Modified: incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/groovy/metamodel/src/main/java/org/apache/isis/progmodel/groovy/metamodel/RemoveGroovyMethodsFacetFactory.java Wed Dec 22 16:22:08 2010
@@ -8,7 +8,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.FacetHolder;
 import org.apache.isis.core.metamodel.facets.MethodRemover;
 import org.apache.isis.core.metamodel.facets.MethodScope;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.feature.FeatureType;
 
 public class RemoveGroovyMethodsFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware {
 	
@@ -18,7 +18,7 @@ public class RemoveGroovyMethodsFacetFac
 	private IsisConfiguration configuration;
 
 	public RemoveGroovyMethodsFacetFactory() {
-        super(ObjectFeatureType.OBJECTS_ONLY);
+        super(FeatureType.OBJECTS_ONLY);
     }
 	
 	static class MethodSpec {

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java Wed Dec 22 16:22:08 2010
@@ -23,11 +23,11 @@ import java.util.List;
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
 import org.apache.isis.progmodel.wrapper.metamodel.internal.WrapperFactoryDefault;

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Wed Dec 22 16:22:08 2010
@@ -33,22 +33,22 @@ import org.apache.isis.applib.events.Usa
 import org.apache.isis.applib.events.ValidityEvent;
 import org.apache.isis.applib.events.VisibilityEvent;
 import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
 import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
 import org.apache.isis.core.metamodel.consent.InteractionResult;
 import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.java5.JavaSpecification;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+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.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.util.IsisUtils;
-import org.apache.isis.core.progmodel.spec.JavaSpecification;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.progmodel.wrapper.applib.HiddenException;
 import org.apache.isis.progmodel.wrapper.applib.InteractionException;
@@ -251,7 +251,7 @@ public class DomainObjectInvocationHandl
         resolveIfRequired(targetAdapter);
 
         final ObjectAdapter currentReferencedAdapter = otoa.get(targetAdapter);
-        final Object currentReferencedObj = IsisUtils.unwrap(currentReferencedAdapter);
+        final Object currentReferencedObj = AdapterUtils.unwrap(currentReferencedAdapter);
 
         final PropertyAccessEvent ev =
             new PropertyAccessEvent(getDelegate(), otoa.getIdentifier(), currentReferencedObj);
@@ -304,7 +304,7 @@ public class DomainObjectInvocationHandl
         resolveIfRequired(targetAdapter);
 
         final ObjectAdapter currentReferencedAdapter = otma.get(targetAdapter);
-        final Object currentReferencedObj = IsisUtils.unwrap(currentReferencedAdapter);
+        final Object currentReferencedObj = AdapterUtils.unwrap(currentReferencedAdapter);
 
         final CollectionAccessEvent ev = new CollectionAccessEvent(getDelegate(), otma.getIdentifier());
 
@@ -441,7 +441,7 @@ public class DomainObjectInvocationHandl
 
         if (getExecutionMode() == ExecutionMode.EXECUTE) {
             final ObjectAdapter actionReturnNO = noa.execute(targetAdapter, argAdapters);
-            return IsisUtils.unwrap(actionReturnNO);
+            return AdapterUtils.unwrap(actionReturnNO);
         }
 
         objectChangedIfRequired(targetAdapter);

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/Proxy.java Wed Dec 22 16:22:08 2010
@@ -23,10 +23,10 @@ package org.apache.isis.progmodel.wrappe
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory.ExecutionMode;

Modified: incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java (original)
+++ incubator/isis/trunk/alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/WrapperFactoryDefault.java Wed Dec 22 16:22:08 2010
@@ -42,14 +42,14 @@ import org.apache.isis.applib.events.Pro
 import org.apache.isis.applib.events.PropertyModifyEvent;
 import org.apache.isis.applib.events.PropertyUsabilityEvent;
 import org.apache.isis.applib.events.PropertyVisibilityEvent;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.runtimecontext.AuthenticationSessionProviderAware;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMap;
-import org.apache.isis.core.metamodel.runtimecontext.AdapterMapAware;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistor;
-import org.apache.isis.core.metamodel.runtimecontext.ObjectPersistorAware;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookup;
-import org.apache.isis.core.metamodel.runtimecontext.SpecificationLookupAware;
+import org.apache.isis.core.metamodel.adapter.AdapterMap;
+import org.apache.isis.core.metamodel.adapter.AdapterMapAware;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
+import org.apache.isis.core.metamodel.adapter.ObjectPersistorAware;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAware;
+import org.apache.isis.core.metamodel.spec.SpecificationLookup;
+import org.apache.isis.core.metamodel.spec.SpecificationLookupAware;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
 import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/facetdecorator/ProxyFacetDecorator.java Wed Dec 22 16:22:08 2010
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
 import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 public class ProxyFacetDecorator  extends FacetDecoratorAbstract {
 
@@ -56,10 +56,10 @@ public class ProxyFacetDecorator  extend
     }
 
     public Facet decorate(final Facet facet, FacetHolder requiredHolder) {
-    	if (!(requiredHolder instanceof Identified)) {
+    	if (!(requiredHolder instanceof IdentifiedHolder)) {
             return null;
         }
-        Identified identified = (Identified) requiredHolder;
+        IdentifiedHolder identifiedHolder = (IdentifiedHolder) requiredHolder;
 
         final Class<? extends Facet> facetType = facet.facetType();
 
@@ -67,7 +67,7 @@ public class ProxyFacetDecorator  extend
             final PropertySetterFacet propertySetterFacet = (PropertySetterFacet) facet;
             PropertySetterFacetWrapProxy decoratingFacet = new PropertySetterFacetWrapProxy(
             		propertySetterFacet, serverFacade, encoderDecoder,
-            		identified.getIdentifier().getMemberName());
+            		identifiedHolder.getIdentifier().getMemberName());
             return replaceFacetWithDecoratingFacet(facet, decoratingFacet, requiredHolder);
         }
 
@@ -75,7 +75,7 @@ public class ProxyFacetDecorator  extend
             final PropertyClearFacet propertyClearFacet = (PropertyClearFacet) facet;
             PropertyClearFacetWrapProxy decoratingFacet = new PropertyClearFacetWrapProxy(
             		propertyClearFacet, serverFacade, encoderDecoder,
-            		identified.getIdentifier().getMemberName());
+            		identifiedHolder.getIdentifier().getMemberName());
             return replaceFacetWithDecoratingFacet(facet, decoratingFacet, requiredHolder);
         }
 
@@ -83,7 +83,7 @@ public class ProxyFacetDecorator  extend
             final CollectionAddToFacet collectionAddToFacet = (CollectionAddToFacet) facet;
             CollectionAddToFacetWrapProxy decoratingFacet = new CollectionAddToFacetWrapProxy(
             		collectionAddToFacet, serverFacade, encoderDecoder,
-            		identified.getIdentifier().getMemberName());
+            		identifiedHolder.getIdentifier().getMemberName());
             return replaceFacetWithDecoratingFacet(facet, decoratingFacet, requiredHolder);
         }
 
@@ -91,7 +91,7 @@ public class ProxyFacetDecorator  extend
             final CollectionRemoveFromFacet collectionRemoveFromFacet = (CollectionRemoveFromFacet) facet;
             CollectionRemoveFromFacetWrapProxy decoratingFacet = new CollectionRemoveFromFacetWrapProxy(
             		collectionRemoveFromFacet, serverFacade, encoderDecoder,
-            		identified.getIdentifier().getMemberName());
+            		identifiedHolder.getIdentifier().getMemberName());
             return replaceFacetWithDecoratingFacet(facet, decoratingFacet, requiredHolder);
         }
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/client/persistence/PersistenceSessionProxy.java Wed Dec 22 16:22:08 2010
@@ -51,10 +51,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 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.services.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.PersistenceSessionAbstract;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/common/facade/impl/ServerFacadeImpl.java Wed Dec 22 16:22:08 2010
@@ -86,18 +86,18 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 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.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.peer.IdentifierUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 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.ObjectMember;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.spec.identifier.IdentifierFactory;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.core.metamodel.specloader.internal.ObjectActionImpl;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -171,7 +171,7 @@ public class ServerFacadeImpl implements
     }
 
     private ObjectMember getMember(final String memberName) {
-        final Identifier id = IdentifierFactory.fromIdentityString(memberName);
+        final Identifier id = IdentifierUtils.fromIdentityString(memberName);
         final ObjectSpecification specification = getSpecificationLoader().loadSpecification(id.getClassName());
         if (id.isPropertyOrCollection()) {
             return getAssociationElseThrowException(id, specification);

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectDeserializer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectDeserializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectDeserializer.java Wed Dec 22 16:22:08 2010
@@ -37,14 +37,14 @@ import org.apache.isis.core.metamodel.ad
 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.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.PersistenceSessionHydrator;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectEncoderDecoderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectEncoderDecoderDefault.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectEncoderDecoderDefault.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectEncoderDecoderDefault.java Wed Dec 22 16:22:08 2010
@@ -65,9 +65,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 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.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistorUtil;
 import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/ObjectSerializer.java Wed Dec 22 16:22:08 2010
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 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.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.core.runtime.persistence.PersistorUtil;
 
 /**

Modified: incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/main/java/org/apache/isis/alternatives/remoting/protocol/internal/PersistenceQueryEncoderAbstract.java Wed Dec 22 16:22:08 2010
@@ -28,7 +28,7 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.protocol.PersistenceQueryEncoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/ProxyPersistorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/ProxyPersistorTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/ProxyPersistorTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/ProxyPersistorTest.java Wed Dec 22 16:22:08 2010
@@ -56,7 +56,7 @@ import org.apache.isis.core.metamodel.au
 import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSessionFactory;
 import org.apache.isis.core.runtime.persistence.adapterfactory.AdapterFactory;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteRemotelyTest.java Wed Dec 22 16:22:08 2010
@@ -44,8 +44,8 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.facade.ServerFacade;
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.peer.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.core.metamodel.specloader.internal.peer.ObjectMemberPeer;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 
@@ -54,7 +54,7 @@ public class ProxyAction_ExecuteRemotely
     //private Mockery mockery = new JUnit4Mockery();
 
     private ActionInvocationFacetWrapProxy proxy;
-    private ObjectMemberPeer mockObjectActionPeer;
+    private FacetedMethod mockObjectActionPeer;
     private ObjectEncoderDecoder mockEncoder;
     private ServerFacade mockDistribution;
     private ObjectAdapter target;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectDecoderCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectDecoderCollectionTest.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectDecoderCollectionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectDecoderCollectionTest.java Wed Dec 22 16:22:08 2010
@@ -34,9 +34,9 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.protocol.internal.ObjectDeserializer;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.collections.CollectionFacetAbstract;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
-import org.apache.isis.core.progmodel.facets.collections.modify.CollectionFacetAbstract;
 import org.apache.isis.core.runtime.persistence.adaptermanager.ObjectToAdapterTransformer;
 import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase;
 import org.apache.isis.core.runtime.testsystem.TestPojo;

Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java Wed Dec 22 16:22:08 2010
@@ -20,29 +20,30 @@
 
 package org.apache.isis.alternatives.security.file.authorization;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Map.Entry;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.applib.Identifier;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.resource.ResourceStreamSource;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.spec.identifier.IdentifierFactory;
+import org.apache.isis.core.metamodel.peer.IdentifierUtils;
 import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
 
 
@@ -102,6 +103,7 @@ public class FileAuthorizor extends Auth
     // init, shutdown
     ////////////////////////////////////////////////////////////////
     
+    @Override
     public void init() {
         
         // initialize
@@ -146,7 +148,7 @@ public class FileAuthorizor extends Auth
     }
 
     private Identifier memberFromString(final String identifier) {
-    	return IdentifierFactory.fromIdentityString(identifier);
+    	return IdentifierUtils.fromIdentityString(identifier);
     }
 
     private List<String> tokenizeRoles(final String allRoles) {
@@ -160,6 +162,7 @@ public class FileAuthorizor extends Auth
         return roles;
     }
 
+    @Override
     public void shutdown() {
         if (learn) {
             writeMap();
@@ -171,10 +174,12 @@ public class FileAuthorizor extends Auth
     // API
     ////////////////////////////////////////////////////////////////
 
+    @Override
     public boolean isUsableInRole(final String role, final Identifier member) {
         return isAuthorized(role, member, new String[] { NONE, RW });
     }
 
+    @Override
     public boolean isVisibleInRole(final String role, final Identifier member) {
         return isAuthorized(role, member, new String[] { NONE, RO, RW });
     }
@@ -227,7 +232,7 @@ public class FileAuthorizor extends Auth
     private boolean learn(final String role, final Identifier member) {
         String identityString = member.toIdentityString(Identifier.CLASS_MEMBERNAME_PARMS);
         if (whiteListMap.containsKey(identityString)) {
-            final List<String> roles = (List<String>) whiteListMap.get(identityString);
+            final List<String> roles = whiteListMap.get(identityString);
             if (!roles.contains(role)) {
                 roles.add(role);
             }

Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/Identifier.java Wed Dec 22 16:22:08 2010
@@ -94,12 +94,12 @@ public class Identifier implements Compa
     }
 
     public static Identifier actionIdentifier(final Class<?> declaringClass, final String actionName,
-        final Class<?>[] parameterClasses) {
+        final Class<?>... parameterClasses) {
         return actionIdentifier(declaringClass.getCanonicalName(), actionName, toParameterStringArray(parameterClasses));
     }
 
     public static Identifier actionIdentifier(final String declaringClassName, final String actionName,
-        final Class<?>[] parameterClasses) {
+        final Class<?>... parameterClasses) {
         return actionIdentifier(declaringClassName, actionName, toParameterStringArray(parameterClasses));
     }
 

Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ArrayUtils.java Wed Dec 22 16:22:08 2010
@@ -96,16 +96,7 @@ public final class ArrayUtils {
 	    return combinedList.toArray(arrays[0]); // using 1st element of arrays to specify the type
 	}
 
-    public static <T> List<T> combine(final List<T>... lists) {
-        final List<T> combinedList = new ArrayList<T>();
-        for (final List<T> list : lists) {
-            combinedList.addAll(list);
-        }
-        return combinedList;
-    }
-
-
-	/**
+    /**
 	 * Creates a mutable copy of the provided array.
 	 */
 	public static <T> List<T> asList(final T[] items) {

Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/JavaClassUtils.java Wed Dec 22 16:22:08 2010
@@ -59,22 +59,6 @@ public final class JavaClassUtils {
 		return builtInClasses.get(name);
 	}
     
-    public static String[] getInterfaces(final Class<?> type) {
-        final Class<?>[] interfaces = type.getInterfaces();
-        final Class<?>[] interfacesCopy = new Class[interfaces.length];
-        int validInterfaces = 0;
-        for (int i = 0; i < interfaces.length; i++) {
-            interfacesCopy[validInterfaces++] = interfaces[i];
-        }
-
-        final String[] interfaceNames = new String[validInterfaces];
-        for (int i = 0; i < validInterfaces; i++) {
-            interfaceNames[i] = interfacesCopy[i].getName();
-        }
-
-        return interfaceNames;
-    }
-
     public static String getSuperclass(final Class<?> type) {
         final Class<?> superType = type.getSuperclass();
 

Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ListUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ListUtils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ListUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ListUtils.java Wed Dec 22 16:22:08 2010
@@ -20,22 +20,29 @@
 
 package org.apache.isis.core.commons.lang;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
 
 public final class ListUtils {
     private static final String DEFAULT_DELIMITER = ",";
 
 	private ListUtils() {}
-
+
+	public static <T> List<T> combine(final List<T> list, final List<T> list2) {
+	    final List<T> combinedList = new ArrayList<T>();
+	    combinedList.addAll(list);
+	    combinedList.addAll(list2);
+	    return combinedList;
+	}
+	
     /**
      * Returns list1 with everything in list2, ignoring duplicates.
      */
-    public static <T> List<T> combine(final List<T> list1, final List<T> list2) {
+    public static <T> List<T> merge(final List<T> list1, final List<T> list2) {
         for (final Iterator<T> iter = list2.iterator(); iter.hasNext();) {
             final T obj = iter.next();
             if (!(list1.contains(obj))) {
@@ -43,9 +50,10 @@ public final class ListUtils {
             }
         }
         return list1;
-    }
-
-    public static List<String> combine(final String[] array1, final String[] array2) {
+    }
+
+    
+    public static List<String> merge(final String[] array1, final String[] array2) {
         final List<String> prefixes = new ArrayList<String>();
         addNoDuplicates(array1, prefixes);
         addNoDuplicates(array2, prefixes);
@@ -136,7 +144,8 @@ public final class ListUtils {
 		String[] optionValues = delimited.split(delimiter);
 		list.addAll(Arrays.asList(optionValues));
 		return list;
-	}
+	}
+
 
 }
 

Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java?rev=1051971&r1=1051970&r2=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java Wed Dec 22 16:22:08 2010
@@ -102,6 +102,10 @@ public final class StringUtils {
         return b.toString();
     }
 
+    public static String pascal(String name) {
+        return capitalize(camel(name));
+    }
+
     public static String memberIdFor(final String member) {
         return lowerLeading(camel(member));
     }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectInvokeUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectInvokeUtils.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ObjectInvokeUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java Wed Dec 22 16:22:08 2010
@@ -18,35 +18,35 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.metamodel.adapter;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.isis.core.metamodel.util.InvokeUtils;
 
-public final class ObjectInvokeUtils {
+public final class AdapterInvokeUtils {
 	
-	private ObjectInvokeUtils() {}
+	private AdapterInvokeUtils() {}
 	
     public static Object invoke(final Method method, final ObjectAdapter adapter) {
-    	return InvokeUtils.invoke(method, IsisUtils.unwrap(adapter));
+    	return InvokeUtils.invoke(method, AdapterUtils.unwrap(adapter));
     }
 
     public static void invoke(final List<Method> methods, final ObjectAdapter adapter) {
-    	InvokeUtils.invoke(methods, IsisUtils.unwrap(adapter));
+    	InvokeUtils.invoke(methods, AdapterUtils.unwrap(adapter));
     }
 
     public static Object invoke(final Method method, final ObjectAdapter adapter, final ObjectAdapter arg0Adapter) {
         return InvokeUtils.invoke(method, 
-        		IsisUtils.unwrap(adapter), 
-        		new Object[] { IsisUtils.unwrap(arg0Adapter)});
+        		AdapterUtils.unwrap(adapter), 
+        		new Object[] { AdapterUtils.unwrap(arg0Adapter)});
     }
 
     public static Object invoke(final Method method, final ObjectAdapter adapter, final ObjectAdapter[] argumentAdapters) {
         return InvokeUtils.invoke(method, 
-        		IsisUtils.unwrap(adapter), 
-        		IsisUtils.unwrap(argumentAdapters));
+        		AdapterUtils.unwrap(adapter), 
+        		AdapterUtils.unwrap(argumentAdapters));
     }
 
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMap.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMap.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMap.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java Wed Dec 22 16:22:08 2010
@@ -14,14 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
 
 public interface AdapterMap extends Injectable {
 
@@ -45,7 +43,7 @@ public interface AdapterMap extends Inje
      * <p>
      * The rules for creating a {@link ResolveState#VALUE standalone} vs {@link ResolveState#TRANSIENT
      * transient} root {@link ObjectAdapter adapter} are as for
-     * {@link #adapterFor(Object, ObjectAdapter, Identified)}.
+     * {@link #adapterFor(Object, ObjectAdapter, IdentifiedHolder)}.
      * 
      * <p>
      * Historical notes: previously called <tt>createAdapterForTransient</tt>, though this name wasn't quite
@@ -69,7 +67,7 @@ public interface AdapterMap extends Inje
      * <li>if the pojo's {@link ObjectSpecification specification} indicates that this is an immutable
      * value, then a {@link ResolveState#VALUE} {@link ObjectAdapter adapter} is created
      * <li>otherwise, if context <tt>ownerAdapter</tt> and <tt>identified</tt> arguments have both been
-     * provided and also either the {@link Identified} argument indicates that for this particular
+     * provided and also either the {@link IdentifiedHolder} argument indicates that for this particular
      * property/collection the object is aggregated <i>or</i> that the pojo's own
      * {@link ObjectSpecification specification} indicates that the pojo is intrinsically aggregated,
      * then an {@link ObjectAdapter#isAggregated() aggregated} adapter is created. Note that the
@@ -88,6 +86,6 @@ public interface AdapterMap extends Inje
      * @param identifier
      *            - only used if aggregated
      */
-    public ObjectAdapter adapterFor(final Object pojo, final ObjectAdapter ownerAdapter, Identified identified);
+    public ObjectAdapter adapterFor(final Object pojo, final ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder);
 
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
+
 
 
 public abstract class AdapterMapAbstract implements AdapterMap {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,8 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
+
 
 public interface AdapterMapAware {
 	

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapDelegator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapDelegator.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/AdapterMapDelegator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java Wed Dec 22 16:22:08 2010
@@ -14,10 +14,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
 
 /**
  * Just delegates to an underlying {@link AdapterMap}.
@@ -44,8 +43,8 @@ public abstract class AdapterMapDelegato
     }
 
     @Override
-    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, Identified identified) {
-        return underlying.adapterFor(pojo, ownerAdapter, identified);
+    public ObjectAdapter adapterFor(Object pojo, ObjectAdapter ownerAdapter, IdentifiedHolder identifiedHolder) {
+        return underlying.adapterFor(pojo, ownerAdapter, identifiedHolder);
     }
 
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java (from r1051446, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/IsisUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/IsisUtils.java&r1=1051446&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/IsisUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java Wed Dec 22 16:22:08 2010
@@ -18,17 +18,16 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.metamodel.adapter;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.List;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
-public class IsisUtils {
+public class AdapterUtils {
 
-    private IsisUtils() {}
+    private AdapterUtils() {}
 
     public static boolean exists(final ObjectAdapter adapter) {
         return adapter != null && adapter.getObject() != null;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServices.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java Wed Dec 22 16:22:08 2010
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 import java.util.List;
 
 import org.apache.isis.core.commons.components.Injectable;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAbstract.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAbstract.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAbstract.java Wed Dec 22 16:22:08 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 
 public abstract class DomainObjectServicesAbstract implements DomainObjectServices {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAware.java (from r1051471, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAware.java&r1=1051471&r2=1051971&rev=1051971&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/DomainObjectServicesAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServicesAware.java Wed Dec 22 16:22:08 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.runtimecontext;
+package org.apache.isis.core.metamodel.adapter;
 
 public interface DomainObjectServicesAware {
 	



Mime
View raw message