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 [21/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/dnd/src/main/java/org/apache/isis/viewer/dnd/view/window/ResizeWindowControl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/window/ResizeWindowControl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/window/ResizeWindowControl.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/window/ResizeWindowControl.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.viewer.dnd.view.window;
 
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.view.UserAction;
@@ -54,8 +54,8 @@ public class ResizeWindowControl extends
                 return "";
             }
 
-            public ObjectActionType getType() {
-                return ObjectActionType.USER;
+            public ActionType getType() {
+                return ActionType.USER;
             }
 
             public String getName(final View view) {

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/ApplicationOptions.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/ApplicationOptions.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/ApplicationOptions.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/ApplicationOptions.java Thu Dec 30 12:29:53 2010
@@ -20,9 +20,9 @@
 
 package org.apache.isis.viewer.dnd.viewer;
 
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.viewer.dnd.drawing.Location;
 import org.apache.isis.viewer.dnd.drawing.Size;
 import org.apache.isis.viewer.dnd.help.AboutView;

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java Thu Dec 30 12:29:53 2010
@@ -26,14 +26,14 @@ import java.util.Set;
 import java.util.Vector;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectList;
 import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.spec.ActionType;
+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.metamodel.spec.feature.ObjectActionType;
 import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
@@ -373,7 +373,7 @@ public final class ApplicationWorkspace 
 
         menuForChangingUsers(options);
         
-        options.add(new UserActionAbstract("Save User Profile", ObjectActionType.USER) {
+        options.add(new UserActionAbstract("Save User Profile", ActionType.USER) {
             @Override
             public void execute(final Workspace workspace, final View view, final Location at) {
                 Feedback feedbackManager = getFeedbackManager();
@@ -386,7 +386,7 @@ public final class ApplicationWorkspace 
     }
 
     private void menuForChangingLook(UserActionSet options) {
-        final UserActionSet set = options.addNewActionSet("Change Look", ObjectActionType.USER);
+        final UserActionSet set = options.addNewActionSet("Change Look", ActionType.USER);
         for (Look look : LookFactory.getAvailableLooks()) {
             menuOptionForChangingLook(set, look, look.getName());
         }
@@ -415,7 +415,7 @@ public final class ApplicationWorkspace 
             MultiUserExplorationSession session = (MultiUserExplorationSession) getAuthenticationSession();
 
             Set<String> users = session.getUserNames();
-            final UserActionSet set = options.addNewActionSet("Change user", ObjectActionType.EXPLORATION);
+            final UserActionSet set = options.addNewActionSet("Change user", ActionType.EXPLORATION);
             for (String user : users) {
                 menuOptionForChangingUser(set, user, session.getUserName());
             }

Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/MinimizedView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/MinimizedView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/MinimizedView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/MinimizedView.java Thu Dec 30 12:29:53 2010
@@ -22,9 +22,9 @@ package org.apache.isis.viewer.dnd.viewe
 
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.dnd.drawing.Canvas;
 import org.apache.isis.viewer.dnd.drawing.Color;
 import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
@@ -77,8 +77,8 @@ public class MinimizedView extends Abstr
                     return "Close view";
                 }
 
-                public ObjectActionType getType() {
-                    return ObjectActionType.USER;
+                public ActionType getType() {
+                    return ActionType.USER;
                 }
             }, target);
         }
@@ -119,8 +119,8 @@ public class MinimizedView extends Abstr
                     return "Restore view";
                 }
 
-                public ObjectActionType getType() {
-                    return ObjectActionType.USER;
+                public ActionType getType() {
+                    return ActionType.USER;
                 }
             }, target);
         }

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyContent.java Thu Dec 30 12:29:53 2010
@@ -23,8 +23,8 @@ package org.apache.isis.viewer.dnd;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.dnd.drawing.Image;
 import org.apache.isis.viewer.dnd.view.Content;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java Thu Dec 30 12:29:53 2010
@@ -26,8 +26,8 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 import org.apache.isis.core.runtime.userprofile.Options;
 import org.apache.isis.viewer.dnd.drawing.Bounds;
 import org.apache.isis.viewer.dnd.drawing.Canvas;

Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/content/TextParseableField_ParseTextEntry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/content/TextParseableField_ParseTextEntry.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/content/TextParseableField_ParseTextEntry.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/content/TextParseableField_ParseTextEntry.java Thu Dec 30 12:29:53 2010
@@ -31,11 +31,11 @@ import org.junit.runner.RunWith;
 import org.apache.isis.core.commons.filters.Filter;
 import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Veto;
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.consent2.Allow;
+import org.apache.isis.core.metamodel.consent2.Veto;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
-import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions2.ValidatingInteractionAdvisor;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.testsystem.TestProxySystem;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/CollectionView.java Thu Dec 30 12:29:53 2010
@@ -56,7 +56,7 @@ public class CollectionView implements A
         content.setTitle(titleString, null);
         String iconName = collection.getIconName();
         if (iconName == null) {
-            iconName = elementSpecification.getShortName();
+            iconName = elementSpecification.getShortIdentifier();
         }
         content.setIconName(iconName);
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectView.java Thu Dec 30 12:29:53 2010
@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.SpecificationFacets;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationFacets;
 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;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/ObjectViewAbstract.java Thu Dec 30 12:29:53 2010
@@ -60,7 +60,7 @@ public abstract class ObjectViewAbstract
 
         String iconName = adapter.getIconName();
         if (iconName == null) {
-            iconName = adapter.getSpecification().getShortName();
+            iconName = adapter.getSpecification().getShortIdentifier();
         }
 
         content.setIconName(iconName);

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java Thu Dec 30 12:29:53 2010
@@ -26,10 +26,10 @@ import java.util.List;
 import com.google.inject.internal.Lists;
 
 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.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.viewer.html.component.Component;
 import org.apache.isis.viewer.html.context.Context;
@@ -39,9 +39,9 @@ public class MenuUtil {
 
     public static Component[] menu(final ObjectAdapter target, final String targetObjectId, final Context context) {
         final ObjectSpecification specification = target.getSpecification();
-        final List<ObjectAction> actions1 = specification.getObjectActions(ObjectActionType.USER);
-        final List<ObjectAction> actions2 = specification.getObjectActions(ObjectActionType.EXPLORATION);
-        final List<ObjectAction> actions3 = specification.getObjectActions(ObjectActionType.PROTOTYPE);
+        final List<ObjectAction> actions1 = specification.getObjectActions(ActionType.USER);
+        final List<ObjectAction> actions2 = specification.getObjectActions(ActionType.EXPLORATION);
+        final List<ObjectAction> actions3 = specification.getObjectActions(ActionType.PROTOTYPE);
         final List<ObjectAction> actions = concat(concat(actions1, actions2), actions3);
         final Component[] menuItems = createMenu("Actions", target, actions, context, targetObjectId);
         return menuItems;
@@ -75,9 +75,9 @@ public class MenuUtil {
                     continue;
                 }
                 
-                if (action.getType() == ObjectActionType.USER) {
+                if (action.getType() == ActionType.USER) {
                 	// carry on, process this action
-                } else if (action.getType() == ObjectActionType.EXPLORATION) {
+                } else if (action.getType() == ActionType.EXPLORATION) {
                 	boolean isExploring = IsisContext.getDeploymentType().isExploring();
 					if (isExploring) {
                 		// carry on, process this action
@@ -85,7 +85,7 @@ public class MenuUtil {
                     	// ignore this action, skip onto next
                 		continue;
                 	}
-                } else if (action.getType() == ObjectActionType.PROTOTYPE) {
+                } else if (action.getType() == ActionType.PROTOTYPE) {
                 	boolean isPrototyping = IsisContext.getDeploymentType().isPrototyping();
 					if (isPrototyping) {
                 		// carry on, process this action
@@ -93,7 +93,7 @@ public class MenuUtil {
                     	// ignore this action, skip onto next
                 		continue;
                 	}
-                } else if (action.getType() == ObjectActionType.DEBUG) {
+                } else if (action.getType() == ActionType.DEBUG) {
                 	// TODO: show if debug "gesture" present
                 } else {
                 	// ignore this action, skip onto next

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/ComponentFactory.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.html.component;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 
 
@@ -55,7 +55,7 @@ public interface ComponentFactory {
             String name,
             String description,
             String reasonDisabled,
-            ObjectActionType type,
+            ActionType type,
             boolean hasParameters,
             String targetObjectId);
 

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/CollectionIcon.java Thu Dec 30 12:29:53 2010
@@ -43,6 +43,7 @@ public class CollectionIcon implements C
         this.id = id;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         final TypeOfFacet facet = collection.getSpecification().getFacet(TypeOfFacet.class);
         final Class<?> elementType = facet.value();
@@ -61,7 +62,7 @@ public class CollectionIcon implements C
         writer.print("><img src=\"");
         writer.print(ImageLookup.image(elementSpecification));
         writer.print("\" alt=\"");
-        final String singularName = elementSpecification.getName();
+        final String singularName = elementSpecification.getSingularName();
         writer.print(singularName);
         writer.print(" collection\" />");
         writer.print(collection.titleString());

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlComponentFactory.java Thu Dec 30 12:29:53 2010
@@ -29,7 +29,7 @@ import java.io.InputStreamReader;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -120,7 +120,7 @@ public class HtmlComponentFactory implem
             final String name,
             final String description,
             final String reasonDisabled,
-            final ObjectActionType type,
+            final ActionType type,
             final boolean hasParameters,
             final String targetObjectId) {
         return new MenuItem(actionId, name, description, reasonDisabled, type, hasParameters, targetObjectId);

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlForm.java Thu Dec 30 12:29:53 2010
@@ -101,7 +101,7 @@ public class HtmlForm extends ComponentC
             final String selected = (value != null && value.toLowerCase().equals("true")) ? "checked " : "";
             inputField = "<input class=\"value\" type=\"checkbox\" name=\"" + field + "\"" + selected + " value=\"true\"/>";
             ignoreMandatory = true;
-        } else if (spec.getFullName().endsWith(".Password")) {
+        } else if (spec.getFullIdentifier().endsWith(".Password")) {
             final String typicalLengthStr = typicalLength == 0 ? "" : (" size=\"" + typicalLength + "\"");
             final String maxLengthStr = maxLength == 0 ? "" : (" maxlength=\"" + maxLength + "\"");
             inputField = "<input class=\"value\" type=\"password\" name=\"" + field + "\"" + typicalLengthStr + maxLengthStr

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.html.comp
 
 import java.io.PrintWriter;
 
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.ActionType;
 import org.apache.isis.viewer.html.component.Component;
 
 
@@ -33,14 +33,14 @@ public class MenuItem implements Compone
     private final String actionDescription;
     private final String reasonDisabled;
     private final boolean takesParameters;
-    private final ObjectActionType type;
+    private final ActionType type;
 
     public MenuItem(
             final String actionId,
             final String actionName,
             final String actionDescription,
             final String reasonDisabled,
-            final ObjectActionType type,
+            final ActionType type,
             final boolean takesParameters,
             final String objectId) {
         this.actionId = actionId;
@@ -86,7 +86,7 @@ public class MenuItem implements Compone
         writer.print("&amp;action=");
         writer.print(actionId);
         writer.print("\">");
-        if (type == ObjectActionType.EXPLORATION) {
+        if (type == ActionType.EXPLORATION) {
             writer.print("[");
             writer.print(actionName);
             writer.print("]");

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java Thu Dec 30 12:29:53 2010
@@ -42,6 +42,7 @@ public class ObjectIcon implements Compo
         this.style = style;
     }
 
+    @Override
     public void write(final PrintWriter writer) {
         writer.print("<div class=\"");
         writer.print(style);
@@ -59,7 +60,7 @@ public class ObjectIcon implements Compo
         writer.print("\"><img src=\"");
         writer.print(ImageLookup.image(element));
         writer.print("\" alt=\"");
-        final String singularName = element.getSpecification().getName();
+        final String singularName = element.getSpecification().getSingularName();
         writer.print(singularName);
         writer.print("\"");
         writer.print("/>");

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java Thu Dec 30 12:29:53 2010
@@ -44,17 +44,20 @@ public class PersistentObjectMapping imp
         version = adapter.getVersion();
     }
 
+    @Override
     public void debug(final DebugString debug) {
-        debug.appendln(specification.getFullName());
+        debug.appendln(specification.getFullIdentifier());
         if (version != null) {
             debug.appendln(version.toString());
         }
     }
 
+    @Override
     public Oid getOid() {
         return oid;
     }
 
+    @Override
     public ObjectAdapter getObject() {
         return getPersistenceSession().loadObject(oid, specification);
     }
@@ -74,22 +77,26 @@ public class PersistentObjectMapping imp
 
     @Override
     public String toString() {
-        return (specification == null ? "null" : specification.getName()) + " : " + oid + " : " + version;
+        return (specification == null ? "null" : specification.getSingularName()) + " : " + oid + " : " + version;
     }
 
+    @Override
     public Version getVersion() {
         return version;
     }
 
+    @Override
     public void checkVersion(final ObjectAdapter object) {
         object.checkLock(getVersion());
     }
 
+    @Override
     public void updateVersion() {
         final ObjectAdapter adapter = getAdapterManager().getAdapterFor(oid);
         version = adapter.getVersion();
     }
 
+    @Override
     public void restoreToLoader() {
         final Oid oid = getOid();
         final ObjectAdapter adapter = getPersistenceSession().recreateAdapter(oid, specification);

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java Thu Dec 30 12:29:53 2010
@@ -59,7 +59,7 @@ public abstract class ImageProviderAbstr
             return image((String)null);
         }
         
-        final String specShortName = specification.getShortName();
+        final String specShortName = specification.getShortIdentifier();
         final String imageName = image(specShortName);
         if (imageName != null) {
             return imageName;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java Thu Dec 30 12:29:53 2010
@@ -79,7 +79,7 @@ public class ImageProviderDirectoryBased
     }
 
     private String findImage(final ObjectSpecification specification) {
-        final String name = specification.getShortName();
+        final String name = specification.getShortIdentifier();
         final String fileName = imageFile(name);
         if (fileName != null) {
             images.put(name, fileName);
@@ -111,7 +111,7 @@ public class ImageProviderDirectoryBased
     }
 
     public String image(final ObjectSpecification specification) {
-        final String name = specification.getShortName();
+        final String name = specification.getShortIdentifier();
         final String imageName = (String) images.get(name);
         if (imageName != null) {
             return imageName;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java Thu Dec 30 12:29:53 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.viewer.html.task;
 
 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.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java Thu Dec 30 12:29:53 2010
@@ -22,16 +22,16 @@ package org.apache.isis.viewer.html.task
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.adapter.AdapterUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.util.AdapterUtils;
+import org.apache.isis.core.metamodel.consent2.Consent;
 import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
 import org.apache.isis.core.metamodel.facets.propparam.typicallength.TypicalLengthFacet;
 import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.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;
@@ -96,7 +96,7 @@ public class EditTask extends Task {
         }
 
         final boolean isNew = object.getResolveState() == ResolveState.TRANSIENT;
-        newType = isNew ? getTarget(context).getSpecification().getName() : null;
+        newType = isNew ? getTarget(context).getSpecification().getSingularName() : null;
     }
 
     @Override
@@ -147,7 +147,7 @@ public class EditTask extends Task {
 
         if (targetAdapter.isTransient()) {
             final ObjectAction action = 
-                targetAdapter.getSpecification().getObjectAction(ObjectActionType.USER, "save", ObjectSpecification.EMPTY_LIST);
+                targetAdapter.getSpecification().getObjectAction(ActionType.USER, "save", ObjectSpecification.EMPTY_LIST);
             if (action == null) {
                 getPersistenceSession().makePersistent(targetAdapter);
             } else {

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java Thu Dec 30 12:29:53 2010
@@ -106,7 +106,7 @@ public final class InvokeMethod implemen
             } else if (result.getSpecification().isNotCollection()) {
                     forwardObjectResult(request, context, result);
             } else {
-                throw new UnknownTypeException(result.getSpecification().getFullName());
+                throw new UnknownTypeException(result.getSpecification().getFullIdentifier());
             }
         }
     }

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java Thu Dec 30 12:29:53 2010
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.isis.core.commons.debug.DebugString;
 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.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java Thu Dec 30 12:29:53 2010
@@ -24,9 +24,9 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
+import org.apache.isis.core.metamodel.facets.SpecificationFacets;
 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.SpecificationFacets;
 import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.viewer.html.component.Page;
@@ -145,7 +145,7 @@ public abstract class Task {
         debug.indent();
         for (int i = 0; i < names.length; i++) {
             final String status = (readOnly[i] ? "R" : "-") + (optional[i] ? "O" : "M") + (errors[i] == null ? "-" : "E");
-            debug.appendln("    " + i + "  " + names[i] + " (" + status + "):  " + fieldSpecifications[i].getFullName() + " -> "
+            debug.appendln("    " + i + "  " + names[i] + " (" + status + "):  " + fieldSpecifications[i].getFullIdentifier() + " -> "
                     + entryText[i]);
         }
         debug.unindent();

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java Thu Dec 30 12:29:53 2010
@@ -156,7 +156,7 @@ public final class TaskStep implements A
         content.setTitle(titleString, targetAdapter.getSpecification().getDescription());
         String iconName = targetAdapter.getIconName();
         if (iconName == null) {
-            iconName = targetAdapter.getSpecification().getShortName();
+            iconName = targetAdapter.getSpecification().getShortIdentifier();
         }
         content.setIconName(iconName);
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java Thu Dec 30 12:29:53 2010
@@ -4,7 +4,7 @@
 package org.apache.isis.viewer.restful.viewer.facets;
 
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java Thu Dec 30 12:29:53 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions2.DisablingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java Thu Dec 30 12:29:53 2010
@@ -4,7 +4,7 @@ import java.text.MessageFormat;
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java Thu Dec 30 12:29:53 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions2.HidingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java Thu Dec 30 12:29:53 2010
@@ -2,7 +2,7 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java Thu Dec 30 12:29:53 2010
@@ -2,7 +2,7 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.ImperativeFacetUtils;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetValidating.java Thu Dec 30 12:29:53 2010
@@ -2,8 +2,8 @@ package org.apache.isis.viewer.restful.v
 
 import nu.xom.Element;
 
-import org.apache.isis.core.metamodel.facets.Facet;
-import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.interactions2.ValidatingInteractionAdvisor;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
 
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java Thu Dec 30 12:29:53 2010
@@ -26,13 +26,13 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 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.FacetFilters;
-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.FacetFilters;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+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.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;
@@ -54,10 +54,10 @@ import org.apache.isis.viewer.restful.vi
 
 public abstract class ResourceAbstract {
 
-    public final static ObjectActionType[] ACTION_TYPES = { 
-    	ObjectActionType.USER,
-        ObjectActionType.DEBUG, 
-        ObjectActionType.EXPLORATION,
+    public final static ActionType[] ACTION_TYPES = { 
+    	ActionType.USER,
+        ActionType.DEBUG, 
+        ActionType.EXPLORATION,
         // SET is excluded; we simply flatten contributed actions.
     };
 
@@ -198,7 +198,7 @@ public abstract class ResourceAbstract {
 
         value = xhtmlRenderer.aHref(MessageFormat.format("{0}/object/{1}", getServletRequest().getContextPath(), oidStr), oidStr, "object", "object", HtmlClass.OID);
         createRow(table, "OID", value, HtmlClass.OID);
-        final String noSpecFullName = noSpec.getFullName();
+        final String noSpecFullName = noSpec.getFullIdentifier();
 
         final String uri = MessageFormat.format("{0}/specs/{1}", getServletRequest().getContextPath(), noSpecFullName);
         value = xhtmlRenderer.aHref(uri, noSpecFullName, "spec", "object", HtmlClass.SPECIFICATION);

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java Thu Dec 30 12:29:53 2010
@@ -14,15 +14,15 @@ import nu.xom.Element;
 
 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.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
+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.metamodel.spec.feature.ObjectFeature;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -152,7 +152,7 @@ public class ObjectResourceImpl extends 
         final ObjectSpecification noSpec = nakedObject.getSpecification();
 
         final List<ObjectAction> actions = new ArrayList<ObjectAction>();
-        for (final ObjectActionType type : ResourceAbstract.ACTION_TYPES) {
+        for (final ActionType type : ResourceAbstract.ACTION_TYPES) {
             final List<ObjectAction> actionsForType = ActionUtils.flattened(noSpec.getObjectActions(type));
             actions.addAll(actionsForType);
         }
@@ -494,15 +494,15 @@ public class ObjectResourceImpl extends 
 	// TODO: this is horrid - shouldn't have to search in this way...
     private ObjectAction getObjectAction(final ObjectSpecification noSpec, final String actionId) {
         ObjectAction action = null;
-        action = noSpec.getObjectAction(ObjectActionType.USER, actionId);
+        action = noSpec.getObjectAction(ActionType.USER, actionId);
         if (action != null) {
             return action;
         }
-        action = noSpec.getObjectAction(ObjectActionType.EXPLORATION, actionId);
+        action = noSpec.getObjectAction(ActionType.EXPLORATION, actionId);
         if (action != null) {
             return action;
         }
-        action = noSpec.getObjectAction(ObjectActionType.DEBUG, actionId);
+        action = noSpec.getObjectAction(ActionType.DEBUG, actionId);
         if (action != null) {
             return action;
         }

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java Thu Dec 30 12:29:53 2010
@@ -23,7 +23,7 @@ public final class TableColumnNakedObjec
 
     @Override
     public Element doTd(final T association) {
-        final String assocTypeFullName = association.getSpecification().getFullName();
+        final String assocTypeFullName = association.getSpecification().getFullIdentifier();
         final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), assocTypeFullName);
         return xhtmlRenderer.aHref(uri, assocTypeFullName, "propertyTypeSpec", "property", HtmlClass.PROPERTY);
     }

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java Thu Dec 30 12:29:53 2010
@@ -4,7 +4,7 @@ import nu.xom.Element;
 
 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.ObjectMember;
 import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
 import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java Thu Dec 30 12:29:53 2010
@@ -27,7 +27,7 @@ public class TableColumnNakedObjectActio
     public Element doTd(final ObjectAction nakedObjectAction) {
         final String actionId = nakedObjectAction.getIdentifier().toNameParmsIdentityString();
         final String memberType = "action";
-        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullName(), memberType, actionId);
+        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(), memberType, actionId);
         return new Element(xhtmlRenderer.aHref(uri, nakedObjectAction.getName(), "actionSpec", memberType, HtmlClass.ACTION));
     }
 

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java Thu Dec 30 12:29:53 2010
@@ -22,7 +22,7 @@ public final class TableColumnNakedObjec
 
     @Override
     public Element doTd(final ObjectAction action) {
-        final String returnTypeFullName = action.getReturnType().getFullName();
+        final String returnTypeFullName = action.getReturnType().getFullIdentifier();
         final String uri = MessageFormat.format("{0}/specs/{1}", getContextPath(), returnTypeFullName);
         return xhtmlRenderer.aHref(uri, returnTypeFullName, "actionReturnTypeSpec", "action", HtmlClass.ACTION);
     }

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java Thu Dec 30 12:29:53 2010
@@ -27,7 +27,7 @@ public class TableColumnOneToManyAssocia
     public Element doTd(final OneToManyAssociation oneToManyAssociation) {
         final String memberName = oneToManyAssociation.getIdentifier().getMemberName();
         final String memberType = "collection";
-        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullName(), memberType,
+        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(), memberType,
                 memberName);
         return new Element(xhtmlRenderer.aHref(uri, oneToManyAssociation.getName(), "propertySpec", memberType,
                 HtmlClass.COLLECTION));

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java Thu Dec 30 12:29:53 2010
@@ -27,7 +27,7 @@ public class TableColumnOneToOneAssociat
     public Element doTd(final OneToOneAssociation oneToOneAssociation) {
         final String memberName = oneToOneAssociation.getIdentifier().getMemberName();
         final String memberType = "property";
-        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullName(), memberType,
+        final String uri = MessageFormat.format("{0}/specs/{1}/{2}/{3}", getContextPath(), getNoSpec().getFullIdentifier(), memberType,
                 memberName);
         return new Element(xhtmlRenderer.aHref(uri, oneToOneAssociation.getName(), "propertySpec", memberType, HtmlClass.PROPERTY));
     }

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java Thu Dec 30 12:29:53 2010
@@ -13,10 +13,10 @@ import javax.ws.rs.WebApplicationExcepti
 import nu.xom.Element;
 
 import org.apache.isis.applib.Identifier;
+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.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -53,7 +53,7 @@ public class SpecsResourceImpl extends R
         final Element ul = xhtmlRenderer.ul(HtmlClass.SPECIFICATIONS);
         final ObjectSpecification[] allSpecifications = getSpecificationLoader().allSpecifications();
         for (final ObjectSpecification spec : sorted(allSpecifications)) {
-            final String specFullName = spec.getFullName();
+            final String specFullName = spec.getFullIdentifier();
             final String uri = MessageFormat.format("{0}/specs/{1}", getServletRequest().getContextPath(), specFullName);
             ul.appendChild(xhtmlRenderer.li_a(uri, specFullName, "spec", "specs", HtmlClass.SPECIFICATION));
         }
@@ -72,7 +72,7 @@ public class SpecsResourceImpl extends R
 			@Override
             public int compare(ObjectSpecification o1,
 					ObjectSpecification o2) {
-				return o1.getFullName().compareTo(o2.getFullName());
+				return o1.getFullIdentifier().compareTo(o2.getFullIdentifier());
 			}});
 		return noSpecs;
 	}
@@ -93,7 +93,7 @@ public class SpecsResourceImpl extends R
 
         final ObjectSpecification noSpec = getSpecification(specFullName);
 
-        xhtml.appendToBody(asDivTableFacets(noSpec, noSpec.getFullName()));
+        xhtml.appendToBody(asDivTableFacets(noSpec, noSpec.getFullIdentifier()));
 
         final Element propertiesDivEl = asDivProperties(noSpec);
         xhtml.appendToBody(propertiesDivEl);
@@ -101,7 +101,7 @@ public class SpecsResourceImpl extends R
         final Element collectionsDivEl = asDivCollections(noSpec);
         xhtml.appendToBody(collectionsDivEl);
 
-        for (final ObjectActionType type : ACTION_TYPES) {
+        for (final ActionType type : ACTION_TYPES) {
             final Element actionsDivEl = asDivActions(noSpec, type);
             xhtml.appendToBody(actionsDivEl);
         }
@@ -118,7 +118,7 @@ public class SpecsResourceImpl extends R
         for (final ObjectAssociation property : properties) {
             final String propertyId = property.getIdentifier().getMemberName();
             final String path = MessageFormat.format("{0}/specs/{1}/property/{2}", getServletRequest().getContextPath(), noSpec
-                    .getFullName(), propertyId);
+                    .getFullIdentifier(), propertyId);
             final Element li = xhtmlRenderer.li_a(path, propertyId, "property", "spec", HtmlClass.PROPERTY);
             ul.appendChild(li);
         }
@@ -134,14 +134,14 @@ public class SpecsResourceImpl extends R
         for (final ObjectAssociation collection : collections) {
             final String collectionId = collection.getIdentifier().getMemberName();
             final String path = MessageFormat.format("{0}/specs/{1}/collection/{2}", getServletRequest().getContextPath(), noSpec
-                    .getFullName(), collectionId);
+                    .getFullIdentifier(), collectionId);
             final Element li = xhtmlRenderer.li_a(path, collectionId, "collection", "spec", HtmlClass.COLLECTION);
             ul.appendChild(li);
         }
         return div;
     }
 
-    private Element asDivActions(final ObjectSpecification noSpec, final ObjectActionType type) {
+    private Element asDivActions(final ObjectSpecification noSpec, final ActionType type) {
         final Element div = xhtmlRenderer.div_p(type.name() + " actions", HtmlClass.ACTIONS);
 
         final List<ObjectAction> actions = ActionUtils.flattened(noSpec.getObjectActions(type));
@@ -150,7 +150,7 @@ public class SpecsResourceImpl extends R
         for (final ObjectAction action : actions) {
             final Identifier actionIdentifier = action.getIdentifier();
             final String actionId = actionIdentifier.toNameParmsIdentityString();
-            final String noSpecFullName = noSpec.getFullName();
+            final String noSpecFullName = noSpec.getFullIdentifier();
             final String uri = MessageFormat.format("{0}/specs/{1}/action/{2}", getServletRequest().getContextPath(), noSpecFullName, actionId);
             final Element li = xhtmlRenderer.li_a(uri, actionId, "action", "spec", HtmlClass.ACTION);
             ul.appendChild(li);

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java Thu Dec 30 12:29:53 2010
@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.google.inject.internal.Lists;
 
+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;
 
 
 public final class ActionUtils {
@@ -16,7 +16,7 @@ public final class ActionUtils {
     public static List<ObjectAction> flattened(final List<ObjectAction> objectActions) {
         final List<ObjectAction> actions = Lists.newArrayList();
         for (final ObjectAction action : objectActions) {
-            if (action.getType() == ObjectActionType.SET) {
+            if (action.getType() == ActionType.SET) {
                 final ObjectActionSet actionSet = (ObjectActionSet) action;
                 final List<ObjectAction> subActions = actionSet.getActions();
                 for (final ObjectAction subAction : subActions) {

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Thu Dec 30 12:29:53 2010
@@ -43,7 +43,7 @@ import org.apache.isis.core.commons.exce
 import org.apache.isis.core.commons.factory.InstanceFactory;
 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.facetapi.Facet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -279,7 +279,7 @@ public class Dispatcher {
             ObjectSpecification specification,
             String name,
             String extension) {
-        String className = specification.getShortName();
+        String className = specification.getShortIdentifier();
         String fileName = context.findFile("/" + className + "/" + name + "." + extension);
         if (fileName == null) {
             List<ObjectSpecification> interfaces = specification.interfaces();

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java Thu Dec 30 12:29:53 2010
@@ -25,8 +25,8 @@ import java.util.List;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 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/context/DefaultOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java Thu Dec 30 12:29:53 2010
@@ -120,7 +120,7 @@ public class DefaultOidObjectMapping imp
                 // outputStream.flush();
             }
             boolean isTransient = object.isTransient();
-            String id = (isTransient ? "T" : "P") + object.getSpecification().getFullName() + "@" + encodedOid;
+            String id = (isTransient ? "T" : "P") + object.getSpecification().getFullIdentifier() + "@" + encodedOid;
             LOG.debug("encoded " + oid + " as " + id + " ~ " + encodedOid);
             if (isTransient) {
                 TransientObjectMapping mapping = new TransientObjectMapping((ObjectAdapter) object);

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java Thu Dec 30 12:29:53 2010
@@ -158,7 +158,7 @@ public class IndirectObjectMapping imple
         }
         
         Map<String, Mapping> map = scopedMappings.get(scope);
-        String id = obj.getSpecification().getShortName() + "@" + nextId();
+        String id = obj.getSpecification().getShortIdentifier() + "@" + nextId();
         map.put(id, mapping);
         return id;
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java Thu Dec 30 12:29:53 2010
@@ -103,7 +103,7 @@ class PersistentObjectMapping implements
     }
 
     public String debug() {
-        return oid + "  " + spec.getShortName() + "  " + IsisContext.getPersistenceSession().getAdapterManager().getAdapterFor(oid);
+        return oid + "  " + spec.getShortIdentifier() + "  " + IsisContext.getPersistenceSession().getAdapterManager().getAdapterFor(oid);
     }
 
     public ObjectAdapter getObject() {

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/SerialOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/SerialOidObjectMapping.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/SerialOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/SerialOidObjectMapping.java Thu Dec 30 12:29:53 2010
@@ -71,7 +71,7 @@ public class SerialOidObjectMapping impl
 
         SerialOid oid = (SerialOid) ((ObjectAdapter) object).getOid();
         boolean isTransient = oid.isTransient();
-        String id = (isTransient ? "T" : "P") + object.getSpecification().getFullName() + "@"
+        String id = (isTransient ? "T" : "P") + object.getSpecification().getFullIdentifier() + "@"
                 + Long.toString(oid.getSerialNo(), RADIX);
         if (isTransient) {
             transients.put(id, new TransientObjectMapping((ObjectAdapter) object));

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java Thu Dec 30 12:29:53 2010
@@ -28,12 +28,12 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.filters.AbstractFilter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-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.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.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -95,7 +95,7 @@ public class DebugAction implements Acti
         DebugString str = new DebugString();
         Dump.adapter(object, str);
         Dump.graph(object, str, IsisContext.getAuthenticationSession());
-        view.divider(object.getSpecification().getFullName());
+        view.divider(object.getSpecification().getFullIdentifier());
         view.appendRow("<pre class=\"debug\">" + str + "</pre>");
     }
 
@@ -115,12 +115,12 @@ public class DebugAction implements Acti
         ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(name);
         DebugString str = new DebugString();
         Dump.specification(spec, str);
-        view.divider(spec.getFullName());
+        view.divider(spec.getFullIdentifier());
         view.appendRow("Hash code", "#" + Integer.toHexString(spec.hashCode()));
         view.appendRow("ID", spec.getIdentifier());
-        view.appendRow("Full name", spec.getFullName());
-        view.appendRow("Short name", spec.getShortName());
-        view.appendRow("Singular name", spec.getName());
+        view.appendRow("Full name", spec.getFullIdentifier());
+        view.appendRow("Short name", spec.getShortIdentifier());
+        view.appendRow("Singular name", spec.getSingularName());
         view.appendRow("Plural name", spec.getPluralName());
         view.appendRow("Description", spec.getDescription());
 
@@ -136,11 +136,11 @@ public class DebugAction implements Acti
         
         List<ObjectAssociation> fields = spec.getAssociations();
         specificationMembers(view, "Fields", fields);
-        List<ObjectAction> userActions = spec.getObjectActions(ObjectActionType.USER);
+        List<ObjectAction> userActions = spec.getObjectActions(ActionType.USER);
         specificationMembers(view, "User Actions", userActions);
-        specificationMembers(view, "Exploration Actions", spec.getObjectActions(ObjectActionType.EXPLORATION));
-        specificationMembers(view, "Prototype Actions", spec.getObjectActions(ObjectActionType.PROTOTYPE));
-        specificationMembers(view, "Debug Actions", spec.getObjectActions(ObjectActionType.DEBUG));
+        specificationMembers(view, "Exploration Actions", spec.getObjectActions(ActionType.EXPLORATION));
+        specificationMembers(view, "Prototype Actions", spec.getObjectActions(ActionType.PROTOTYPE));
+        specificationMembers(view, "Debug Actions", spec.getObjectActions(ActionType.DEBUG));
 
         
         for (int i = 0; i < fields.size(); i++) {
@@ -248,7 +248,7 @@ public class DebugAction implements Acti
         if (specification == null) {
             return "none";
         } else {
-            String name = specification.getFullName();
+            String name = specification.getFullIdentifier();
             return "<a href=\"debug.app?action=specification&name=" + name + "\">" + name + "</a>";
         }
     }
@@ -257,13 +257,13 @@ public class DebugAction implements Acti
         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);
         view.divider("Specifications");
         for (int j = 0; j < names.length; j++) {
             ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(names[j]);
-            String name = spec.getName();
+            String name = spec.getSingularName();
             view.appendRow(name, specificationLink(spec));
         }
     }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java?rev=1053871&r1=1053870&r2=1053871&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java Thu Dec 30 12:29:53 2010
@@ -26,8 +26,8 @@ import java.util.List;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.TextEntryParseException;
 import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.Veto;
+import org.apache.isis.core.metamodel.consent2.Consent;
+import org.apache.isis.core.metamodel.consent2.Veto;
 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;
@@ -65,7 +65,7 @@ public class EditAction implements Actio
             Version formVersion = context.getVersion(version);
             if (formVersion != null && adapterVersion.different(formVersion)) {
                 
-                IsisContext.getMessageBroker().addMessage("The " + adapter.getSpecification().getName() + " was edited " +
+                IsisContext.getMessageBroker().addMessage("The " + adapter.getSpecification().getSingularName() + " was edited " +
                 		"by another user (" + adapterVersion.getUser() +  "). Please  make your changes based on their changes.");
 
                 String view = context.getParameter(ERRORS);

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