incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1053871 [3/22] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/...
Date Thu, 30 Dec 2010 12:30:25 GMT
Modified: incubator/isis/trunk/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=1053871&r1=1053870&r2=1053871&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 Thu Dec 30 12:29:53 2010
@@ -89,15 +89,15 @@ import org.apache.isis.core.metamodel.fa
 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.ActionType;
 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.specloader.internal.ObjectActionImpl;
+import org.apache.isis.core.metamodel.specloader.internal.spec.ObjectActionImpl;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -182,7 +182,7 @@ public class ServerFacadeImpl implements
 
     private ObjectMember getActionElseThrowException(final Identifier id, final ObjectSpecification specification) {
         ObjectMember member =
-            specification.getObjectAction(ObjectActionType.USER, id.getMemberName(),
+            specification.getObjectAction(ActionType.USER, id.getMemberName(),
                 getMemberParameterSpecifications(id));
         if (member == null) {
             throw new IsisException("No user action found for id " + id);
@@ -467,7 +467,7 @@ public class ServerFacadeImpl implements
     public ExecuteServerActionResponse executeServerAction(ExecuteServerActionRequest request) {
 
         AuthenticationSession session = request.getSession();
-        ObjectActionType actionType = request.getActionType();
+        ActionType actionType = request.getActionType();
         String actionIdentifier = request.getActionIdentifier();
         ReferenceData targetData = request.getTarget();
         Data[] parameterData = request.getParameters();
@@ -538,7 +538,7 @@ public class ServerFacadeImpl implements
             parameterSpecs.add(getSpecification(parameterData[i].getType()));
         }
 
-        final ObjectActionType type = ObjectActionImpl.getType(actionType);
+        final ActionType type = ObjectActionImpl.getType(actionType);
 
         final int pos = actionIdentifier.indexOf('#');
 
@@ -731,7 +731,7 @@ public class ServerFacadeImpl implements
     private ObjectAdapter restoreLeafObject(final String encodedObject, final ObjectSpecification specification) {
         final EncodableFacet encoder = specification.getFacet(EncodableFacet.class);
         if (encoder == null) {
-            throw new IsisException("No encoder for " + specification.getFullName());
+            throw new IsisException("No encoder for " + specification.getFullIdentifier());
         }
         final ObjectAdapter object = encoder.fromEncodedString(encodedObject);
         return object;

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=1053871&r1=1053870&r2=1053871&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 Thu Dec 30 12:29:53 2010
@@ -160,7 +160,7 @@ public class ObjectEncoderDecoderDefault
     @Override
     public final IdentityData encodeIdentityData(final ObjectAdapter object) {
         Assert.assertNotNull("OID needed for reference", object, object.getOid());
-        return dataFactory.createIdentityData(object.getSpecification().getFullName(), object.getOid(),
+        return dataFactory.createIdentityData(object.getSpecification().getFullIdentifier(), object.getOid(),
             object.getVersion());
     }
 
@@ -227,7 +227,7 @@ public class ObjectEncoderDecoderDefault
         final Data parameterData[] = new Data[parameters.length];
         for (int i = 0; i < parameters.length; i++) {
             final ObjectAdapter parameter = parameters[i];
-            final String type = parameterTypes[i].getFullName();
+            final String type = parameterTypes[i].getFullIdentifier();
             parameterData[i] = createParameter(type, parameter, knownObjects);
         }
         return parameterData;
@@ -383,7 +383,7 @@ public class ObjectEncoderDecoderDefault
     public Data encodeForResolveField(final ObjectAdapter adapter, final String fieldName) {
         final Oid oid = adapter.getOid();
         final ObjectSpecification specification = adapter.getSpecification();
-        final String type = specification.getFullName();
+        final String type = specification.getFullIdentifier();
         final ResolveState resolveState = adapter.getResolveState();
 
         Data[] fieldContent;
@@ -396,7 +396,7 @@ public class ObjectEncoderDecoderDefault
             if (fields[i].getId().equals(fieldName)) {
                 final ObjectAdapter field = fields[i].get(adapter);
                 if (field == null) {
-                    fieldContent[i] = dataFactory.createNullData(fields[i].getSpecification().getFullName());
+                    fieldContent[i] = dataFactory.createNullData(fields[i].getSpecification().getFullIdentifier());
                 } else if (fields[i].getSpecification().isEncodeable()) {
                     fieldContent[i] = serializer.serializeEncodeable(field);
                 } else if (fields[i].isOneToManyAssociation()) {

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=1053871&r1=1053870&r2=1053871&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 Thu Dec 30 12:29:53 2010
@@ -65,7 +65,7 @@ public final class ObjectSerializer {
 
     public final EncodableObjectData serializeEncodeable(final ObjectAdapter adapter) {
         final EncodableFacet facet = adapter.getSpecification().getFacet(EncodableFacet.class);
-        return this.dataFactory.createValueData(adapter.getSpecification().getFullName(),
+        return this.dataFactory.createValueData(adapter.getSpecification().getFullIdentifier(),
             facet.toEncodedString(adapter));
     }
 
@@ -78,7 +78,7 @@ public final class ObjectSerializer {
 
         if (!isTransient && (resolveState.isSerializing() || resolveState.isGhost() || graphDepth <= 0)) {
             Assert.assertNotNull("OID needed for reference", adapter, adapter.getOid());
-            return this.dataFactory.createIdentityData(adapter.getSpecification().getFullName(), adapter.getOid(),
+            return this.dataFactory.createIdentityData(adapter.getSpecification().getFullIdentifier(), adapter.getOid(),
                 adapter.getVersion());
         }
         if (isTransient && knownObjects.containsKey(adapter)) {
@@ -87,7 +87,7 @@ public final class ObjectSerializer {
 
         boolean withCompleteData = resolveState == ResolveState.TRANSIENT || resolveState == ResolveState.RESOLVED;
 
-        final String type = adapter.getSpecification().getFullName();
+        final String type = adapter.getSpecification().getFullIdentifier();
         final Oid oid = adapter.getOid();
         final ObjectData data = this.dataFactory.createObjectData(type, oid, withCompleteData, adapter.getVersion());
         if (isTransient) {
@@ -105,7 +105,7 @@ public final class ObjectSerializer {
 
             if (fields[i].getSpecification().isEncodeable()) {
                 if (field == null) {
-                    fieldContent[i] = this.dataFactory.createNullData(fields[i].getSpecification().getFullName());
+                    fieldContent[i] = this.dataFactory.createNullData(fields[i].getSpecification().getFullIdentifier());
                 } else {
                     fieldContent[i] = serializeEncodeable(field);
                 }
@@ -117,7 +117,7 @@ public final class ObjectSerializer {
                 if (field == null) {
                     fieldContent[i] =
                         !withCompleteData ? null : this.dataFactory.createNullData(fields[i].getSpecification()
-                            .getFullName());
+                            .getFullIdentifier());
                 } else {
                     fieldContent[i] = serializeObject2(field, graphDepth - 1, knownObjects);
                 }
@@ -134,7 +134,7 @@ public final class ObjectSerializer {
     public CollectionData serializeCollection(final ObjectAdapter collectionAdapter, final int graphDepth,
         final KnownObjectsRequest knownObjects) {
         final Oid oid = collectionAdapter.getOid();
-        final String collectionType = collectionAdapter.getSpecification().getFullName();
+        final String collectionType = collectionAdapter.getSpecification().getFullIdentifier();
         final TypeOfFacet typeOfFacet = collectionAdapter.getSpecification().getFacet(TypeOfFacet.class);
         if (typeOfFacet == null) {
             throw new IsisException("No type of facet for collection " + collectionAdapter);

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=1053871&r1=1053870&r2=1053871&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 Thu Dec 30 12:29:53 2010
@@ -49,12 +49,12 @@ 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.adapter.ObjectList;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
+import org.apache.isis.core.metamodel.spec.ObjectList;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.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_ExecuteLocallyTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/client/facets/ProxyAction_ExecuteLocallyTest.java Thu Dec 30 12:29:53 2010
@@ -27,7 +27,7 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;

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=1053871&r1=1053870&r2=1053871&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 Thu Dec 30 12:29:53 2010
@@ -45,7 +45,7 @@ import org.apache.isis.alternatives.remo
 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.spec.ActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;
 
@@ -126,7 +126,7 @@ public class ProxyAction_ExecuteRemotely
         ExecuteServerActionRequest request =
         	new ExecuteServerActionRequest(
         		IsisContext.getAuthenticationSession(),
-        		ObjectActionType.USER,
+        		ActionType.USER,
                 identifierString, targetData, parameterData);
 		mockDistribution.executeServerAction(request );
         final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0],
@@ -151,7 +151,7 @@ public class ProxyAction_ExecuteRemotely
 
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(
         		IsisContext.getAuthenticationSession(),
-        		ObjectActionType.USER,
+        		ActionType.USER,
                 identifierString, targetData, parameterData);
 		mockDistribution.executeServerAction(request);
         final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0],
@@ -175,11 +175,11 @@ public class ProxyAction_ExecuteRemotely
 
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(
         		IsisContext.getAuthenticationSession(),
-        		ObjectActionType.USER,
+        		ActionType.USER,
                 identifierString, targetData, parameterData);
 		mockDistribution.executeServerAction(request);
         final ReferenceData[] disposedReferenceData = new ReferenceData[] { new DummyReferenceData(object.getOid(), object
-                .getSpecification().getFullName(), null) };
+                .getSpecification().getFullIdentifier(), null) };
         final ExecuteServerActionResponse result = new ExecuteServerActionResponse(new DummyNullValue("type"), new ObjectData[0],
                 disposedReferenceData, null, new ObjectData[2], new String[0], new String[0]);
         expectLastCall().andReturn(result);

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/exchange/ExecuteServerActionEncodabilityTest.java Thu Dec 30 12:29:53 2010
@@ -31,7 +31,8 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.exchange.ExecuteServerActionRequest;
 import org.apache.isis.core.metamodel.encoding.EncodabilityContractTest;
 import org.apache.isis.core.metamodel.encoding.Encodable;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
+
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -48,7 +49,7 @@ public class ExecuteServerActionEncodabi
 	}
 
 	protected Encodable createEncodable() {
-		return new ExecuteServerActionRequest(mockAuthSession, ObjectActionType.USER, "placeOrder", mockTargetData, new Data[0]);
+		return new ExecuteServerActionRequest(mockAuthSession, ActionType.USER, "placeOrder", mockTargetData, new Data[0]);
 	}
 	
 	

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectEncoderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectEncoderImplTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectEncoderImplTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/protocol/encoding/ObjectEncoderImplTest.java Thu Dec 30 12:29:53 2010
@@ -31,8 +31,8 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.protocol.internal.ObjectEncoderDecoderDefault;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.runtime.testspec.MovieSpecification;
 import org.apache.isis.core.runtime.testspec.PersonSpecification;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_ParseableAssociationsTest.java Thu Dec 30 12:29:53 2010
@@ -46,8 +46,8 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;

Modified: incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java (original)
+++ incubator/isis/trunk/alternatives/remoting/common/src/test/java/org/apache/isis/alternatives/remoting/common/server/ServerFacadeImpl_RemoteActionTest.java Thu Dec 30 12:29:53 2010
@@ -36,8 +36,8 @@ import org.apache.isis.alternatives.remo
 import org.apache.isis.alternatives.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -142,7 +142,7 @@ public class ServerFacadeImpl_RemoteActi
 
         IsisContext.getTransactionManager().startTransaction();
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), 
-                ObjectActionType.USER, 
+                ActionType.USER, 
                 "action()", 
                 targetData, 
                 parameterData);
@@ -180,7 +180,7 @@ public class ServerFacadeImpl_RemoteActi
 
         IsisContext.getUpdateNotifier().addDisposedObject(adapter);
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), 
-                ObjectActionType.USER, 
+                ActionType.USER, 
                 "action()", 
                 targetData, 
                 parameterData);
@@ -219,7 +219,7 @@ public class ServerFacadeImpl_RemoteActi
         IsisContext.getUpdateNotifier().addChangedObject(adapter);
         
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), 
-                ObjectActionType.USER, 
+                ActionType.USER, 
                 "action()", 
                 targetData, 
                 parameterData);
@@ -258,7 +258,7 @@ public class ServerFacadeImpl_RemoteActi
 
 
         ExecuteServerActionRequest request = new ExecuteServerActionRequest(new TestProxySession(), 
-                ObjectActionType.USER, 
+                ActionType.USER, 
                 "action()", 
                 targetData, 
                 parameterData);

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java (from r1051972, 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/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/ClassUtil.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.commons.lang;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/NameUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/NameUtils.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/NameUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.commons.lang;
 
 public final class NameUtils {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/MutableProposedHolder.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,8 @@
 
 package org.apache.isis.core.metamodel.adapter;
 
-import org.apache.isis.core.metamodel.interactions.ProposedHolder;
+import org.apache.isis.core.metamodel.interactions2.ProposedHolder;
+import org.apache.isis.core.metamodel.spec.Instance;
 import org.apache.isis.core.metamodel.spec.Specification;
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java Thu Dec 30 12:29:53 2010
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.a
 
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectMetaModel;
 
 /**
  * Adapters to domain objects, where the application is written in terms of domain objects and those objects are

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMap.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMap.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMap.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMap.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMap.java Thu Dec 30 12:29:53 2010
@@ -14,11 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter.map;
 
 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.facetapi.IdentifiedHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 public interface AdapterMap extends Injectable {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAbstract.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAbstract.java Thu Dec 30 12:29:53 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.adapter;
+package org.apache.isis.core.metamodel.adapter.map;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAware.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAware.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAware.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapAware.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapAware.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter.map;
 
 
 public interface AdapterMapAware {

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapDelegator.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapDelegator.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapDelegator.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterMapDelegator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/AdapterMapDelegator.java Thu Dec 30 12:29:53 2010
@@ -14,9 +14,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter.map;
 
-import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 
 /**
  * Just delegates to an underlying {@link AdapterMap}.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterInvokeUtils.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterInvokeUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterInvokeUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterInvokeUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterInvokeUtils.java Thu Dec 30 12:29:53 2010
@@ -18,12 +18,13 @@
  */
 
 
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter.util;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.util.InvokeUtils;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+
 
 public final class AdapterInvokeUtils {
 	

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterUtils.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/AdapterUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/AdapterUtils.java Thu Dec 30 12:29:53 2010
@@ -18,10 +18,12 @@
  */
 
 
-package org.apache.isis.core.metamodel.adapter;
+package org.apache.isis.core.metamodel.adapter.util;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/InvokeUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/util/InvokeUtils.java Thu Dec 30 12:29:53 2010
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.metamodel.util;
+package org.apache.isis.core.metamodel.adapter.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -29,7 +29,7 @@ import org.apache.isis.applib.Applicatio
 import org.apache.isis.core.commons.exceptions.IsisApplicationException;
 import org.apache.isis.core.commons.lang.WrapperUtils;
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.specloader.internal.introspector.MethodFinderUtils;
+import org.apache.isis.core.metamodel.peer.MethodFinderUtils;
 
 /**
  * TODO: remove duplication with {@link WrapperUtils} and {@link MethodFinderUtils}.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Allow.java Thu Dec 30 12:29:53 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Consent.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Consent.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/ConsentAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/ConsentAbstract.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
 import static org.apache.isis.core.commons.matchers.IsisMatchers.nonEmptyStringOrNull;
 import static org.hamcrest.CoreMatchers.is;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionAdvisor.java Thu Dec 30 12:29:53 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionContextType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionContextType.java Thu Dec 30 12:29:53 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionContext;
 
 /**
  * Powertype for the {@link InteractionContext} hierarchy.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionInvocationMethod.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionInvocationMethod.java Thu Dec 30 12:29:53 2010
@@ -18,9 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
-import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions2.InteractionContext;
 
 /**
  * Whether an {@link InteractionContext} was invoked by the user, or is programmatic.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResult.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,7 +34,7 @@ public class InteractionResult {
      * {@link #ADVISED}.
      * 
      * <p>
-     * Subsequent attempts to {@link InteractionResult#advise(String, InteractionAdvisorFacet)} will then be
+     * Subsequent attempts to {@link InteractionResult#advise(String, InteractionAdvisor)} will then be
      * disallowed.
      */
     enum State {
@@ -43,7 +43,7 @@ public class InteractionResult {
 
     private final InteractionEvent interactionEvent;
     private final StringBuilder reasonBuf = new StringBuilder();
-    private final List<InteractionAdvisorFacet> facets = new ArrayList<InteractionAdvisorFacet>();
+    private final List<InteractionAdvisor> advisors = new ArrayList<InteractionAdvisor>();
 
     private State state = State.ADVISING;
 
@@ -53,7 +53,7 @@ public class InteractionResult {
 
     /**
      * Returns the contained {@link InteractionEvent}, if necessary updated with the
-     * {@link #advise(String, InteractionAdvisorFacet) advice} of the interactions.
+     * {@link #advise(String, InteractionAdvisor) advice} of the interactions.
      * 
      * <p>
      * That is, if still {@link State#ADVISING advising}, then copies over the details from this result into
@@ -63,18 +63,18 @@ public class InteractionResult {
      */
     public InteractionEvent getInteractionEvent() {
         if (state == State.ADVISING) {
-            interactionEvent.advised(getReason(), getAdvisorFacetClass());
+            interactionEvent.advised(getReason(), getAdvisorClass());
             state = State.ADVISED;
         }
         return interactionEvent;
     }
 
-    private Class<?> getAdvisorFacetClass() {
-        final InteractionAdvisorFacet advisorFacet = getAdvisorFacet();
-        return advisorFacet != null ? advisorFacet.getClass() : null;
+    private Class<?> getAdvisorClass() {
+        final InteractionAdvisor advisor = getAdvisor();
+        return advisor != null ? advisor.getClass() : null;
     }
 
-    public void advise(final String reason, final InteractionAdvisorFacet facet) {
+    public void advise(final String reason, final InteractionAdvisor facet) {
         if (state == State.ADVISED) {
             throw new IllegalStateException("Cannot append since have called getInteractionEvent");
         }
@@ -84,7 +84,7 @@ public class InteractionResult {
         if (isVetoing()) {
             reasonBuf.append("; ");
         }
-        facets.add(facet);
+        advisors.add(facet);
         reasonBuf.append(reason);
     }
 
@@ -97,23 +97,23 @@ public class InteractionResult {
     }
 
     /**
-     * Returns the first of the {@link #getAdvisorFacets()} that has been
-     * {@link #advise(String, InteractionAdvisorFacet) advised}, or <tt>null</tt> if none yet.
+     * Returns the first of the {@link #getAdvisors()} that has been
+     * {@link #advise(String, InteractionAdvisor) advised}, or <tt>null</tt> if none yet.
      * 
      * @see #getAdvisorFacets()
      */
-    public InteractionAdvisorFacet getAdvisorFacet() {
-        return facets.size() >= 1 ? facets.get(0) : null;
+    public InteractionAdvisor getAdvisor() {
+        return advisors.size() >= 1 ? advisors.get(0) : null;
     }
 
     /**
-     * Returns all {@link InteractionAdvisorFacet facet}s that have
-     * {@link #advise(String, InteractionAdvisorFacet) append}ed reasons to the buffer.
+     * Returns all {@link InteractionAdvisor advisor} (facet)s that have
+     * {@link #advise(String, InteractionAdvisor) append}ed reasons to the buffer.
      * 
-     * @see #getAdvisorFacet()
+     * @see #getAdvisor()
      */
-    public List<InteractionAdvisorFacet> getAdvisorFacets() {
-        return Collections.unmodifiableList(facets);
+    public List<InteractionAdvisor> getAdvisorFacets() {
+        return Collections.unmodifiableList(advisors);
     }
 
     public Consent createConsent() {
@@ -136,7 +136,7 @@ public class InteractionResult {
 
     @Override
     public String toString() {
-        return String.format("%s: %s: %s (%d facets advised)", interactionEvent, state, toStringInterpret(reasonBuf), facets
+        return String.format("%s: %s: %s (%d facets advised)", interactionEvent, state, toStringInterpret(reasonBuf), advisors
                 .size());
     }
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResultSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/InteractionResultSet.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent2/Veto.java Thu Dec 30 12:29:53 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.core.metamodel.consent;
+package org.apache.isis.core.metamodel.consent2;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.apache.isis.core.commons.matchers.IsisMatchers.nonEmptyString;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 public class Veto extends ConsentAbstract {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/DecoratingFacet.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/DecoratingFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/DecoratingFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DecoratingFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/DecoratingFacet.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,8 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
+
 
 /**
  * Provides access to underlying facet that has been decorated.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Facet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.hamcrest.CoreMatchers.is;
@@ -27,11 +27,6 @@ import static org.hamcrest.CoreMatchers.
 
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.feature.IdentifiedHolder;
-import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
-import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
 
 
 public abstract class FacetAbstract implements Facet {
@@ -125,32 +120,6 @@ public abstract class FacetAbstract impl
         this.identifiedHolder = holder instanceof IdentifiedHolder? (IdentifiedHolder)holder: null;
     }
 
-    /**
-     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
-     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
-     */
-    public Object unwrapObject(final ObjectAdapter adapter) {
-        if (adapter == null) {
-            return null;
-        }
-        return adapter.getObject();
-    }
-
-    /**
-     * For convenience of subclass facets that implement {@link ValidatingInteractionAdvisor},
-     * {@link HidingInteractionAdvisor} or {@link DisablingInteractionAdvisor}.
-     */
-    public String unwrapString(final ObjectAdapter adapter) {
-        final Object obj = unwrapObject(adapter);
-        if (obj == null) {
-            return null;
-        }
-        if (!(obj instanceof String)) {
-            return null;
-        }
-        return (String) obj;
-    }
-
     protected String toStringValues() {
         return "";
     }
@@ -158,13 +127,13 @@ public abstract class FacetAbstract impl
     @Override
     public String toString() {
         String details = "";
-        if (ValidatingInteractionAdvisor.class.isAssignableFrom(getClass())) {
+        if (Validating.class.isAssignableFrom(getClass())) {
             details += "Validating";
         }
-        if (DisablingInteractionAdvisor.class.isAssignableFrom(getClass())) {
+        if (Disabling.class.isAssignableFrom(getClass())) {
             details += (details.length() > 0 ? ";" : "") + "Disabling";
         }
-        if (HidingInteractionAdvisor.class.isAssignableFrom(getClass())) {
+        if (Hiding.class.isAssignableFrom(getClass())) {
             details += (details.length() > 0 ? ";" : "") + "Hiding";
         }
         if (!"".equals(details)) {
@@ -181,6 +150,21 @@ public abstract class FacetAbstract impl
         	details += ",";
         }
         return className.substring(className.lastIndexOf('.') + 1) + "[" + details + stringValues + "]";
-    }
+    }
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Hiding {}
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Disabling {}
+
+    /**
+     * Marker interface used within {@link #toString()}.
+     */
+    public static interface Validating {}
 
 }

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFactory.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFactory.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFactory.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFactory.java Thu Dec 30 12:29:53 2010
@@ -18,13 +18,12 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.feature.FeatureType;
 
 
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFilters.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetFilters.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.filters.Filter;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolder.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import org.apache.isis.core.commons.filters.Filter;
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetHolderImpl.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderImpl.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetUtil.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/FeatureType.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.feature;
+package org.apache.isis.core.metamodel.facetapi;
 
 import java.beans.Introspector;
 import java.lang.reflect.Method;
@@ -27,8 +27,8 @@ import java.util.List;
 import com.google.common.collect.ImmutableList;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.lang.NameUtils;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.util.NameUtils;
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/feature/IdentifiedHolder.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/IdentifiedHolder.java Thu Dec 30 12:29:53 2010
@@ -18,10 +18,9 @@
  */
 
 
-package org.apache.isis.core.metamodel.feature;
+package org.apache.isis.core.metamodel.facetapi;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
 
 public interface IdentifiedHolder extends FacetHolder {
 

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemover.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java Thu Dec 30 12:29:53 2010
@@ -18,10 +18,11 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 import java.lang.reflect.Method;
 import java.util.List;
+
 
 
 /**

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodScope.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodScope.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodScope.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodScope.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodScope.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
 
 /**
  * As used in the <tt>findAndRemove...</tt> methods.

Copied: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MultiTypedFacet.java (from r1051972, incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MultiTypedFacet.java?p2=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MultiTypedFacet.java&p1=incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java&r1=1051972&r2=1053871&rev=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MultiTypedFacet.java Thu Dec 30 12:29:53 2010
@@ -18,7 +18,8 @@
  */
 
 
-package org.apache.isis.core.metamodel.facets;
+package org.apache.isis.core.metamodel.facetapi;
+
 
 /**
  * A Class that provides multiple facet implementations, either directly or through a delegate.

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecorator.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.facetdecorator;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public interface FacetDecorator {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.facetdecorator;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public abstract class FacetDecoratorAbstract implements FacetDecorator {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetdecorator/FacetDecoratorSet.java Thu Dec 30 12:29:53 2010
@@ -32,9 +32,9 @@ import java.util.Set;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.exceptions.ReflectionException;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.spec.IntrospectableSpecificationAbstract;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -103,7 +103,7 @@ public class FacetDecoratorSet implement
     /**
      * @param holder
      */
-    public void decorate(IntrospectableSpecificationAbstract holder) {
+    public void decorate(ObjectSpecification holder) {
         decorateAllFacets(holder);
         for (ObjectAssociation objectAssociation : holder.getAssociations()) {
             this.decorateAllFacets(objectAssociation);

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/AnnotationBasedFacetFactoryAbstract.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,9 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.feature.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.spec.FacetFactoryAbstract;
 
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ChoicesUtils.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.metamodel.facets;
 
-import org.apache.isis.core.metamodel.adapter.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 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;

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacet.java Thu Dec 30 12:29:53 2010
@@ -25,6 +25,8 @@ import java.util.List;
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.filters.Filter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 
@@ -64,7 +66,7 @@ public interface ImperativeFacet {
 
     /**
      * For use by
-     * {@link FacetHolder#getFacets(org.apache.isis.core.progmodel.facets.org.apache.isis.nof.arch.facets.Facet.Filter)}
+     * {@link FacetHolder#getFacets(org.apache.isis.core.metamodel.facetapi.progmodel.facets.org.apache.isis.nof.arch.facets.Facet.Filter)}
      */
     public static Filter<Facet> FILTER = new AbstractFilter<Facet>() {
         @Override

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtils.java Thu Dec 30 12:29:53 2010
@@ -25,6 +25,8 @@ import java.util.List;
 
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.commons.lang.CastUtils;
+import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacet.java Thu Dec 30 12:29:53 2010
@@ -19,6 +19,8 @@
 
 
 package org.apache.isis.core.metamodel.facets;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
 public interface MarkerFacet extends Facet {
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MarkerFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -19,6 +19,10 @@
 
 
 package org.apache.isis.core.metamodel.facets;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 
 public abstract class MarkerFacetAbstract extends FacetAbstract implements MarkerFacet {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFilteringFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -21,6 +21,8 @@
 package org.apache.isis.core.metamodel.facets;
 
 import java.lang.reflect.Method;
+
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
 
 
 /**

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.f
 
 import java.util.List;
 
+import org.apache.isis.core.metamodel.facetapi.FacetFactory;
 import org.apache.isis.core.metamodel.specloader.internal.facetprocessor.FacetProcessor;
 
 

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodRemoverConstants.java Thu Dec 30 12:29:53 2010
@@ -23,6 +23,9 @@ package org.apache.isis.core.metamodel.f
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facetapi.MethodScope;
 
 
 public class MethodRemoverConstants {

Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MultiTypedFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -19,6 +19,11 @@
 
 
 package org.apache.isis.core.metamodel.facets;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
 
 
 /**



Mime
View raw message