incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1200052 - in /incubator/isis/trunk/framework/viewer/json: json-applib/src/main/java/org/apache/isis/viewer/json/applib/ json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ json-applib/src/test/java/org/apache/isis/vie...
Date Thu, 10 Nov 2011 00:04:02 GMT
Author: danhaywood
Date: Thu Nov 10 00:04:01 2011
New Revision: 1200052

URL: http://svn.apache.org/viewvc?rev=1200052&view=rev
Log:
ISIS-109: updates for v0.51

Added:
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionDescriptionRepresentation.java
      - copied, changed from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionParameterDescriptionRepresentation.java
      - copied, changed from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionParameterRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/CollectionDescriptionRepresentation.java
      - copied, changed from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeCollectionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/PropertyDescriptionRepresentation.java
      - copied, changed from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypePropertyRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionIsSubtypeOfRepresentation.java
      - copied, changed from r1198650, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeIsSubtypeOfRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java
      - copied, changed from r1198408, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java
      - copied, changed from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java
      - copied, changed from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java
      - copied, changed from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionIsSubtypeOfReprRenderer.java
      - copied, changed from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java
Removed:
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeIsSubtypeOfRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionParameterRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeCollectionRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypePropertyRepresentation.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java
Modified:
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeResource.java
    incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactoryRegistry.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java Thu Nov 10 00:04:01 2011
@@ -28,13 +28,13 @@ import org.apache.isis.viewer.json.appli
 import org.apache.isis.viewer.json.applib.domainobjects.ObjectCollectionRepresentation;
 import org.apache.isis.viewer.json.applib.domainobjects.ObjectPropertyRepresentation;
 import org.apache.isis.viewer.json.applib.domainobjects.ScalarValueRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeIsSubtypeOfRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.TypeActionIsSubtypeOfRepresentation;
 import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeRepresentation;
 import org.apache.isis.viewer.json.applib.domaintypes.DomainTypesRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.TypeActionParameterRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.TypeActionRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.TypeCollectionRepresentation;
-import org.apache.isis.viewer.json.applib.domaintypes.TypePropertyRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.ActionParameterDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.ActionDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.CollectionDescriptionRepresentation;
+import org.apache.isis.viewer.json.applib.domaintypes.PropertyDescriptionRepresentation;
 import org.apache.isis.viewer.json.applib.homepage.HomePageRepresentation;
 import org.apache.isis.viewer.json.applib.user.UserRepresentation;
 import org.apache.isis.viewer.json.applib.util.Enums;
@@ -53,11 +53,11 @@ public enum RepresentationType {
     ACTION_RESULT(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT, ActionResultRepresentation.class),
     DOMAIN_TYPES(RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPES, DomainTypesRepresentation.class),
     DOMAIN_TYPE(RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPE, DomainTypeRepresentation.class),
-    DOMAIN_TYPE_IS_SUBTYPE_OF(RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPE_IS_SUBTYPE_OF, DomainTypeIsSubtypeOfRepresentation.class), 
-    TYPE_PROPERTY(RestfulMediaType.APPLICATION_JSON_TYPE_PROPERTY, TypePropertyRepresentation.class),
-    TYPE_COLLECTION(RestfulMediaType.APPLICATION_JSON_TYPE_COLLECTION, TypeCollectionRepresentation.class),
-    TYPE_ACTION(RestfulMediaType.APPLICATION_JSON_TYPE_ACTION, TypeActionRepresentation.class),
-    TYPE_ACTION_PARAMETER(RestfulMediaType.APPLICATION_JSON_TYPE_ACTION_PARAMETER, TypeActionParameterRepresentation.class), 
+    PROPERTY_DESCRIPTION(RestfulMediaType.APPLICATION_JSON_PROPERTY_DESCRIPTION, PropertyDescriptionRepresentation.class),
+    COLLECTION_DESCRIPTION(RestfulMediaType.APPLICATION_JSON_COLLECTION_DESCRIPTION, CollectionDescriptionRepresentation.class),
+    ACTION_DESCRIPTION(RestfulMediaType.APPLICATION_JSON_ACTION_DESCRIPTION, ActionDescriptionRepresentation.class),
+    ACTION_PARAMETER_DESCRIPTION(RestfulMediaType.APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION, ActionParameterDescriptionRepresentation.class), 
+    TYPE_ACTION_RESULT(RestfulMediaType.APPLICATION_JSON_TYPEACTION_ISSUBTYPEOF, TypeActionIsSubtypeOfRepresentation.class), 
     ERROR(RestfulMediaType.APPLICATION_JSON_ERROR, ErrorRepresentation.class),
     GENERIC(MediaType.APPLICATION_JSON, JsonRepresentation.class); 
     
@@ -117,7 +117,5 @@ public enum RepresentationType {
             }
         };
     }
