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

svn commit: r1053871 [22/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...

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java Thu Dec 30 12:29:53 2010
@@ -24,9 +24,9 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
+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.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
@@ -80,8 +80,8 @@ public class MethodsUtils {
             throw new ScimpiException("Object not specified when looking for " + methodName);
         }
 
-        List<ObjectAction> actions = object.getSpecification().getObjectActions(ObjectActionType.USER,
-                ObjectActionType.EXPLORATION, ObjectActionType.PROTOTYPE, ObjectActionType.DEBUG);
+        List<ObjectAction> actions = object.getSpecification().getObjectActions(ActionType.USER,
+                ActionType.EXPLORATION, ActionType.PROTOTYPE, ActionType.DEBUG);
         ObjectAction action = findAction(actions, methodName);
        /* if (action == null) {
             actions = object.getSpecification().getServiceActionsFor(ObjectActionType.USER,

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.scimpi.di
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionForm.java Thu Dec 30 12:29:53 2010
@@ -251,7 +251,7 @@ public class ActionForm extends Abstract
                 ObjectSpecification objectSpecification = action.getParameters().get(i).getSpecification();
                 if (defaultValue != null) {
                     String html = "<img class=\"small-icon\" src=\"" + context.imagePath(objectSpecification) + "\" alt=\""
-                            + objectSpecification.getShortName() + "\"/>" + title;
+                            + objectSpecification.getShortIdentifier() + "\"/>" + title;
                     String value = context.mapObject(defaultValue, Scope.INTERACTION);
                     field.setValue(value);
                     field.setHtml(html);

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/Methods.java Thu Dec 30 12:29:53 2010
@@ -23,9 +23,9 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
@@ -62,16 +62,16 @@ public class Methods extends AbstractEle
     }
 
     public static void writeMethods(Request request, String objectId, ObjectAdapter adapter, boolean showForms, InclusionList inclusionList) {
-        List<ObjectAction> actions = adapter.getSpecification().getObjectActions(ObjectActionType.USER);
+        List<ObjectAction> actions = adapter.getSpecification().getObjectActions(ActionType.USER);
         writeMethods(request, adapter, actions, objectId, showForms, inclusionList);
         // TODO determine if system is set up to display exploration methods
         if (true) {
-            actions = adapter.getSpecification().getObjectActions(ObjectActionType.EXPLORATION);
+            actions = adapter.getSpecification().getObjectActions(ActionType.EXPLORATION);
             writeMethods(request, adapter, actions, objectId, showForms, inclusionList);
         }
         // TODO determine if system is set up to display debug methods
         if (true) {
-            actions = adapter.getSpecification().getObjectActions(ObjectActionType.DEBUG);
+            actions = adapter.getSpecification().getObjectActions(ActionType.DEBUG);
             writeMethods(request, adapter, actions, objectId, showForms, inclusionList);
         }
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java Thu Dec 30 12:29:53 2010
@@ -53,7 +53,7 @@ public class Debug extends AbstractEleme
                 ObjectSpecification[] allSpecifications = IsisContext.getSpecificationLoader().allSpecifications();
                 String[] names = new String[allSpecifications.length];
                 for (int j = 0; j < allSpecifications.length; j++) {
-                    names[j] = allSpecifications[j].getFullName();
+                    names[j] = allSpecifications[j].getFullIdentifier();
                 }
                 Arrays.sort(names);
                 request.appendHtml("<h2>Specifications</h2><ol>");
@@ -70,7 +70,7 @@ public class Debug extends AbstractEleme
                 ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(value);
                 DebugString str = new DebugString();
                 Dump.specification(spec, str);
-                request.appendHtml("<h2>" + spec.getFullName() + "</h2>");
+                request.appendHtml("<h2>" + spec.getFullIdentifier() + "</h2>");
                 request.appendHtml("<pre class=\"debug\">" + str + "</pre>");
 
             } else if (type.equals("object")) {
@@ -79,7 +79,7 @@ public class Debug extends AbstractEleme
                 DebugString str = new DebugString();
                 Dump.adapter(object, str);
                 Dump.graph(object, str, IsisContext.getAuthenticationSession());
-                request.appendHtml("<h2>" + object.getSpecification().getFullName() + "</h2>");
+                request.appendHtml("<h2>" + object.getSpecification().getFullIdentifier() + "</h2>");
                 request.appendHtml("<pre class=\"debug\">" + str + "</pre>");
             }
 

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Members.java Thu Dec 30 12:29:53 2010
@@ -23,10 +23,10 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
@@ -60,15 +60,15 @@ public class Members extends AbstractEle
         
         ObjectSpecification specification = field == null ? object.getSpecification() : field.getSpecification();
         
-        request.appendHtml(specification.getName() + " (" + specification.getFullName() + ") \n");
+        request.appendHtml(specification.getSingularName() + " (" + specification.getFullIdentifier() + ") \n");
         List<ObjectAssociation> fields = specification.getAssociations();
         for (ObjectAssociation fld : fields) {
             if (!fld.isAlwaysHidden()) {
-                request.appendHtml("   " + fld.getId() + " - '" + fld.getName() + "' -> "+  fld.getSpecification().getName() + (fld.isOneToManyAssociation() ? " (collection of)" : "") + "\n" );
+                request.appendHtml("   " + fld.getId() + " - '" + fld.getName() + "' -> "+  fld.getSpecification().getSingularName() + (fld.isOneToManyAssociation() ? " (collection of)" : "") + "\n" );
             }
         }
         request.appendHtml("   --------------\n");
-        List<ObjectAction> actions = specification.getObjectActions(ObjectActionType.USER);;
+        List<ObjectAction> actions = specification.getObjectActions(ActionType.USER);;
         for (ObjectAction action : actions) {
             request.appendHtml("   " + action.getId() + " (");
             boolean first = true;
@@ -76,12 +76,12 @@ public class Members extends AbstractEle
                 if (!first) {
                     request.appendHtml(", ");
                 }
-                request.appendHtml(parameter.getSpecification().getName());
+                request.appendHtml(parameter.getSpecification().getSingularName());
                 first = false;
             }
             request.appendHtml(")"  + " - '" + action.getName() + "'");
             if (action.getSpecification() != null) {
-                request.appendHtml(" -> " + action.getSpecification().getName() + ")" );
+                request.appendHtml(" -> " + action.getSpecification().getSingularName() + ")" );
             }
             request.appendHtml("\n" );
         }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Specification.java Thu Dec 30 12:29:53 2010
@@ -41,10 +41,10 @@ public class Specification extends Abstr
             String id = request.getOptionalProperty("object");
             ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
             ObjectSpecification specification = object.getSpecification();
-            request.appendHtml(specification.getName() + " (" + specification.getFullName() + ") \n");
+            request.appendHtml(specification.getSingularName() + " (" + specification.getFullIdentifier() + ") \n");
             List<ObjectAssociation> fields = specification.getAssociations();
             for (int i = 0; i < fields.size(); i++) {
-                request.appendHtml("    " + fields.get(i).getName() + " (" + fields.get(i).getSpecification().getName() + ") \n" );
+                request.appendHtml("    " + fields.get(i).getName() + " (" + fields.get(i).getSpecification().getSingularName() + ") \n" );
                 
             }
             

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/AbstractTableView.java Thu Dec 30 12:29:53 2010
@@ -26,9 +26,11 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
 import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
@@ -42,11 +44,11 @@ public abstract class AbstractTableView 
     public void process(Request request) {
         RequestContext context = request.getContext();
 
-        TypeOfFacet facet;
         ObjectAdapter collection;
         String parentObjectId = null;
         boolean isFieldEditable = false;
         String field = request.getOptionalProperty(FIELD);
+        ObjectSpecification elementSpec;
         if (field != null) {
             String objectId = request.getOptionalProperty(OBJECT);
             ObjectAdapter object = context.getMappedObjectOrResult(objectId);
@@ -58,14 +60,15 @@ public abstract class AbstractTableView 
                 throw new ScimpiException("Field " + objectField.getId() + " is not a collection");
             }
             isFieldEditable = objectField.isUsable(IsisContext.getAuthenticationSession(), object).isAllowed();
-            IsisContext.getPersistenceSession().resolveField(object, objectField);
+            getPersistenceSession().resolveField(object, objectField);
             collection = objectField.get(object);
-            facet = objectField.getFacet(TypeOfFacet.class);
+            TypeOfFacet facet = objectField.getFacet(TypeOfFacet.class);
+            elementSpec = facet.valueSpec();
             parentObjectId = objectId == null ? context.mapObject(object, Scope.REQUEST) : objectId;
         } else {
             String id = request.getOptionalProperty(COLLECTION);
             collection = context.getMappedObjectOrResult(id);
-            facet = collection.getTypeOfFacet();
+            elementSpec = collection.getElementSpecification();
         }
 
         String summary = request.getOptionalProperty("summary");
@@ -75,13 +78,17 @@ public abstract class AbstractTableView 
             rowClasses = rowClassesList.split("[,|/]");
         }
 
-        List<ObjectAssociation> allFields = facet.valueSpec().getAssociations(
+        List<ObjectAssociation> allFields = elementSpec.getAssociations(
                 ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
         TableContentWriter rowBuilder = createRowBuilder(request, context, isFieldEditable ? parentObjectId : null, allFields);
         write(request, collection, summary, rowBuilder, rowClasses);
 
     }
 
+    protected PersistenceSession getPersistenceSession() {
+        return IsisContext.getPersistenceSession();
+    }
+
     protected abstract TableContentWriter createRowBuilder(
             final Request request,
             RequestContext context,

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldLabel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldLabel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldLabel.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldLabel.java Thu Dec 30 12:29:53 2010
@@ -37,10 +37,10 @@ public class FieldLabel extends Abstract
         ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
         ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
-            throw new ForbiddenException("Field " + fieldName + " in " + object.getSpecification().getFullName() + " is not visible");
+            throw new ForbiddenException("Field " + fieldName + " in " + object.getSpecification().getFullIdentifier() + " is not visible");
         }
         String delimiter = request.getOptionalProperty("delimiter");
         if (delimiter == null) {

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/FieldValue.java Thu Dec 30 12:29:53 2010
@@ -43,7 +43,7 @@ public class FieldValue extends Abstract
         ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
         ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
             throw new ForbiddenException("Field " + fieldName + " in " + object + " is not visible");
@@ -77,7 +77,7 @@ public class FieldValue extends Abstract
 
             if (!field.getSpecification().containsFacet(ParseableFacet.class) && showIcon) {
                 request.appendHtml("<img class=\"small-icon\" src=\"" + request.getContext().imagePath(fieldReference)
-                        + "\" alt=\"" + field.getSpecification().getShortName() + "\"/>");
+                        + "\" alt=\"" + field.getSpecification().getShortIdentifier() + "\"/>");
             }
             
             if (linkedField != null) {

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/GetField.java Thu Dec 30 12:29:53 2010
@@ -48,7 +48,7 @@ public class GetField extends AbstractEl
         }
         ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
             throw new ForbiddenException("Field " + fieldName + " in " + object + " is not visible");

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/LongFormView.java Thu Dec 30 12:29:53 2010
@@ -23,7 +23,7 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -38,8 +38,8 @@ public class LongFormView extends Abstra
         if (field.isOneToManyAssociation()) {
             IsisContext.getPersistenceSession().resolveField(object, field);
             ObjectAdapter collection = field.get(object);
-            TypeOfFacet facet = collection.getTypeOfFacet();
-            List<ObjectAssociation> fields = facet.valueSpec().getAssociations(
+            final ObjectSpecification elementSpec = collection.getElementSpecification();
+            List<ObjectAssociation> fields = elementSpec.getAssociations(
                     ObjectAssociationFilters.STATICALLY_VISIBLE_ASSOCIATIONS);
             boolean isFieldEditable = field.isUsable(IsisContext.getAuthenticationSession(), object).isAllowed();
             String summary = "Table of elements in " + field.getName();

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableCell.java Thu Dec 30 12:29:53 2010
@@ -38,7 +38,7 @@ public class TableCell extends AbstractE
         ObjectAdapter object = request.getContext().getMappedObjectOrVariable(id, ELEMENT);
         ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
             throw new ForbiddenException("Field " + fieldName + " in " + object + " is not visible");

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/display/TableView.java Thu Dec 30 12:29:53 2010
@@ -129,7 +129,7 @@ public class TableView extends AbstractT
                         if (!fields.get(i).getSpecification().containsFacet(ParseableFacet.class)) {
                             request.appendHtml("<img class=\"" + "small-icon" + "\" src=\""
                                     + request.getContext().imagePath(field) + "\" alt=\""
-                                    + fields.get(i).getSpecification().getShortName() + "\"/>");
+                                    + fields.get(i).getSpecification().getShortIdentifier() + "\"/>");
                         }
                         if (linkRow != null) {
                             request.appendHtml("<a href=\"" + linkRow.getForwardView() + "?" + linkRow.getVariable() + "="

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -220,7 +220,7 @@ public class EditObject extends Abstract
                 if (field.getSpecification().getFacet(ParseableFacet.class) == null) {
                     if (fieldValue != null) {
                         String entry = "<img class=\"small-icon\" src=\"" + context.imagePath(field.getSpecification())
-                                + "\" alt=\"" + field.getSpecification().getShortName() + "\"/>" + fieldValue.titleString();
+                                + "\" alt=\"" + field.getSpecification().getShortIdentifier() + "\"/>" + fieldValue.titleString();
                         inputField.setHtml(entry);
                     } else {
                         String entry = "<em>none specified</em>";
@@ -267,7 +267,7 @@ public class EditObject extends Abstract
                 ObjectSpecification objectSpecification = field.getSpecification();
                 if (defaultValue != null) {
                     String html = "<img class=\"small-icon\" src=\"" + context.imagePath(objectSpecification) + "\" alt=\""
-                            + objectSpecification.getShortName() + "\"/>" + title;
+                            + objectSpecification.getShortIdentifier() + "\"/>" + title;
                     formFields[i].setHtml(html);
                     String value = defaultValue == null ? null : context.mapObject(defaultValue, Scope.INTERACTION);
                     formFields[i].setValue(value);

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/FieldFactory.java Thu Dec 30 12:29:53 2010
@@ -68,7 +68,7 @@ public class FieldFactory {
             if (spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(boolean.class))
                     || spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(Boolean.class.getName()))) {
                 field.setType(InputField.CHECKBOX);
-            } else if (spec.getFullName().endsWith(".Password")) {
+            } else if (spec.getFullIdentifier().endsWith(".Password")) {
                 field.setType(InputField.PASSWORD);
             } else {
                 field.setType(InputField.TEXT);

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/Selector.java Thu Dec 30 12:29:53 2010
@@ -122,7 +122,7 @@ public class Selector extends AbstractEl
         ObjectAdapter element = iterator.next();
         String elementId = context.mapObject(element, Scope.INTERACTION);
         buffer.append("<img class=\"small-icon\" src=\"" + request.getContext().imagePath(element)
-                + "\" alt=\"" + element.getSpecification().getShortName() + "\"/>" + element.titleString() + "\n");
+                + "\" alt=\"" + element.getSpecification().getShortIdentifier() + "\"/>" + element.titleString() + "\n");
         buffer.append("<input type=\"hidden\" name=\"" + field + "\" value=\"" + elementId + "\" />\n");
         return buffer.toString();
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java Thu Dec 30 12:29:53 2010
@@ -23,11 +23,11 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
@@ -47,7 +47,7 @@ public abstract class AbstractConditiona
         if (method != null) {
             ObjectAdapter object = MethodsUtils.findObject(request.getContext(), id);
             // TODO needs to work irrespective of parameters 
-            ObjectAction objectAction = object.getSpecification().getObjectAction(ObjectActionType.USER, method, ObjectSpecification.EMPTY_LIST);
+            ObjectAction objectAction = object.getSpecification().getObjectAction(ActionType.USER, method, ObjectSpecification.EMPTY_LIST);
             Consent visible = objectAction.isVisible(IsisContext.getAuthenticationSession(), object);
             processTags(visible.isAllowed(), request);
             return;
@@ -57,7 +57,7 @@ public abstract class AbstractConditiona
         if (method != null) {
             ObjectAdapter object = MethodsUtils.findObject(request.getContext(), id);
             // TODO needs to work irrespective of parameters 
-            ObjectAction objectAction = object.getSpecification().getObjectAction(ObjectActionType.USER, method, ObjectSpecification.EMPTY_LIST);
+            ObjectAction objectAction = object.getSpecification().getObjectAction(ActionType.USER, method, ObjectSpecification.EMPTY_LIST);
             Consent usable = objectAction.isUsable(IsisContext.getAuthenticationSession(), object);
             processTags(usable.isAllowed(), request);
             return;
@@ -66,7 +66,7 @@ public abstract class AbstractConditiona
         method = request.getOptionalProperty(METHOD + "-exists");
         if (method != null) {
             ObjectAdapter object = MethodsUtils.findObject(request.getContext(), id);
-            List<? extends ObjectAction> objectActions = object.getSpecification().getObjectActions(ObjectActionType.USER);
+            List<? extends ObjectAction> objectActions = object.getSpecification().getObjectActions(ActionType.USER);
             boolean methodExists = false;
             for (ObjectAction objectAssociation : objectActions) {
                 if (objectAssociation.getId().equals(method)) {

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractLink.java Thu Dec 30 12:29:53 2010
@@ -48,7 +48,7 @@ public abstract class AbstractLink exten
         if (fieldName != null) {
             ObjectAssociation field = adapter.getSpecification().getAssociation(fieldName);
             if (field == null) {
-                throw new ScimpiException("No field " + fieldName + " in " + adapter.getSpecification().getFullName());
+                throw new ScimpiException("No field " + fieldName + " in " + adapter.getSpecification().getFullIdentifier());
             }
             if (field.isVisible(IsisContext.getAuthenticationSession(), adapter).isVetoed()) {
                 throw new ForbiddenException("Field " + fieldName + " in " + object + " is not visible");

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java Thu Dec 30 12:29:53 2010
@@ -75,10 +75,10 @@ public class RemoveElement extends Abstr
     public static void write(Request request, ObjectAdapter adapter, String fieldName, ObjectAdapter element, String resultOverride, String view, String error, String title, String cssClass) {
         ObjectAssociation field = adapter.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + adapter.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + adapter.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), adapter).isVetoed()) {
-            throw new ForbiddenException("Field " + fieldName + " in " + adapter.getSpecification().getFullName() + " is not visible");
+            throw new ForbiddenException("Field " + fieldName + " in " + adapter.getSpecification().getFullIdentifier() + " is not visible");
         }
         IsisContext.getPersistenceSession().resolveField(adapter, field);
 

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/ElementType.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.scimpi.dispatcher.view.value;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
@@ -31,13 +31,14 @@ import org.apache.isis.viewer.scimpi.dis
 
 public class ElementType extends AbstractElementProcessor {
 
+    @Override
     public void process(Request request) {
         ObjectAdapter collection;
         String field = request.getOptionalProperty(FIELD);
         RequestContext context = request.getContext();
         if (field != null) {
             String id = request.getRequiredProperty(OBJECT);
-            ObjectAdapter object = (ObjectAdapter) context.getMappedObjectOrResult(id);
+            ObjectAdapter object = context.getMappedObjectOrResult(id);
             ObjectAssociation objectField = object.getSpecification().getAssociation(field);
             if (!objectField.isOneToManyAssociation()) {
                 throw new ScimpiException("Field " + objectField.getId() + " is not a collection");
@@ -48,12 +49,13 @@ public class ElementType extends Abstrac
             collection =  context.getMappedObjectOrResult(id);
         }
         
-        TypeOfFacet facet =  (TypeOfFacet) collection.getTypeOfFacet();
-        String name = facet.valueSpec().getName();
+        final ObjectSpecification elementSpecification = collection.getElementSpecification();
+        String name = elementSpecification.getSingularName();
         
         request.appendHtml(name);
     }
 
+    @Override
     public String getName() {
         return "element-type";
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/FieldName.java Thu Dec 30 12:29:53 2010
@@ -37,10 +37,10 @@ public class FieldName extends AbstractE
         ObjectAdapter object = request.getContext().getMappedObjectOrResult(id);
         ObjectAssociation field = object.getSpecification().getAssociation(fieldName);
         if (field == null) {
-            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullName());
+            throw new ScimpiException("No field " + fieldName + " in " + object.getSpecification().getFullIdentifier());
         }
         if (field.isVisible(IsisContext.getAuthenticationSession(), object).isVetoed()) {
-            throw new ForbiddenException("Field " + fieldName + " in " + object.getSpecification().getFullName() + " is not visible");
+            throw new ForbiddenException("Field " + fieldName + " in " + object.getSpecification().getFullIdentifier() + " is not visible");
         }
         request.appendHtml(field.getName());
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/value/Type.java Thu Dec 30 12:29:53 2010
@@ -30,13 +30,14 @@ import org.apache.isis.viewer.scimpi.dis
 
 public class Type extends AbstractElementProcessor {
 
+    @Override
     public void process(Request request) {
         RequestContext context = request.getContext();
         String showPlural = request.getOptionalProperty(PLURAL);
         String id = request.getOptionalProperty(OBJECT);
         String objectId = id != null ? id : (String) context.getVariable(RequestContext.RESULT);
         
-        ObjectAdapter object = (ObjectAdapter) context.getMappedObjectOrResult(objectId);
+        ObjectAdapter object = context.getMappedObjectOrResult(objectId);
         String field = request.getOptionalProperty(FIELD);
         if (field != null) {
             ObjectAssociation objectField = object.getSpecification().getAssociation(field);
@@ -45,11 +46,12 @@ public class Type extends AbstractElemen
         request.appendDebug(" for " + object); 
         
         ObjectSpecification specification = object.getSpecification();
-        String name = showPlural != null ? specification.getPluralName() : specification.getName();
+        String name = showPlural != null ? specification.getPluralName() : specification.getSingularName();
         
         request.appendHtml(name);
     }
 
+    @Override
     public String getName() {
         return "type";
     }

Modified: incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java Thu Dec 30 12:29:53 2010
@@ -104,7 +104,7 @@ public class ImageLookup {
     }
 
     private static String findImageFor(ObjectSpecification specification, String contextPath) {
-        String name = specification.getShortName();
+        String name = specification.getShortIdentifier();
         String fileName = imageFile(name, contextPath);
         if (fileName != null) {
             images.put(name, fileName);
@@ -143,7 +143,7 @@ public class ImageLookup {
     }
 */
     public static String imagePath(ObjectSpecification specification, String contextPath) {
-        String name = specification.getShortName();
+        String name = specification.getShortIdentifier();
         String imageName = (String) images.get(name);
         if (imageName != null) {
             return (String) imageName;

Modified: incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java Thu Dec 30 12:29:53 2010
@@ -23,11 +23,11 @@ package org.apache.isis.viewer.wicket.me
 
 import java.lang.reflect.Method;
 
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
 import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
-import org.apache.isis.core.metamodel.facets.FacetUtil;
-import org.apache.isis.core.metamodel.facets.MethodRemover;
-import org.apache.isis.core.metamodel.feature.FeatureType;
 import org.apache.isis.viewer.wicket.applib.WizardPageDescription;
 
 

Modified: incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAbstract.java Thu Dec 30 12:29:53 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.viewer.wicket.metamodel.wizardpagedesc;
 
-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.MarkerFacetAbstract;
 
 public class WizardPageDescriptionFacetAbstract extends

Modified: incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAnnotation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAnnotation.java (original)
+++ incubator/isis/trunk/viewer/wicket/metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAnnotation.java Thu Dec 30 12:29:53 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.viewer.wicket.metamodel.wizardpagedesc;
 
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 public class WizardPageDescriptionFacetAnnotation extends WizardPageDescriptionFacetAbstract  {
 

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java Thu Dec 30 12:29:53 2010
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.wicket.mo
 
 import java.io.Serializable;
 
+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;
 
 /**
  * {@link Serializable} represention of a {@link ObjectAction}
@@ -33,13 +33,13 @@ public class ActionMemento implements Se
 	private static final long serialVersionUID = 1L;
 
 	private SpecMemento owningType;
-	private ObjectActionType actionType;
+	private ActionType actionType;
 	private String nameParmsId;
 
 	private transient ObjectAction action;
 	
 	public ActionMemento(SpecMemento owningType,
-			ObjectActionType actionType, String nameParmsId) {
+			ActionType actionType, String nameParmsId) {
 		this.owningType = owningType;
 		this.actionType = actionType;
 		this.nameParmsId = nameParmsId;
@@ -54,7 +54,7 @@ public class ActionMemento implements Se
 		return owningType;
 	}
 
-	public ObjectActionType getActionType() {
+	public ActionType getActionType() {
 		return actionType;
 	}
 	

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java Thu Dec 30 12:29:53 2010
@@ -35,11 +35,11 @@ import org.apache.isis.applib.Identifier
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.viewer.wicket.model.common.NoResultsHandler;
 import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
 import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
@@ -125,7 +125,7 @@ public class ActionModel extends ModelAb
         ObjectSpecification actionOnTypeSpec = noAction.getOnType();
         if (actionOnTypeSpec != null) {
             PageParameterNames.ACTION_OWNING_SPEC.addTo(pageParameters,
-                    actionOnTypeSpec.getFullName());
+                    actionOnTypeSpec.getFullIdentifier());
         }
         PageParameterNames.ACTION_NAME_PARMS.addTo(pageParameters,
                 actionNameParmsId);
@@ -246,9 +246,9 @@ public class ActionModel extends ModelAb
         return PageParameterNames.ACTION_NAME_PARMS.getFrom(pageParameters);
     }
 
-    private static ObjectActionType actionTypeFor(
+    private static ActionType actionTypeFor(
             PageParameters pageParameters) {
-        return ObjectActionType.valueOf(PageParameterNames.ACTION_TYPE
+        return ActionType.valueOf(PageParameterNames.ACTION_TYPE
                 .getFrom(pageParameters));
     }
 

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java Thu Dec 30 12:29:53 2010
@@ -23,22 +23,21 @@ package org.apache.isis.viewer.wicket.mo
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.wicket.Component;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
 import org.apache.isis.viewer.wicket.model.mementos.CollectionMemento;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel.Type;
 import org.apache.isis.viewer.wicket.model.util.ClassLoaders;
 import org.apache.isis.viewer.wicket.model.util.Mementos;
 import org.apache.isis.viewer.wicket.model.util.ObjectAdapters;
-import org.apache.wicket.Component;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 
 /**
  * Model representing a collection of entities, either {@link Type#STANDALONE
@@ -108,13 +107,14 @@ public class EntityCollectionModel exten
 			ObjectAdapter collectionAsAdapter) {
 		Iterable<Object> iterable = EntityCollectionModel
 				.asIterable(collectionAsAdapter);
-		TypeOfFacet typeOfFacet = collectionAsAdapter.getTypeOfFacet();
 
-		Class<?> cls = typeOfFacet.value();
 		Iterable<ObjectAdapterMemento> oidIterable = Iterables.transform(
 				iterable, Mementos.fromPojo());
 		List<ObjectAdapterMemento> mementoList = Lists.newArrayList(oidIterable);
-		return new EntityCollectionModel(cls, mementoList);
+		
+		final ObjectSpecification elementSpec = collectionAsAdapter.getElementSpecification();
+		final Class<?> elementType = elementSpec.getCorrespondingClass();
+		return new EntityCollectionModel(elementType, mementoList);
 	}
 
 	/**

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java Thu Dec 30 12:29:53 2010
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -70,7 +70,7 @@ public class EntityModel extends ModelAb
 
 			PageParameterNames.OBJECT_OID.addTo(pageParameters, oidStr);
 			PageParameterNames.OBJECT_SPEC.addTo(pageParameters, noSpec
-					.getFullName());
+					.getFullIdentifier());
 		} else {
 			// don't do anything; instead the page should be redirected back to
 			// an EntityPage so that the underlying EntityModel that contains the

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java Thu Dec 30 12:29:53 2010
@@ -26,9 +26,9 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.facets.propparam.validate.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -75,7 +75,7 @@ public class ScalarModel extends EntityM
 
 			@Override
 			public String getLongName(ScalarModel scalarModel) {
-				final String specShortName = scalarModel.parentObjectAdapterMemento.getSpecMemento().getSpecification().getShortName();
+				final String specShortName = scalarModel.parentObjectAdapterMemento.getSpecMemento().getSpecification().getShortIdentifier();
 				return specShortName + "-" + scalarModel.getPropertyMemento().getProperty().getId();
 			}
 
@@ -182,7 +182,7 @@ public class ScalarModel extends EntityM
 					// shouldn't happen
 					return null;
 				}
-				final String specShortName = adapterMemento.getSpecMemento().getSpecification().getShortName();
+				final String specShortName = adapterMemento.getSpecMemento().getSpecification().getShortIdentifier();
 				final String parmId = scalarModel.getParameterMemento().getActionParameter().getIdentifier().toNameIdentityString();
 				return specShortName + "-" + parmId + "-" + scalarModel.getParameterMemento().getNumber();
 			}
@@ -366,7 +366,7 @@ public class ScalarModel extends EntityM
 	}
 
 	public boolean isScalarTypeAnyOf(Class<?>... requiredClass) {
-		String fullName = getTypeOfSpecification().getFullName();
+		String fullName = getTypeOfSpecification().getFullIdentifier();
 		for (Class<?> requiredCls : requiredClass) {
 			if (fullName.equals(requiredCls.getName())) {
 				return true;
@@ -398,7 +398,7 @@ public class ScalarModel extends EntityM
 				ParseableFacet.class);
 		if (parseableFacet == null) {
 			throw new RuntimeException("unable to parse string for "
-					+ getTypeOfSpecification().getFullName());
+					+ getTypeOfSpecification().getFullIdentifier());
 		}
 		ObjectAdapter adapter = parseableFacet.parseTextEntry(getObject(),
 				enteredText);

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/Actions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/Actions.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/Actions.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/Actions.java Thu Dec 30 12:29:53 2010
@@ -25,16 +25,16 @@ import com.google.common.base.Predicate;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+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.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 
 public final class Actions {
 
 	private Actions(){}
 	
 	public static Predicate<ObjectAction> ofType(
-			final ObjectActionType type) {
+			final ActionType type) {
 		return new Predicate<ObjectAction>(){
 			@Override
             public boolean apply(ObjectAction input) {

Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ClassLoaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ClassLoaders.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ClassLoaders.java (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ClassLoaders.java Thu Dec 30 12:29:53 2010
@@ -41,7 +41,7 @@ public final class ClassLoaders {
 	}
 	
 	public static Class<?> forName(ObjectSpecification noSpec) {
-		String fullName = noSpec.getFullName();
+		String fullName = noSpec.getFullIdentifier();
 		return forName(fullName);
 	}
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java Thu Dec 30 12:29:53 2010
@@ -26,9 +26,9 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.progmodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -114,7 +114,7 @@ public class AppActionsCssMenuFactory ex
 		ObjectSpecification serviceSpec = serviceAdapterMemento.getObjectAdapter()
 				.getSpecification();
 
-		for (final ObjectAction noAction : serviceSpec.getObjectActions(ObjectActionType.USER)) {
+		for (final ObjectAction noAction : serviceSpec.getObjectActions(ActionType.USER)) {
 
 		    // skip if annotated to not be included in repository menu
 		    if (noAction.getFacet(NotInServiceMenuFacet.class) != null) {

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java Thu Dec 30 12:29:53 2010
@@ -30,9 +30,9 @@ import com.google.inject.Inject;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -126,7 +126,7 @@ public class EntitySummaryPanel extends 
         ObjectAdapter adapter = model.getObject();
         final ObjectAdapterMemento adapterMemento = model.getObjectAdapterMemento();
         if (adapter != null) {
-            List<ObjectAction> userActions = adapter.getSpecification().getObjectActions(ObjectActionType.USER);
+            List<ObjectAction> userActions = adapter.getSpecification().getObjectActions(ActionType.USER);
 
             CssMenuBuilder cssMenuBuilder = new CssMenuBuilder(adapterMemento,
                     getServiceAdapters(), userActions, linkFactory);

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java Thu Dec 30 12:29:53 2010
@@ -30,9 +30,9 @@ import org.apache.wicket.Application;
 import com.google.common.collect.Collections2;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedFacet;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.util.Actions;
@@ -69,16 +69,16 @@ public class CssMenuBuilder  {
 
 	private void addMenuItems(CssMenuItem parent,
 			List<ObjectAction> actions) {
-		addMenuItemsForActionsOfType(parent, actions, ObjectActionType.SET);
+		addMenuItemsForActionsOfType(parent, actions, ActionType.SET);
 		addMenuItemsForActionsOfType(parent, actions,
-				ObjectActionType.USER);
+				ActionType.USER);
 		if (isExplorationMode()) {
 			addMenuItemsForActionsOfType(parent, actions,
-					ObjectActionType.EXPLORATION);
+					ActionType.EXPLORATION);
 		}
 		if (isDebugMode()) {
 			addMenuItemsForActionsOfType(parent, actions,
-					ObjectActionType.DEBUG);
+					ActionType.DEBUG);
 		}
 	}
 
@@ -99,7 +99,7 @@ public class CssMenuBuilder  {
     }
 
     private void addMenuItemsForActionsOfType(CssMenuItem parent,
-			List<ObjectAction> actions, final ObjectActionType type) {
+			List<ObjectAction> actions, final ActionType type) {
 		Collection<ObjectAction> filterActionsOfType = Collections2.filter(actions, Actions.ofType(type));
 		for (ObjectAction action : filterActionsOfType) {
 			addMenuItem(parent, action);
@@ -111,7 +111,7 @@ public class CssMenuBuilder  {
 	}
 
 	private void addMenuItem(CssMenuItem parent, ObjectAction action) {
-		if (action.getType() == ObjectActionType.SET) {
+		if (action.getType() == ActionType.SET) {
 			addMenuItemForActionSet(parent, action);
 		} else {
 			addMenuItemForAction(parent, action);
@@ -147,7 +147,7 @@ public class CssMenuBuilder  {
 
 	/**
 	 * It's a bit hokey to have to do this, but the
-	 * {@link ObjectSpecification#getServiceActionsReturning(ObjectActionType...)
+	 * {@link ObjectSpecification#getServiceActionsReturning(ActionType...)
 	 * method we call} on {@link ObjectSpecification}, while nicely
 	 * traversing the services for us, unfortunately does not pass us back the
 	 * service adapters also.

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java Thu Dec 30 12:29:53 2010
@@ -29,7 +29,7 @@ import java.util.List;
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java Thu Dec 30 12:29:53 2010
@@ -40,9 +40,9 @@ import com.google.common.collect.Lists;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.object.ident.icon.IconFacet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -394,16 +394,16 @@ public class EntityLink extends FormComp
     private static List<ObjectAction> findServiceActionsFor(
             ObjectSpecification scalarTypeSpec) {
         List<ObjectAction> actionList = Lists.newArrayList();
-        addServiceActionsFor(scalarTypeSpec, ObjectActionType.USER, actionList);
+        addServiceActionsFor(scalarTypeSpec, ActionType.USER, actionList);
         if (IsisContext.getDeploymentType() == DeploymentType.EXPLORATION) {
             addServiceActionsFor(scalarTypeSpec,
-                    ObjectActionType.EXPLORATION, actionList);
+                    ActionType.EXPLORATION, actionList);
         }
         return actionList;
     }
 
     private static void addServiceActionsFor(ObjectSpecification noSpec,
-            ObjectActionType actionType, List<ObjectAction> actionList) {
+            ActionType actionType, List<ObjectAction> actionList) {
         final List<ObjectAction> serviceActionsFor = noSpec
                 .getServiceActionsReturning(actionType);
         actionList.addAll(serviceActionsFor);

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java Thu Dec 30 12:29:53 2010
@@ -32,9 +32,9 @@ import com.google.common.collect.Lists;
 
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -152,7 +152,7 @@ public abstract class ProcessObjectPanel
 		final ObjectSpecification typeOfSpec = getModel()
 				.getTypeOfSpecification();
 		ObjectAction action = typeOfSpec.getObjectAction(
-			ObjectActionType.USER, actionId);
+			ActionType.USER, actionId);
 		final ObjectAdapterMemento adapterMemento = getModel()
 				.getObjectAdapterMemento();
 		final ActionMemento actionMemento = new ActionMemento(action);

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java Thu Dec 30 12:29:53 2010
@@ -47,10 +47,10 @@ import org.apache.isis.applib.Identifier
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.ui.fixtures.ActionFixtures;
 import org.apache.isis.viewer.wicket.ui.fixtures.AdapterFixtures;
@@ -124,7 +124,7 @@ public class CssMenuUtilsTest {
 		new AdapterFixtures(context).getOid(mockAdapter, mockOid);
 		new ActionFixtures(context).getOnType(mockUserAction, mockUserActionOnTypeSpec);
 		new SpecFixtures(context).getFullName(mockUserActionOnTypeSpec, Customers.class.getName());
-		new ActionFixtures(context).getType(mockUserAction, ObjectActionType.USER);
+		new ActionFixtures(context).getType(mockUserAction, ActionType.USER);
 		new ActionFixtures(context).getIdentifier(context, mockUserAction, Identifier.actionIdentifier(Customers.class, "findCustomers", new Class[0]));
 
 		new SystemFixtures(context).newLink(mockLinkBuilder, "linkId", mockAdapterMemento, mockUserAction, fakeLink);

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java Thu Dec 30 12:29:53 2010
@@ -23,11 +23,11 @@ package org.apache.isis.viewer.wicket.ui
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.ConsentAbstract;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.consent2.ConsentAbstract;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 
@@ -66,7 +66,7 @@ public final class ActionFixtures {
 		});
 	}
 
-	public void getType(final ObjectAction mockAction, final ObjectActionType returns) {
+	public void getType(final ObjectAction mockAction, final ActionType returns) {
 		context.checking(new Expectations() {
 			{
 				allowing(mockAction).getType();

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java Thu Dec 30 12:29:53 2010
@@ -36,7 +36,7 @@ public final class SpecFixtures {
 			final String returns) {
 		context.checking(new Expectations() {
 			{
-				allowing(mockNoSpec).getFullName();
+				allowing(mockNoSpec).getFullIdentifier();
 				will(returnValue(returns));
 			}
 		});

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java Thu Dec 30 12:29:53 2010
@@ -47,7 +47,7 @@ public class ImageCacheClassPath impleme
 	private Map<String, PackageResource> imagesByName = Maps.newHashMap();
 
 	public PackageResource findImage(ObjectSpecification noSpec) {
-		String specFullName = noSpec.getFullName();
+		String specFullName = noSpec.getFullIdentifier();
 		PackageResource packageResource = findImage(specFullName);
 		if (packageResource != null) {
 			return packageResource;
@@ -85,21 +85,21 @@ public class ImageCacheClassPath impleme
 
 	private synchronized PackageResource findAndCacheImage(ObjectSpecification noSpec) {
 	    PackageResource packageResource = findImageSearchUpHierarchy(noSpec);
-		imagesByName.put(noSpec.getFullName(), packageResource);
+		imagesByName.put(noSpec.getFullIdentifier(), packageResource);
 		return packageResource;
 	}
 
 	private PackageResource findImageSearchUpHierarchy(
 			ObjectSpecification noSpec) {
 		for(String imageSuffix : IMAGE_SUFFICES) {
-			String fullName = noSpec.getFullName();
+			String fullName = noSpec.getFullIdentifier();
 			String path = buildImagePath(fullName, imageSuffix);
 			if (PackageResource.exists(Images.class, path, null, null)) {
 				return PackageResource.get(Images.class, path);
 			}
 		}
 		for (String imageSuffix : IMAGE_SUFFICES) {
-			String shortName = noSpec.getShortName();
+			String shortName = noSpec.getShortIdentifier();
 			String path = buildImagePath(shortName, imageSuffix);
 			if (PackageResource.exists(Images.class, path, null, null)) {
 				return PackageResource.get(Images.class, path);