-
-    
     
 }

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java Thu Nov 10 00:04:01 2011
@@ -27,7 +27,6 @@ import javax.ws.rs.core.MediaType;
  */
 public final class RestfulMediaType {
     
-    
     private RestfulMediaType(){}
 
     private static final String BASE = MediaType.APPLICATION_JSON + ";profile=urn:org.restfulobjects/";
@@ -44,12 +43,11 @@ public final class RestfulMediaType {
     public final static String APPLICATION_JSON_ACTION_RESULT = BASE + "actionresult"+ "";
     public final static String APPLICATION_JSON_DOMAIN_TYPES = BASE + "domaintypes"+ "";
     public final static String APPLICATION_JSON_DOMAIN_TYPE = BASE + "domaintype"+ "";
-    public final static String APPLICATION_JSON_DOMAIN_TYPE_IS_SUBTYPE_OF = BASE + "domaintypeissubtypeof"+ "";
-    public final static String APPLICATION_JSON_TYPE_PROPERTY = BASE + "typeproperty"+ "";
-    public final static String APPLICATION_JSON_TYPE_COLLECTION = BASE + "typecollection"+ "";
-    public final static String APPLICATION_JSON_TYPE_ACTION = BASE + "typeaction"+ "";
-    public final static String APPLICATION_JSON_TYPE_ACTION_PARAMETER = BASE + "typeactionparameter"+ ""; 
+    public final static String APPLICATION_JSON_TYPEACTION_ISSUBTYPEOF = BASE + "typeaction/issubtypeof"+ "";
+    public final static String APPLICATION_JSON_PROPERTY_DESCRIPTION = BASE + "propertydescription"+ "";
+    public final static String APPLICATION_JSON_COLLECTION_DESCRIPTION = BASE + "collectiondescription"+ "";
+    public final static String APPLICATION_JSON_ACTION_DESCRIPTION = BASE + "actiondescription"+ "";
+    public final static String APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION = BASE + "actionparameterdescription"+ ""; 
     public final static String APPLICATION_JSON_ERROR = BASE + "error"+ "";
-
 
 }

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionDescriptionRepresentation.java (from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionDescriptionRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionDescriptionRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionRepresentation.java&r1=1198408&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionDescriptionRepresentation.java Thu Nov 10 00:04:01 2011
@@ -20,9 +20,9 @@ package org.apache.isis.viewer.json.appl
 
 import org.codehaus.jackson.JsonNode;
 
-public class TypeActionRepresentation extends AbstractTypeMemberRepresentation  {
+public class ActionDescriptionRepresentation extends AbstractTypeMemberRepresentation  {
 
-    public TypeActionRepresentation(JsonNode jsonNode) {
+    public ActionDescriptionRepresentation(JsonNode jsonNode) {
         super(jsonNode);
     }
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionParameterDescriptionRepresentation.java (from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionParameterRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionParameterDescriptionRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionParameterDescriptionRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionParameterRepresentation.java&r1=1198408&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionParameterRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/ActionParameterDescriptionRepresentation.java Thu Nov 10 00:04:01 2011
@@ -20,9 +20,9 @@ package org.apache.isis.viewer.json.appl
 
 import org.codehaus.jackson.JsonNode;
 
-public class TypeActionParameterRepresentation extends AbstractTypeMemberRepresentation {
+public class ActionParameterDescriptionRepresentation extends AbstractTypeMemberRepresentation {
 
-    public TypeActionParameterRepresentation(JsonNode jsonNode) {
+    public ActionParameterDescriptionRepresentation(JsonNode jsonNode) {
         super(jsonNode);
     }
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/CollectionDescriptionRepresentation.java (from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeCollectionRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/CollectionDescriptionRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/CollectionDescriptionRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeCollectionRepresentation.java&r1=1198408&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeCollectionRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/CollectionDescriptionRepresentation.java Thu Nov 10 00:04:01 2011
@@ -20,9 +20,9 @@ package org.apache.isis.viewer.json.appl
 
 import org.codehaus.jackson.JsonNode;
 
-public class TypeCollectionRepresentation extends AbstractTypeMemberRepresentation {
+public class CollectionDescriptionRepresentation extends AbstractTypeMemberRepresentation {
 
-    public TypeCollectionRepresentation(JsonNode jsonNode) {
+    public CollectionDescriptionRepresentation(JsonNode jsonNode) {
         super(jsonNode);
     }
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeResource.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeResource.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeResource.java Thu Nov 10 00:04:01 2011
@@ -55,28 +55,28 @@ public interface DomainTypeResource {
 
     @GET
     @Path("/{domainType}/properties/{propertyId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_PROPERTY })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_PROPERTY_DESCRIPTION })
     @ClientResponseType(entityType=String.class)
     public abstract Response typeProperty(@PathParam("domainType") final String domainType,
         @PathParam("propertyId") final String propertyId);
 
     @GET
     @Path("/{domainType}/collections/{collectionId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_COLLECTION })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_COLLECTION_DESCRIPTION })
     @ClientResponseType(entityType=String.class)
     public abstract Response typeCollection(@PathParam("domainType") final String domainType,
         @PathParam("collectionId") final String collectionId);
 
     @GET
     @Path("/{domainType}/actions/{actionId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_ACTION })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_ACTION_DESCRIPTION })
     @ClientResponseType(entityType=String.class)
     public abstract Response typeAction(@PathParam("domainType") final String domainType,
         @PathParam("actionId") final String actionId);
 
     @GET
     @Path("/{domainType}/actions/{actionId}/params/{paramNum}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_ACTION_PARAMETER })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION })
     @ClientResponseType(entityType=String.class)
     public abstract Response typeActionParam(@PathParam("domainType") final String domainType,
         @PathParam("actionId") final String actionId, @PathParam("paramNum") final String paramName);

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/PropertyDescriptionRepresentation.java (from r1198408, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypePropertyRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/PropertyDescriptionRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/PropertyDescriptionRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypePropertyRepresentation.java&r1=1198408&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypePropertyRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/PropertyDescriptionRepresentation.java Thu Nov 10 00:04:01 2011
@@ -20,9 +20,9 @@ package org.apache.isis.viewer.json.appl
 
 import org.codehaus.jackson.JsonNode;
 
-public class TypePropertyRepresentation extends AbstractTypeMemberRepresentation  {
+public class PropertyDescriptionRepresentation extends AbstractTypeMemberRepresentation  {
 
-    public TypePropertyRepresentation(JsonNode jsonNode) {
+    public PropertyDescriptionRepresentation(JsonNode jsonNode) {
         super(jsonNode);
     }
 

Copied: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionIsSubtypeOfRepresentation.java (from r1198650, incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeIsSubtypeOfRepresentation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionIsSubtypeOfRepresentation.java?p2=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionIsSubtypeOfRepresentation.java&p1=incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeIsSubtypeOfRepresentation.java&r1=1198650&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/DomainTypeIsSubtypeOfRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/domaintypes/TypeActionIsSubtypeOfRepresentation.java Thu Nov 10 00:04:01 2011
@@ -21,9 +21,9 @@ package org.apache.isis.viewer.json.appl
 import org.apache.isis.viewer.json.applib.domainobjects.DomainRepresentation;
 import org.codehaus.jackson.JsonNode;
 
-public class DomainTypeIsSubtypeOfRepresentation extends DomainRepresentation {
+public class TypeActionIsSubtypeOfRepresentation extends DomainRepresentation {
 
-    public DomainTypeIsSubtypeOfRepresentation(JsonNode jsonNode) {
+    public TypeActionIsSubtypeOfRepresentation(JsonNode jsonNode) {
         super(jsonNode);
     }
 

Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java Thu Nov 10 00:04:01 2011
@@ -30,7 +30,7 @@ public class RepresentationTypeTest_getN
     public void selectedValues() {
         assertThat(RepresentationType.CAPABILITIES.getName(), is("capabilities"));
         assertThat(RepresentationType.HOME_PAGE.getName(), is("homePage"));
-        assertThat(RepresentationType.TYPE_ACTION_PARAMETER.getName(), is("typeActionParameter"));
+        assertThat(RepresentationType.ACTION_PARAMETER_DESCRIPTION.getName(), is("actionParameterDescription"));
     }
 
     @Test

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactoryRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactoryRegistry.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactoryRegistry.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactoryRegistry.java Thu Nov 10 00:04:01 2011
@@ -31,13 +31,13 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.ObjectCollectionReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.ObjectPropertyReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.ScalarValueReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeIsSubtypeOfReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeActionIsSubtypeOfReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypesReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeActionParamReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeActionReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeCollectionReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypePropertyReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.ActionParameterDescriptionReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.ActionDescriptionReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.CollectionDescriptionReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.PropertyDescriptionReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.home.HomePageReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.user.UserReprRenderer;
 
@@ -67,11 +67,11 @@ public class RendererFactoryRegistry {
         register(new ScalarValueReprRenderer.Factory());
         register(new DomainTypesReprRenderer.Factory());
         register(new DomainTypeReprRenderer.Factory());
-        register(new TypePropertyReprRenderer.Factory());
-        register(new TypeCollectionReprRenderer.Factory());
-        register(new TypeActionReprRenderer.Factory());
-        register(new TypeActionParamReprRenderer.Factory());
-        register(new DomainTypeIsSubtypeOfReprRenderer.Factory());
+        register(new PropertyDescriptionReprRenderer.Factory());
+        register(new CollectionDescriptionReprRenderer.Factory());
+        register(new ActionDescriptionReprRenderer.Factory());
+        register(new ActionParameterDescriptionReprRenderer.Factory());
+        register(new TypeActionIsSubtypeOfReprRenderer.Factory());
     }
 
     public void register(RendererFactory factory) {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java Thu Nov 10 00:04:01 2011
@@ -18,16 +18,21 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
+import java.util.List;
+
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
 import org.apache.isis.viewer.json.applib.JsonRepresentation;
 import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.viewer.ResourceContext;
+import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainObjectReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 
 public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>, T> implements ReprRenderer<R, T> {
@@ -130,8 +135,25 @@ public abstract class ReprRendererAbstra
 
     public abstract JsonRepresentation render();
 
-
-    
+
+    /**
+     * Convenience for representations that are returned from objects that mutate state. 
+     */
+    protected final void addExtensionsIsisProprietaryChangedObjects() {
+        final UpdateNotifier updateNotifier = getUpdateNotifier();
+        
+        addToExtensions("changed", updateNotifier.getChangedObjects());
+        addToExtensions("disposed", updateNotifier.getDisposedObjects());
+    }
+
+    private void addToExtensions(final String key, final List<ObjectAdapter> adapters) {
+        final JsonRepresentation adapterList = JsonRepresentation.newArray();
+        getExtensions().mapPut(key, adapterList);
+        for (ObjectAdapter adapter : adapters) {
+            adapterList.arrayAdd(DomainObjectReprRenderer.newLinkToBuilder(getResourceContext(), Rel.OBJECT, adapter).build());
+        }
+    }
+
     protected OidStringifier getOidStringifier() {
         return getOidGenerator().getOidStringifier();
     }
@@ -150,5 +172,11 @@ public abstract class ReprRendererAbstra
 
     protected Localization getLocalization() {
         return IsisContext.getLocalization();
-    }
+    }
+    
+    protected UpdateNotifier getUpdateNotifier() {
+        return IsisContext.getCurrentTransaction().getUpdateNotifier();
+    }
+    
+
 }

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -35,7 +35,8 @@ public abstract class AbstractObjectMemb
     protected enum Mode {
         INLINE,
         FOLLOWED,
-        STANDALONE;
+        STANDALONE,
+        MUTATED;
 
         public boolean isInline() {
             return this == INLINE;
@@ -46,6 +47,9 @@ public abstract class AbstractObjectMemb
         public boolean isStandalone() {
             return this == STANDALONE;
         }
+        public boolean isMutated() {
+            return this == MUTATED;
+        }
     }
     
     protected ObjectAdapterLinkTo linkTo;
@@ -54,7 +58,7 @@ public abstract class AbstractObjectMemb
     protected MemberType memberType;
     protected T objectMember;
     protected Mode mode = Mode.INLINE; // unless we determine otherwise
-    
+
     public AbstractObjectMemberReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
@@ -99,6 +103,18 @@ public abstract class AbstractObjectMemb
     }
 
     /**
+     * Indicates that the representation was produced as the result of a
+     * resource that mutated the state.
+     * 
+     * <p>
+     * The effect of this is to suppress the link to self.
+     */
+    public R asMutated() {
+        mode = Mode.MUTATED;
+        return cast(this);
+    }
+    
+    /**
      * For subclasses to call from their {@link #render()} method.
      */
     protected void renderMemberContent() {
@@ -108,10 +124,13 @@ public abstract class AbstractObjectMemb
         
         if (mode.isStandalone()){
             addLinkToSelf();
+        }
+
+        if (mode.isStandalone() || mode.isMutated()) {
             addLinkToUp();
         }
-        
-        if (mode.isFollowed() || mode.isStandalone()){
+
+        if (mode.isFollowed() || mode.isStandalone() || mode.isMutated()){
             addMutatorsIfEnabled();
             
             putExtensionsIsisProprietary();

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionResultReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -85,13 +85,11 @@ public class ActionResultReprRenderer ex
 
     public JsonRepresentation render() {
 
-        final JsonRepresentation representation = representationWithSelfFor(action, arguments);
+        representationWithSelfFor(action, arguments);
 
         addResult(representation);
         
-        final JsonRepresentation extensions = JsonRepresentation.newMap();
-        representation.mapPut("extensions", extensions);
-        addExtensionsIsisProprietaryChangedObjects(extensions);
+        addExtensionsIsisProprietaryChangedObjects();
         
         return representation;
     }
@@ -185,26 +183,6 @@ public class ActionResultReprRenderer ex
     }
 
 
-    private void addExtensionsIsisProprietaryChangedObjects(final JsonRepresentation extensions) {
-        final UpdateNotifier updateNotifier = getUpdateNotifier();
-        
-        addToExtensions(extensions, "changed", updateNotifier.getChangedObjects());
-        addToExtensions(extensions, "disposed", updateNotifier.getDisposedObjects());
-    }
-
-    protected void addToExtensions(final JsonRepresentation extensions, final String key, final List<ObjectAdapter> adapters) {
-        final JsonRepresentation adapterList = JsonRepresentation.newArray();
-        extensions.mapPut(key, adapterList);
-        for (ObjectAdapter adapter : adapters) {
-            adapterList.arrayAdd(DomainObjectReprRenderer.newLinkToBuilder(getResourceContext(), Rel.OBJECT, adapter).build());
-        }
-    }
-
-    protected UpdateNotifier getUpdateNotifier() {
-        // TODO: yuck
-        return IsisContext.getCurrentTransaction().getUpdateNotifier();
-    }
-
     protected RendererFactoryRegistry getRendererFactoryRegistry() {
         // TODO: yuck
         return RendererFactoryRegistry.instance;

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectResourceServerside.java Thu Nov 10 00:04:01 2011
@@ -49,6 +49,7 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.Intent;
+import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.MemberMode;
 
 @Path("/objects")
 public class DomainObjectResourceServerside extends ResourceAbstract implements
@@ -115,7 +116,7 @@ public class DomainObjectResourceServers
         final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), objectAdapter);
         
-        return helper.propertyDetails(objectAdapter, propertyId, Caching.NONE);
+        return helper.propertyDetails(objectAdapter, propertyId, MemberMode.NOT_MUTATING, Caching.NONE);
     }
 
     @PUT
@@ -147,8 +148,7 @@ public class DomainObjectResourceServers
 
         property.set(objectAdapter, argAdapter);
 
-        return Response.status(HttpStatusCode.NO_CONTENT.getJaxrsStatusType())
-                .build();
+        return helper.propertyDetails(objectAdapter, propertyId, MemberMode.MUTATING, Caching.NONE);
     }
 
     @DELETE
@@ -173,7 +173,7 @@ public class DomainObjectResourceServers
 
         property.set(objectAdapter, null);
 
-        return responseOfNoContent().build();
+        return helper.propertyDetails(objectAdapter, propertyId, MemberMode.MUTATING, Caching.NONE);
     }
 
 
@@ -193,16 +193,7 @@ public class DomainObjectResourceServers
         final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), objectAdapter);
 
-        final OneToManyAssociation collection = helper.getCollectionThatIsVisibleAndUsable(
-                collectionId, Intent.ACCESS);
-
-        RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.OBJECT_COLLECTION);
-        final ObjectCollectionReprRenderer renderer = 
-                (ObjectCollectionReprRenderer) factory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
-
-        renderer.with(new ObjectAndCollection(objectAdapter, collection)).asStandalone();
-        
-        return ResourceAbstract.responseOfOk(renderer, Caching.NONE).build();
+        return helper.collectionDetails(objectAdapter, collectionId, MemberMode.NOT_MUTATING, Caching.NONE);
     }
 
     @PUT
@@ -239,7 +230,7 @@ public class DomainObjectResourceServers
 
         collection.addElement(objectAdapter, argAdapter);
         
-        return Response.status(HttpStatusCode.NO_CONTENT.getJaxrsStatusType()).build();
+        return helper.collectionDetails(objectAdapter, collectionId, MemberMode.MUTATING, Caching.NONE);
     }
 
     @POST
@@ -276,7 +267,7 @@ public class DomainObjectResourceServers
 
         collection.addElement(objectAdapter, argAdapter);
         
-        return responseOfNoContent().build();
+        return helper.collectionDetails(objectAdapter, collectionId, MemberMode.MUTATING, Caching.NONE);
     }
 
     @DELETE
@@ -307,7 +298,7 @@ public class DomainObjectResourceServers
 
         collection.removeElement(objectAdapter, argAdapter);
         
-        return responseOfNoContent().build();
+        return helper.collectionDetails(objectAdapter, collectionId, MemberMode.MUTATING, Caching.NONE);
     }
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java Thu Nov 10 00:04:01 2011
@@ -46,6 +46,7 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract.Caching;
+import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.MemberMode;
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.JsonValueEncoder.ExpectedStringRepresentingValueException;
 import org.apache.isis.viewer.json.viewer.util.OidUtils;
 import org.apache.isis.viewer.json.viewer.util.UrlDecoderUtils;
@@ -81,9 +82,27 @@ public class DomainResourceHelper {
     // propertyDetails
     // //////////////////////////////////////////////////////////////
 
+    public enum MemberMode {
+        NOT_MUTATING {
+            @Override
+            public void apply(AbstractObjectMemberReprRenderer<?,?> renderer) {
+                renderer.asStandalone();
+            }
+        },
+        MUTATING {
+            @Override
+            public void apply(AbstractObjectMemberReprRenderer<?,?> renderer) {
+                renderer.asMutated();
+            }
+        };
+
+        public abstract void apply(AbstractObjectMemberReprRenderer<?,?> renderer);
+    }
+    
     Response propertyDetails(
             final ObjectAdapter objectAdapter,
             final String propertyId, 
+            final MemberMode memberMode, 
             final Caching caching) {
 
         final OneToOneAssociation property = getPropertyThatIsVisibleAndUsable(
@@ -93,8 +112,35 @@ public class DomainResourceHelper {
         final ObjectPropertyReprRenderer renderer = 
                 (ObjectPropertyReprRenderer) factory.newRenderer(resourceContext, null, JsonRepresentation.newMap());
         
-        renderer.with(new ObjectAndProperty(objectAdapter, property)).usingLinkTo(adapterLinkTo)
-                .asStandalone();
+        renderer.with(new ObjectAndProperty(objectAdapter, property))
+            .usingLinkTo(adapterLinkTo);
+        
+        memberMode.apply(renderer);
+        
+        return ResourceAbstract.responseOfOk(renderer, caching).build();
+    }
+
+    // //////////////////////////////////////////////////////////////
+    // collectionDetails
+    // //////////////////////////////////////////////////////////////
+
+    Response collectionDetails(
+            final ObjectAdapter objectAdapter, 
+            final String collectionId, 
+            final MemberMode memberMode, 
+            final Caching caching) {
+        
+        final OneToManyAssociation collection = getCollectionThatIsVisibleAndUsable(
+                collectionId, Intent.ACCESS);
+        
+        RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.OBJECT_COLLECTION);
+        final ObjectCollectionReprRenderer renderer = 
+                (ObjectCollectionReprRenderer) factory.newRenderer(resourceContext, null, JsonRepresentation.newMap());
+
+        renderer.with(new ObjectAndCollection(objectAdapter, collection))
+            .usingLinkTo(adapterLinkTo);
+        
+        memberMode.apply(renderer);
         
         return ResourceAbstract.responseOfOk(renderer, caching).build();
     }

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java Thu Nov 10 00:04:01 2011
@@ -38,6 +38,7 @@ import org.apache.isis.viewer.json.appli
 import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.MemberMode;
 
 @Path("/services")
 public class DomainServiceResourceServerside extends ResourceAbstract implements
@@ -104,7 +105,7 @@ public class DomainServiceResourceServer
         final ObjectAdapter serviceAdapter = getServiceAdapter(serviceId);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), serviceAdapter).using(new DomainServiceLinkTo());
 
-        return helper.propertyDetails(serviceAdapter, propertyId, Caching.ONE_DAY);
+        return helper.propertyDetails(serviceAdapter, propertyId, MemberMode.NOT_MUTATING, Caching.ONE_DAY);
     }
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -32,7 +32,7 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeActionReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.ActionDescriptionReprRenderer;
 import org.codehaus.jackson.node.NullNode;
 
 import com.google.common.collect.Lists;
@@ -61,7 +61,7 @@ public class ObjectActionReprRenderer ex
         renderMemberContent();
         putDisabledReasonIfDisabled();
         
-        if(mode.isStandalone()) {
+        if(mode.isStandalone() || mode.isMutated()) {
             addParameterDetails();
         }
 
@@ -206,7 +206,7 @@ public class ObjectActionReprRenderer ex
     /////////////////////////////////////////////////////
 	
      protected void addLinksToFormalDomainModel() {
-         getLinks().arrayAdd(TypeActionReprRenderer.newLinkToBuilder(resourceContext, Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build());
+         getLinks().arrayAdd(ActionDescriptionReprRenderer.newLinkToBuilder(resourceContext, Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build());
      }
      
      protected void addLinksIsisProprietary() {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -33,7 +33,7 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeCollectionReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.CollectionDescriptionReprRenderer;
 
 import com.google.common.collect.Lists;
 
@@ -59,11 +59,15 @@ public class ObjectCollectionReprRendere
         // id and memberType are rendered eagerly
 
         renderMemberContent();
-        if(mode.isStandalone() || !objectAdapter.isPersistent()) {
+        if(mode.isStandalone() || mode.isMutated() || !objectAdapter.isPersistent()) {
             addValue();
         }
         putDisabledReasonIfDisabled();
 
+        if(mode.isStandalone() || mode.isMutated()) {
+            addExtensionsIsisProprietaryChangedObjects();
+        }
+
         return representation;
     }
 
@@ -140,7 +144,7 @@ public class ObjectCollectionReprRendere
     
     
     protected void addLinksToFormalDomainModel() {
-        final LinkBuilder linkBuilder = TypeCollectionReprRenderer.newLinkToBuilder(resourceContext, Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember);
+        final LinkBuilder linkBuilder = CollectionDescriptionReprRenderer.newLinkToBuilder(resourceContext, Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember);
         getLinks().arrayAdd(linkBuilder.build());
     }
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -31,13 +31,14 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypePropertyReprRenderer;
+import org.apache.isis.viewer.json.viewer.resources.domaintypes.PropertyDescriptionReprRenderer;
 import org.codehaus.jackson.node.NullNode;
 
 import com.google.common.collect.Lists;
 
 public class ObjectPropertyReprRenderer extends AbstractObjectMemberReprRenderer<ObjectPropertyReprRenderer, OneToOneAssociation> {
 
+    
     public static class Factory extends ReprRendererFactoryAbstract {
 
         public Factory() {
@@ -58,16 +59,17 @@ public class ObjectPropertyReprRenderer 
     public JsonRepresentation render() {
         // id and memberType are rendered eagerly
         
-
         renderMemberContent();
         addValue();
         
         putDisabledReasonIfDisabled();
 
-        if(mode.isStandalone()) {
+        if(mode.isStandalone() || mode.isMutated()) {
             addChoices();
+            addExtensionsIsisProprietaryChangedObjects();
         }
         
+        
         return representation;
     }
 
@@ -158,7 +160,7 @@ public class ObjectPropertyReprRenderer 
     
     protected void addLinksToFormalDomainModel() {
         getLinks().arrayAdd(
-                TypePropertyReprRenderer.newLinkToBuilder(getResourceContext(), Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build());
+                PropertyDescriptionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build());
     }
 
     @Override

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java (from r1198408, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java&r1=1198408&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionDescriptionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -31,17 +31,17 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 
-public class TypeActionReprRenderer extends AbstractTypeMemberReprRenderer<TypeActionReprRenderer, ObjectAction> {
+public class ActionDescriptionReprRenderer extends AbstractTypeMemberReprRenderer<ActionDescriptionReprRenderer, ObjectAction> {
 
     public static class Factory extends ReprRendererFactoryAbstract {
 
         public Factory() {
-            super(RepresentationType.TYPE_ACTION);
+            super(RepresentationType.ACTION_DESCRIPTION);
         }
 
         @Override
         public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
-            return new TypeActionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+            return new ActionDescriptionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
         }
     }
 
@@ -49,10 +49,10 @@ public class TypeActionReprRenderer exte
         String typeFullName = objectSpecification.getFullIdentifier();
         String actionId = objectAction.getId();
         String url = "domainTypes/" + typeFullName + "/actions/" + actionId;
-        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION, url);
+        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.ACTION_DESCRIPTION, url);
     }
 
-    public TypeActionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+    public ActionDescriptionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
     
@@ -68,7 +68,7 @@ public class TypeActionReprRenderer exte
         final List<ObjectActionParameter> parameters = getObjectFeature().getParameters();
         for (ObjectActionParameter parameter : parameters) {
             final LinkBuilder linkBuilder = 
-                    TypeActionParamReprRenderer.newLinkToBuilder(getResourceContext(), Rel.ACTION_PARAM, objectSpecification, parameter);
+                    ActionParameterDescriptionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.ACTION_PARAM, objectSpecification, parameter);
             parameterList.arrayAdd(linkBuilder.build());
         }
         

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java (from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java&r1=1198645&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionParamReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ActionParameterDescriptionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -29,17 +29,17 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 
-public class TypeActionParamReprRenderer extends AbstractTypeFeatureReprRenderer<TypeActionParamReprRenderer, ObjectActionParameter> {
+public class ActionParameterDescriptionReprRenderer extends AbstractTypeFeatureReprRenderer<ActionParameterDescriptionReprRenderer, ObjectActionParameter> {
 
     public static class Factory extends ReprRendererFactoryAbstract {
 
         public Factory() {
-            super(RepresentationType.TYPE_ACTION_PARAMETER);
+            super(RepresentationType.ACTION_PARAMETER_DESCRIPTION);
         }
 
         @Override
         public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
-            return new TypeActionParamReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+            return new ActionParameterDescriptionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
         }
     }
 
@@ -49,16 +49,16 @@ public class TypeActionParamReprRenderer
         String actionId = objectAction.getId();
         final String paramName = objectActionParameter.getName();
         String url = String.format("domainTypes/%s/actions/%s/params/%s", typeFullName, actionId, paramName);
-        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION_PARAMETER, url)
+        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.ACTION_PARAMETER_DESCRIPTION, url)
                           .withId(deriveId(objectActionParameter));
     }
 
-    public TypeActionParamReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+    public ActionParameterDescriptionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
 
     @Override
-    public TypeActionParamReprRenderer with(ParentSpecAndFeature<ObjectActionParameter> specAndFeature) {
+    public ActionParameterDescriptionReprRenderer with(ParentSpecAndFeature<ObjectActionParameter> specAndFeature) {
         super.with(specAndFeature);
         
         // done eagerly so can use as criteria for x-ro-follow-links
@@ -90,7 +90,7 @@ public class TypeActionParamReprRenderer
         ObjectAction parentAction = this.objectFeature.getAction();
         
         final LinkBuilder parentLinkBuilder = 
-                TypeActionReprRenderer.newLinkToBuilder(resourceContext, Rel.UP, objectSpecification, parentAction);
+                ActionDescriptionReprRenderer.newLinkToBuilder(resourceContext, Rel.UP, objectSpecification, parentAction);
         getLinks().arrayAdd(parentLinkBuilder.build());
     }
 

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java (from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java&r1=1198645&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/CollectionDescriptionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -27,17 +27,17 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 
-public class TypeCollectionReprRenderer extends AbstractTypeMemberReprRenderer<TypeCollectionReprRenderer, OneToManyAssociation> {
+public class CollectionDescriptionReprRenderer extends AbstractTypeMemberReprRenderer<CollectionDescriptionReprRenderer, OneToManyAssociation> {
 
     public static class Factory extends ReprRendererFactoryAbstract {
 
         public Factory() {
-            super(RepresentationType.TYPE_COLLECTION);
+            super(RepresentationType.COLLECTION_DESCRIPTION);
         }
 
         @Override
         public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
-            return new TypeCollectionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+            return new CollectionDescriptionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
         }
     }
 
@@ -45,10 +45,10 @@ public class TypeCollectionReprRenderer 
         String typeFullName = objectSpecification.getFullIdentifier();
         String collectionId = collection.getId();
         String url = "domainTypes/" + typeFullName + "/collections/" + collectionId;
-        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_COLLECTION, url);
+        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.COLLECTION_DESCRIPTION, url);
     }
 
-    public TypeCollectionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+    public CollectionDescriptionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -98,17 +98,17 @@ public class DomainTypeReprRenderer exte
         for (ObjectAssociation association : associations) {
             if(association.isOneToOneAssociation()) {
                 OneToOneAssociation property = (OneToOneAssociation) association;
-                final LinkBuilder linkBuilder = TypePropertyReprRenderer.newLinkToBuilder(getResourceContext(), Rel.PROPERTY, objectSpecification, property);
+                final LinkBuilder linkBuilder = PropertyDescriptionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.PROPERTY, objectSpecification, property);
                 membersList.arrayAdd(linkBuilder.build());
             } else if(association.isOneToManyAssociation()) {
                 OneToManyAssociation collection = (OneToManyAssociation) association;
-                final LinkBuilder linkBuilder = TypeCollectionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.PROPERTY, objectSpecification, collection);
+                final LinkBuilder linkBuilder = CollectionDescriptionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.PROPERTY, objectSpecification, collection);
                 membersList.arrayAdd(linkBuilder.build());
             }
         }
         final List<ObjectAction> actions = objectSpecification.getObjectActions(Contributed.INCLUDED);
         for (ObjectAction action : actions) {
-            final LinkBuilder linkBuilder = TypeActionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.ACTION, objectSpecification, action);
+            final LinkBuilder linkBuilder = ActionDescriptionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.ACTION, objectSpecification, action);
             membersList.arrayAdd(linkBuilder.build());
         }
     }
@@ -124,7 +124,7 @@ public class DomainTypeReprRenderer exte
 
     private void addTypeActions() {
         final ObjectSpecAndSuperSpec objectSpecAndSuperSpec = new ObjectSpecAndSuperSpec(objectSpecification, null);
-        final LinkBuilder linkBuilder = DomainTypeIsSubtypeOfReprRenderer.newLinkToBuilder(getResourceContext(), Rel.TYPE_ACTION, objectSpecAndSuperSpec);
+        final LinkBuilder linkBuilder = TypeActionIsSubtypeOfReprRenderer.newLinkToBuilder(getResourceContext(), Rel.TYPE_ACTION, objectSpecAndSuperSpec);
         JsonRepresentation link = linkBuilder.withId("isSubtypeOf").build();
         getTypeActions().arrayAdd(link);
     }

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java?rev=1200052&r1=1200051&r2=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java Thu Nov 10 00:04:01 2011
@@ -100,7 +100,7 @@ public class DomainTypeResourceServersid
         @PathParam("domainType") String domainType, 
         @QueryParam("args") final String argumentsQueryString) {
         
-        RepresentationType representationType = RepresentationType.DOMAIN_TYPE_IS_SUBTYPE_OF;
+        RepresentationType representationType = RepresentationType.TYPE_ACTION_RESULT;
         init();
 
         JsonRepresentation arguments = QueryStringUtil.parseQueryString(argumentsQueryString, "Type action", "isSubtypeOf");
@@ -117,8 +117,8 @@ public class DomainTypeResourceServersid
         final RendererFactory rendererFactory = 
                 rendererFactoryRegistry.find(representationType);
 
-        final DomainTypeIsSubtypeOfReprRenderer renderer = 
-                (DomainTypeIsSubtypeOfReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
+        final TypeActionIsSubtypeOfReprRenderer renderer = 
+                (TypeActionIsSubtypeOfReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
         final ObjectSpecAndSuperSpec objectSpecAndSuperSpec = new ObjectSpecAndSuperSpec(domainTypeSpec, supertypeSpec);
         renderer.with(objectSpecAndSuperSpec).includesSelf();
 
@@ -127,11 +127,11 @@ public class DomainTypeResourceServersid
 
     @GET
     @Path("/{domainType}/properties/{propertyId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_PROPERTY })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_PROPERTY_DESCRIPTION })
     public Response typeProperty(
             @PathParam("domainType") final String domainType,
             @PathParam("propertyId") final String propertyId){
-        RepresentationType representationType = RepresentationType.TYPE_PROPERTY;
+        RepresentationType representationType = RepresentationType.PROPERTY_DESCRIPTION;
         init(representationType);
 
         final ObjectSpecification parentSpec = getSpecificationLoader().loadSpecification(domainType);
@@ -148,8 +148,8 @@ public class DomainTypeResourceServersid
         final RendererFactory rendererFactory = 
                 rendererFactoryRegistry.find(representationType);
         
-        final TypePropertyReprRenderer renderer = 
-                (TypePropertyReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
+        final PropertyDescriptionReprRenderer renderer = 
+                (PropertyDescriptionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
         renderer.with(new ParentSpecAndProperty(parentSpec, property)).includesSelf();
 
         return responseOfOk(renderer, Caching.ONE_DAY).build();
@@ -157,11 +157,11 @@ public class DomainTypeResourceServersid
 
     @GET
     @Path("/{domainType}/collections/{collectionId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_COLLECTION })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_COLLECTION_DESCRIPTION })
     public Response typeCollection(
             @PathParam("domainType") final String domainType,
             @PathParam("collectionId") final String collectionId){
-        RepresentationType representationType = RepresentationType.TYPE_COLLECTION;
+        RepresentationType representationType = RepresentationType.COLLECTION_DESCRIPTION;
         init(representationType);
 
         final ObjectSpecification parentSpec = getSpecificationLoader().loadSpecification(domainType);
@@ -178,8 +178,8 @@ public class DomainTypeResourceServersid
         final RendererFactory rendererFactory = 
                 rendererFactoryRegistry.find(representationType);
         
-        final TypeCollectionReprRenderer renderer = 
-                (TypeCollectionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
+        final CollectionDescriptionReprRenderer renderer = 
+                (CollectionDescriptionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
         renderer.with(new ParentSpecAndCollection(parentSpec, collection)).includesSelf();
 
         return responseOfOk(renderer, Caching.ONE_DAY).build();
@@ -187,11 +187,11 @@ public class DomainTypeResourceServersid
 
     @GET
     @Path("/{domainType}/actions/{actionId}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_ACTION })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_ACTION_DESCRIPTION })
     public Response typeAction(
             @PathParam("domainType") final String domainType,
             @PathParam("actionId") final String actionId){
-        RepresentationType representationType = RepresentationType.TYPE_ACTION;
+        RepresentationType representationType = RepresentationType.ACTION_DESCRIPTION;
         init(representationType);
 
         final ObjectSpecification parentSpec = getSpecificationLoader().loadSpecification(domainType);
@@ -208,8 +208,8 @@ public class DomainTypeResourceServersid
         final RendererFactory rendererFactory = 
                 rendererFactoryRegistry.find(representationType);
         
-        final TypeActionReprRenderer renderer = 
-                (TypeActionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
+        final ActionDescriptionReprRenderer renderer = 
+                (ActionDescriptionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
         renderer.with(new ParentSpecAndAction(parentSpec, action)).includesSelf();
 
         return responseOfOk(renderer, Caching.ONE_DAY).build();
@@ -217,12 +217,12 @@ public class DomainTypeResourceServersid
 
     @GET
     @Path("/{domainType}/actions/{actionId}/params/{paramName}")
-    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_ACTION_PARAMETER })
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION })
     public Response typeActionParam(
             @PathParam("domainType") final String domainType,
             @PathParam("actionId") final String actionId,
             @PathParam("paramName") final String paramName){
-        RepresentationType representationType = RepresentationType.TYPE_ACTION_PARAMETER;
+        RepresentationType representationType = RepresentationType.ACTION_PARAMETER_DESCRIPTION;
         init(representationType);
 
         final ObjectSpecification parentSpec = getSpecificationLoader().loadSpecification(domainType);
@@ -241,8 +241,8 @@ public class DomainTypeResourceServersid
         final RendererFactory rendererFactory = 
                 rendererFactoryRegistry.find(representationType);
         
-        final TypeActionParamReprRenderer renderer = 
-                (TypeActionParamReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
+        final ActionParameterDescriptionReprRenderer renderer = 
+                (ActionParameterDescriptionReprRenderer) rendererFactory.newRenderer(getResourceContext(), null, JsonRepresentation.newMap());
         renderer.with(new ParentSpecAndActionParam(parentSpec, actionParam))
                 .includesSelf();
 

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java (from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java&r1=1198645&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/PropertyDescriptionReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -28,17 +28,17 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 
-public class TypePropertyReprRenderer extends AbstractTypeMemberReprRenderer<TypePropertyReprRenderer, OneToOneAssociation> {
+public class PropertyDescriptionReprRenderer extends AbstractTypeMemberReprRenderer<PropertyDescriptionReprRenderer, OneToOneAssociation> {
 
     public static class Factory extends ReprRendererFactoryAbstract {
 
         public Factory() {
-            super(RepresentationType.TYPE_PROPERTY);
+            super(RepresentationType.PROPERTY_DESCRIPTION);
         }
 
         @Override
         public ReprRenderer<?,?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
-            return new TypePropertyReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+            return new PropertyDescriptionReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
         }
     }
 
@@ -46,10 +46,10 @@ public class TypePropertyReprRenderer ex
         String typeFullName = objectSpecification.getFullIdentifier();
         String propertyId = property.getId();
         String url = "domainTypes/" + typeFullName + "/properties/" + propertyId;
-        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_PROPERTY, url);
+        return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.PROPERTY_DESCRIPTION, url);
     }
 
-    public TypePropertyReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+    public PropertyDescriptionReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
 

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionIsSubtypeOfReprRenderer.java (from r1198645, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionIsSubtypeOfReprRenderer.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionIsSubtypeOfReprRenderer.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java&r1=1198645&r2=1200052&rev=1200052&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionIsSubtypeOfReprRenderer.java Thu Nov 10 00:04:01 2011
@@ -28,16 +28,16 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 import org.codehaus.jackson.node.NullNode;
 
-public class DomainTypeIsSubtypeOfReprRenderer extends ReprRendererAbstract<DomainTypeIsSubtypeOfReprRenderer, ObjectSpecAndSuperSpec> {
+public class TypeActionIsSubtypeOfReprRenderer extends ReprRendererAbstract<TypeActionIsSubtypeOfReprRenderer, ObjectSpecAndSuperSpec> {
 
     public static class Factory extends ReprRendererFactoryAbstract {
         public Factory() {
-            super(RepresentationType.DOMAIN_TYPE_IS_SUBTYPE_OF);
+            super(RepresentationType.TYPE_ACTION_RESULT);
         }
 
         @Override
         public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
-            return new DomainTypeIsSubtypeOfReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+            return new TypeActionIsSubtypeOfReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
         }
     }
 
@@ -45,7 +45,7 @@ public class DomainTypeIsSubtypeOfReprRe
         String typeFullName = objectSpecAndSuperSpec.getObjectSpecification().getFullIdentifier();
         String url = "domainTypes/" + typeFullName + "/typeactions/isSubtypeOf/invoke";
         
-        final LinkBuilder linkBuilder = LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.DOMAIN_TYPE_IS_SUBTYPE_OF, url);
+        final LinkBuilder linkBuilder = LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION_RESULT, url);
         
         final JsonRepresentation arguments = argumentsTo(resourceContext, objectSpecAndSuperSpec.getSuperSpecification());
         
@@ -67,12 +67,12 @@ public class DomainTypeIsSubtypeOfReprRe
     private ObjectSpecification objectSpecification;
     private ObjectSpecification superSpecification;
 
-    public DomainTypeIsSubtypeOfReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+    public TypeActionIsSubtypeOfReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
         super(resourceContext, linkFollower, representationType, representation);
     }
 
     @Override
-    public DomainTypeIsSubtypeOfReprRenderer with(ObjectSpecAndSuperSpec objectSpecAndSuperSpec) {
+    public TypeActionIsSubtypeOfReprRenderer with(ObjectSpecAndSuperSpec objectSpecAndSuperSpec) {
         this.objectSpecification = objectSpecAndSuperSpec.getObjectSpecification();
         this.superSpecification = objectSpecAndSuperSpec.getSuperSpecification();
         return cast(this);
@@ -86,7 +86,7 @@ public class DomainTypeIsSubtypeOfReprRe
             getLinks().arrayAdd(selfLink);
         }
 
-        representation.mapPut("isSubtypeOf", isSubtypeOf());
+        representation.mapPut("value", isSubtypeOf());
         getExtensions();
         
         return representation;



Mime
View raw message