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 2011/11/07 09:29:01 UTC

svn commit: r1198645 [1/2] - in /incubator/isis/trunk/framework: applib/src/main/java/org/apache/isis/applib/annotation/ core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/ core/progmodel/src/test/java/org/apache...

Author: danhaywood
Date: Mon Nov  7 08:28:59 2011
New Revision: 1198645

URL: http://svn.apache.org/viewvc?rev=1198645&view=rev
Log:
ISIS-109: adding new resource/representation for DomainType#isSubtypeOf

Added:
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/QueryStringUtil.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/ObjectSpecAndSuperSpec.java
Modified:
    incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
    incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
    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-viewer/src/main/java/org/apache/isis/viewer/json/viewer/HasHttpStatusCode.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationException.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationExceptionMapper.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/RuntimeExceptionMapper.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/GraphUtil.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkFollower.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Rel.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactory.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/ReprRenderer.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/representations/ReprRendererFactoryAbstract.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/CollectionSemantics.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/JsonValueEncoder.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.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/ObjectAdapterLinkTo.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndAction.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndCollection.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndMember.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndProperty.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/domainobjects/ScalarValueReprRenderer.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
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ParentSpecAndAction.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ParentSpecAndActionParam.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ParentSpecAndCollection.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ParentSpecAndFeature.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/ParentSpecAndProperty.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/TypeCollectionReprRenderer.java
    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/home/HomePageReprRenderer.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/MapUtils.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlParserUtils.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/webapp/PreProcessInterceptorForIsisSession.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/ResourceContextTest_ensureCompatibleAcceptHeader.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/ResourceContextTest_getArg.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/GraphTest_asGraph.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/representations/LinkFollowerTest_follow.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/MapUtilsTest.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/UrlParserUtilsTest.java

Modified: incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/Title.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/Title.java (original)
+++ incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/annotation/Title.java Mon Nov  7 08:28:59 2011
@@ -44,4 +44,8 @@ public @interface Title {
      * The string to append to this property if non-empty.  
      */
     String append() default "";
+    /**
+     * The length to abbreviate this title element to.  
+     */
+    int abbreviatedTo() default Integer.MAX_VALUE;
 }

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleAnnotationFacetFactory.java Mon Nov  7 08:28:59 2011
@@ -74,7 +74,7 @@ public class TitleAnnotationFacetFactory
             return;
         } 
         List<TitleComponent> titleComponents = Lists.transform(methods, TitleComponent.FROM_METHOD);
-        FacetUtil.addFacet(new TitleFacetViaTitleAnnotation(titleComponents, facetHolder, getSpecificationLookup(), adapterMap, localizationProvider));
+        FacetUtil.addFacet(new TitleFacetViaTitleAnnotation(titleComponents, facetHolder, adapterMap, localizationProvider));
     }
     
     static class SequenceComparator implements Comparator<String> {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java Mon Nov  7 08:28:59 2011
@@ -32,7 +32,6 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
 import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.SpecificationLookup;
 import org.apache.log4j.Logger;
 
 import com.google.common.base.Function;
@@ -42,7 +41,6 @@ public class TitleFacetViaTitleAnnotatio
 
     private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleAnnotation.class);
     private final List<TitleComponent> components;
-    private final SpecificationLookup specificationLookup;
     private final AdapterMap adapterMap;
     private final LocalizationProvider localizationProvider;
 
@@ -59,11 +57,14 @@ public class TitleFacetViaTitleAnnotatio
         private final String prepend;
         private final String append;
         private final Method method;
-        private TitleComponent(String prepend, String append, Method method) {
+        private final int abbreviateTo;
+        
+        private TitleComponent(String prepend, String append, Method method, int abbreviateTo) {
             super();
             this.prepend = prepend;
             this.append = append;
             this.method = method;
+            this.abbreviateTo = abbreviateTo;
         }
         public String getPrepend() {
             return prepend;
@@ -78,13 +79,13 @@ public class TitleFacetViaTitleAnnotatio
             final Title annotation = method.getAnnotation(Title.class);
             final String prepend = annotation!=null?annotation.prepend():" ";
             final String append = annotation!=null?annotation.append():"";
-            return new TitleComponent(prepend, append, method);
+            final int abbreviateTo = annotation!=null?annotation.abbreviatedTo():Integer.MAX_VALUE;
+            return new TitleComponent(prepend, append, method, abbreviateTo);
         }
     }
-    public TitleFacetViaTitleAnnotation(final List<TitleComponent> components, final FacetHolder holder, SpecificationLookup specificationLookup, AdapterMap adapterMap, LocalizationProvider localizationProvider) {
+    public TitleFacetViaTitleAnnotation(final List<TitleComponent> components, final FacetHolder holder, AdapterMap adapterMap, LocalizationProvider localizationProvider) {
         super(holder);
         this.components = components;
-        this.specificationLookup = specificationLookup;
         this.adapterMap = adapterMap;
         this.localizationProvider = localizationProvider;
     }
@@ -92,12 +93,11 @@ public class TitleFacetViaTitleAnnotatio
     @Override
     public String title(final ObjectAdapter owningAdapter, final Localization localization) {
     	StringBuilder stringBuilder = new StringBuilder();
-
     	
         try {
-        	for (TitleComponent entry : this.components) {
+        	for (TitleComponent component : this.components) {
         		String title = null;
-                final Object titlePart = AdapterInvokeUtils.invoke(entry.getMethod(), owningAdapter);
+                final Object titlePart = AdapterInvokeUtils.invoke(component.getMethod(), owningAdapter);
         		if(titlePart != null) {
         		    // use either titleFacet...
         		    title = titleOf(titlePart);
@@ -110,10 +110,10 @@ public class TitleFacetViaTitleAnnotatio
         		    continue;
         		}
         		if(stringBuilder.length() > 0) {
-        		    stringBuilder.append(entry.getPrepend());
+        		    stringBuilder.append(component.getPrepend());
         		}
-        		stringBuilder.append(title);
-        		stringBuilder.append(entry.getAppend());
+        		stringBuilder.append(abbreviated(title, component.abbreviateTo));
+        		stringBuilder.append(component.getAppend());
         	}
 
         	return stringBuilder.toString().trim();
@@ -138,5 +138,10 @@ public class TitleFacetViaTitleAnnotatio
     public List<TitleComponent> getComponents() {
         return components;
     }
+    
+    private static String abbreviated(String str, int maxLength) {
+        return str.length() < maxLength?str:str.substring(0, maxLength-3)+"...";
+    }
+
 
 }

Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java Mon Nov  7 08:28:59 2011
@@ -100,7 +100,7 @@ public class TitleFacetViaTitleAnnotatio
         List<Method> methods = Arrays.asList(NormalDomainObject.class.getMethod("titleElement1"), NormalDomainObject.class.getMethod("titleElement2"), NormalDomainObject.class.getMethod("titleElement3"));
 
         final List<TitleComponent> components = Lists.transform(methods, TitleComponent.FROM_METHOD);
-        TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockSpecificationLookup, mockAdapterMap, mockLocalizationProvider);
+        TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterMap, mockLocalizationProvider);
     	final NormalDomainObject normalPojo = new NormalDomainObject();
     	final Sequence sequence = context.sequence("in-title-element-order");
 		context.checking(new Expectations(){{
@@ -127,7 +127,7 @@ public class TitleFacetViaTitleAnnotatio
         		Title.class);
 
         final List<TitleComponent> components = Lists.transform(methods, TitleComponent.FROM_METHOD);
-        TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockSpecificationLookup, mockAdapterMap, mockLocalizationProvider);
+        TitleFacetViaTitleAnnotation facet = new TitleFacetViaTitleAnnotation(components, mockFacetHolder, mockAdapterMap, mockLocalizationProvider);
     	final DomainObjectWithProblemInItsAnnotatedTitleMethod screwedPojo = new DomainObjectWithProblemInItsAnnotatedTitleMethod();
 		context.checking(new Expectations(){{
 			allowing(mockOwningAdapter).getObject();

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -28,6 +28,7 @@ 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.DomainTypeRepresentation;
 import org.apache.isis.viewer.json.applib.domaintypes.DomainTypesRepresentation;
 import org.apache.isis.viewer.json.applib.domaintypes.TypeActionParameterRepresentation;
@@ -52,12 +53,13 @@ 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), 
-    ERROR(RestfulMediaType.APPLICATION_JSON_ERROR, ErrorRepresentation.class),
-    GENERIC(MediaType.APPLICATION_JSON, JsonRepresentation.class);
+    TYPE_ACTION_PARAMETER(RestfulMediaType.APPLICATION_JSON_TYPE_ACTION_PARAMETER, TypeActionParameterRepresentation.class), 
+    ERROR(RestfulMediaType.APPLICATION_JSON_ERROR, ErrorRepresentation.class),
+    GENERIC(MediaType.APPLICATION_JSON, JsonRepresentation.class); 
     
     private final String name;
     private final MediaType mediaType;

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -30,24 +30,26 @@ public final class RestfulMediaType {
     
     private RestfulMediaType(){}
 
-    private static final String BASE = MediaType.APPLICATION_JSON + ";profile=\"urn:org.restfulobjects/";
+    private static final String BASE = MediaType.APPLICATION_JSON + ";profile=urn:org.restfulobjects/";
     
-    public final static String APPLICATION_JSON_HOME_PAGE = BASE + "homepage"+ "\"";
-    public final static String APPLICATION_JSON_USER = BASE + "user"+ "\"";
-    public final static String APPLICATION_JSON_CAPABILITIES = BASE + "capabilities"+ "\"";
-    public final static String APPLICATION_JSON_LIST = BASE + "list"+ "\"";
-    public final static String APPLICATION_JSON_SCALAR_VALUE = BASE + "scalarvalue"+ "\"";
-    public final static String APPLICATION_JSON_DOMAIN_OBJECT = BASE + "domainobject"+ "\"";
-    public final static String APPLICATION_JSON_OBJECT_PROPERTY = BASE + "objectproperty"+ "\"";
-    public final static String APPLICATION_JSON_OBJECT_COLLECTION = BASE + "objectcollection"+ "\"";
-    public final static String APPLICATION_JSON_OBJECT_ACTION = BASE + "objectaction"+ "\"";
-    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_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_ERROR = BASE + "error"+ "\"";
+    public final static String APPLICATION_JSON_HOME_PAGE = BASE + "homepage"+ "";
+    public final static String APPLICATION_JSON_USER = BASE + "user"+ "";
+    public final static String APPLICATION_JSON_CAPABILITIES = BASE + "capabilities"+ "";
+    public final static String APPLICATION_JSON_LIST = BASE + "list"+ "";
+    public final static String APPLICATION_JSON_SCALAR_VALUE = BASE + "scalarvalue"+ "";
+    public final static String APPLICATION_JSON_DOMAIN_OBJECT = BASE + "domainobject"+ "";
+    public final static String APPLICATION_JSON_OBJECT_PROPERTY = BASE + "objectproperty"+ "";
+    public final static String APPLICATION_JSON_OBJECT_COLLECTION = BASE + "objectcollection"+ "";
+    public final static String APPLICATION_JSON_OBJECT_ACTION = BASE + "objectaction"+ "";
+    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_ERROR = BASE + "error"+ "";
+
 
 }

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -22,6 +22,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -44,6 +45,15 @@ public interface DomainTypeResource {
     public abstract Response domainType(@PathParam("domainType") final String domainType);
 
     @GET
+    @Path("/{domainType}/isSubtypeOf/invoke")
+    @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPE })
+    @ClientResponseType(entityType=String.class)
+    public abstract Response domainTypeIsSubtypeOf(
+        @PathParam("domainType") final String domainType,
+        @QueryParam("args") final String argumentsQueryString
+        );
+
+    @GET
     @Path("/{domainType}/properties/{propertyId}")
     @Produces({ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_TYPE_PROPERTY })
     @ClientResponseType(entityType=String.class)

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/HasHttpStatusCode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/HasHttpStatusCode.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/HasHttpStatusCode.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/HasHttpStatusCode.java Mon Nov  7 08:28:59 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.viewer;
 
-import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
 
 public interface HasHttpStatusCode {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationException.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationException.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationException.java Mon Nov  7 08:28:59 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.viewer;
 
-import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
 
 public class JsonApplicationException extends RuntimeException implements HasHttpStatusCode {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationExceptionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationExceptionMapper.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationExceptionMapper.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplicationExceptionMapper.java Mon Nov  7 08:28:59 2011
@@ -18,19 +18,19 @@
  */
 package org.apache.isis.viewer.json.viewer;
 
-import java.util.List;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.isis.viewer.json.applib.RestfulMediaType;
-import org.apache.isis.viewer.json.applib.RestfulResponse;
-import org.apache.isis.viewer.json.applib.util.JsonMapper;
-
-import com.google.common.collect.Lists;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.isis.viewer.json.applib.RestfulMediaType;
+import org.apache.isis.viewer.json.applib.RestfulResponse;
+import org.apache.isis.viewer.json.applib.util.JsonMapper;
+
+import com.google.common.collect.Lists;
 
 @Provider
 public class JsonApplicationExceptionMapper implements ExceptionMapper<JsonApplicationException> {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java Mon Nov  7 08:28:59 2011
@@ -37,8 +37,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.applib.RestfulRequest.QueryParameter;
 import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
-import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainServiceLinkTo;
-import org.apache.isis.viewer.json.viewer.resources.domainobjects.ObjectAdapterLinkTo;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/RuntimeExceptionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/RuntimeExceptionMapper.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/RuntimeExceptionMapper.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/RuntimeExceptionMapper.java Mon Nov  7 08:28:59 2011
@@ -18,19 +18,19 @@
  */
 package org.apache.isis.viewer.json.viewer;
 
-import java.util.List;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.isis.viewer.json.applib.RestfulMediaType;
-import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
-import org.apache.isis.viewer.json.applib.util.JsonMapper;
-
-import com.google.common.collect.Lists;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.isis.viewer.json.applib.RestfulMediaType;
+import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.json.applib.util.JsonMapper;
+
+import com.google.common.collect.Lists;
 
 @Provider
 public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException> {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/GraphUtil.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/GraphUtil.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/GraphUtil.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/GraphUtil.java Mon Nov  7 08:28:59 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.isis.viewer.json.applib.PathNode;
-
-import com.google.common.collect.Maps;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.isis.viewer.json.applib.PathNode;
+
+import com.google.common.collect.Maps;
 
 @SuppressWarnings({"rawtypes","unchecked"})
 public final class GraphUtil {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkFollower.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/LinkFollower.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkFollower.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkFollower.java Mon Nov  7 08:28:59 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.PathNode;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.PathNode;
 
 
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Rel.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/Rel.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Rel.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/Rel.java Mon Nov  7 08:28:59 2011
@@ -43,6 +43,7 @@ public enum Rel {
     PROPERTY("property"), 
     COLLECTION("collection"), 
     ACTION("action"), 
+    TYPE_ACTION("typeaction"), 
     ACTION_PARAM("actionparam"), 
     RETURN_TYPE("returntype"), 
     ELEMENT_TYPE("elementtype"), 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactory.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/RendererFactory.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/RendererFactory.java Mon Nov  7 08:28:59 2011
@@ -18,9 +18,9 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-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.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.RepresentationType;
+import org.apache.isis.viewer.json.viewer.ResourceContext;
 
 public interface RendererFactory {
 

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -31,6 +31,7 @@ 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.DomainTypeReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypesReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeActionParamReprRenderer;
@@ -70,6 +71,7 @@ public class RendererFactoryRegistry {
         register(new TypeCollectionReprRenderer.Factory());
         register(new TypeActionReprRenderer.Factory());
         register(new TypeActionParamReprRenderer.Factory());
+        register(new DomainTypeIsSubtypeOfReprRenderer.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/ReprRenderer.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/ReprRenderer.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.RepresentationType;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.RepresentationType;
 
 
 public interface ReprRenderer<R extends ReprRenderer<R, T>, T> {

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -18,16 +18,16 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.applib.profiles.Localization;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+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.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.viewer.ResourceContext;
+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.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.domaintypes.DomainTypeReprRenderer;
 
 public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>, T> implements ReprRenderer<R, T> {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererFactoryAbstract.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/ReprRendererFactoryAbstract.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererFactoryAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererFactoryAbstract.java Mon Nov  7 08:28:59 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.isis.viewer.json.viewer.representations;
 
-import org.apache.isis.viewer.json.applib.RepresentationType;
+import org.apache.isis.viewer.json.applib.RepresentationType;
 
 public abstract class ReprRendererFactoryAbstract implements RendererFactory {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.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/ResourceAbstract.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java Mon Nov  7 08:28:59 2011
@@ -47,9 +47,7 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
 import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.applib.RestfulRequest.QueryParameter;
 import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
 import org.apache.isis.viewer.json.applib.util.JsonMapper;
 import org.apache.isis.viewer.json.viewer.JsonApplicationException;

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.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/capabilities/CapabilitiesReprRenderer.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java Mon Nov  7 08:28:59 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.capabilities;
 
-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.representations.LinkFollower;
-import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
-import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
-import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
+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.representations.LinkFollower;
+import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
+import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
+import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
 
 public class CapabilitiesReprRenderer extends ReprRendererAbstract<CapabilitiesReprRenderer, Void> {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/CollectionSemantics.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/CollectionSemantics.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/CollectionSemantics.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/CollectionSemantics.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.json.viewer.ResourceContext;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.viewer.json.viewer.ResourceContext;
 
 public enum CollectionSemantics {
 

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -48,7 +48,6 @@ import org.apache.isis.viewer.json.viewe
 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.ResourceAbstract.Caching;
 import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.Intent;
 
 @Path("/objects")
@@ -343,7 +342,7 @@ public class DomainObjectResourceServers
             @PathParam("oid") final String oidStr,
             @PathParam("actionId") final String actionId,
             @QueryParam("args") final String arguments) {
-        init(RepresentationType.GENERIC);
+        init(RepresentationType.ACTION_RESULT);
 
         final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), objectAdapter);
@@ -358,7 +357,7 @@ public class DomainObjectResourceServers
             @PathParam("oid") final String oidStr,
             @PathParam("actionId") final String actionId,
             final InputStream arguments) {
-        init(RepresentationType.GENERIC);
+        init(RepresentationType.ACTION_RESULT);
 
         final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), objectAdapter);
@@ -374,7 +373,7 @@ public class DomainObjectResourceServers
             @PathParam("oid") final String oidStr,
             @PathParam("actionId") final String actionId,
             final InputStream body) {
-        init(RepresentationType.GENERIC);
+        init(RepresentationType.ACTION_RESULT);
         
         final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
         final DomainResourceHelper helper = new DomainResourceHelper(getResourceContext(), objectAdapter);

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -18,7 +18,6 @@ package org.apache.isis.viewer.json.view
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -29,8 +28,6 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.version.Version;
 import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -43,11 +40,8 @@ import org.apache.isis.viewer.json.appli
 import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
 import org.apache.isis.viewer.json.applib.util.JsonMapper;
-import org.apache.isis.viewer.json.applib.util.UrlEncodingUtils;
 import org.apache.isis.viewer.json.viewer.JsonApplicationException;
 import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
-import org.apache.isis.viewer.json.viewer.representations.Rel;
 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;
@@ -157,20 +151,7 @@ public class DomainResourceHelper {
 
 
     static JsonRepresentation parseQueryString(ObjectAction action, String argumentsQueryString) {
-        if(argumentsQueryString == null) {
-            return JsonRepresentation.newMap();
-        }
-        String argumentsTrimmed = argumentsQueryString.trim();
-        if(argumentsTrimmed .isEmpty()) {
-            return JsonRepresentation.newMap();
-        }
-        final String urlDecode = UrlEncodingUtils.urlDecode(argumentsTrimmed);
-        try {
-            return JsonMapper.instance().read(urlDecode);
-        } catch (Exception e) {
-            throw JsonApplicationException.create(HttpStatusCode.BAD_REQUEST,
-                    "Action '%s' has query arguments that cannot be parsed as JSON", e, action.getId());
-        }
+        return QueryStringUtil.parseQueryString(argumentsQueryString, "Action", action.getId());
     }
 
     Response invokeActionIdempotent(

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoder.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/JsonValueEncoder.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoder.java Mon Nov  7 08:28:59 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
 
 /**
  * Similar to Isis' value encoding, but with additional support for JSON primitives. 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.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/ListReprRenderer.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java Mon Nov  7 08:28:59 2011
@@ -22,9 +22,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.json.applib.JsonRepresentation;
 import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.applib.blocks.LinkRepresentation;
 import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
 import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
 import org.apache.isis.viewer.json.viewer.representations.Rel;
 import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
@@ -32,7 +30,6 @@ import org.apache.isis.viewer.json.viewe
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 
 public class ListReprRenderer extends ReprRendererAbstract<ListReprRenderer, Collection<ObjectAdapter>> {
 

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
 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;

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.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/ObjectAdapterLinkTo.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkTo.java Mon Nov  7 08:28:59 2011
@@ -18,12 +18,12 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
-import org.apache.isis.viewer.json.viewer.representations.Rel;
+import org.apache.isis.viewer.json.viewer.ResourceContext;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
+import org.apache.isis.viewer.json.viewer.representations.Rel;
 
 public interface ObjectAdapterLinkTo {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndAction.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/ObjectAndAction.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndAction.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndAction.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 
 public class ObjectAndAction extends ObjectAndMember<ObjectAction>{
     

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndCollection.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/ObjectAndCollection.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndCollection.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndCollection.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 
 public class ObjectAndCollection extends ObjectAndMember<OneToManyAssociation>{
     

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndMember.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/ObjectAndMember.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndMember.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndMember.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
 
 public abstract class ObjectAndMember<T extends ObjectMember> {
     

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndProperty.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/ObjectAndProperty.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndProperty.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAndProperty.java Mon Nov  7 08:28:59 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.isis.viewer.json.viewer.resources.domainobjects;
 
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 
 public class ObjectAndProperty extends ObjectAndMember<OneToOneAssociation>{
     

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -33,7 +33,6 @@ 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.domainobjects.AbstractObjectMemberReprRenderer.Mode;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypeCollectionReprRenderer;
 
 import com.google.common.collect.Lists;

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -31,8 +31,6 @@ 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.domainobjects.AbstractObjectMemberReprRenderer.Mode;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 import org.apache.isis.viewer.json.viewer.resources.domaintypes.TypePropertyReprRenderer;
 import org.codehaus.jackson.node.NullNode;
 

Added: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/QueryStringUtil.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/QueryStringUtil.java?rev=1198645&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/QueryStringUtil.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/QueryStringUtil.java Mon Nov  7 08:28:59 2011
@@ -0,0 +1,30 @@
+package org.apache.isis.viewer.json.viewer.resources.domainobjects;
+
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
+import org.apache.isis.viewer.json.applib.util.JsonMapper;
+import org.apache.isis.viewer.json.applib.util.UrlEncodingUtils;
+import org.apache.isis.viewer.json.viewer.JsonApplicationException;
+
+public final class QueryStringUtil {
+    
+    private QueryStringUtil(){}
+
+    public static JsonRepresentation parseQueryString(String argumentsQueryString, final String descriptor, final String id) {
+        if(argumentsQueryString == null) {
+            return JsonRepresentation.newMap();
+        }
+        String argumentsTrimmed = argumentsQueryString.trim();
+        if(argumentsTrimmed .isEmpty()) {
+            return JsonRepresentation.newMap();
+        }
+        final String urlDecode = UrlEncodingUtils.urlDecode(argumentsTrimmed);
+        try {
+            return JsonMapper.instance().read(urlDecode);
+        } catch (Exception e) {
+            throw JsonApplicationException.create(HttpStatusCode.BAD_REQUEST,
+                    "%s '%s' has query arguments that cannot be parsed as JSON", e, descriptor, id);
+        }
+    }
+
+}

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.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/ScalarValueReprRenderer.java?rev=1198645&r1=1198644&r2=1198645&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ScalarValueReprRenderer.java Mon Nov  7 08:28:59 2011
@@ -24,13 +24,11 @@ import org.apache.isis.viewer.json.appli
 import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
 import org.apache.isis.viewer.json.viewer.JsonApplicationException;
 import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
 import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
 import org.apache.isis.viewer.json.viewer.representations.Rel;
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
 
 public class ScalarValueReprRenderer extends ReprRendererAbstract<ScalarValueReprRenderer, ObjectAdapter> {
 

Added: 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/DomainTypeIsSubtypeOfReprRenderer.java?rev=1198645&view=auto
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java (added)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeIsSubtypeOfReprRenderer.java Mon Nov  7 08:28:59 2011
@@ -0,0 +1,103 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.isis.viewer.json.viewer.resources.domaintypes;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+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.representations.LinkBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
+import org.apache.isis.viewer.json.viewer.representations.Rel;
+import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
+import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
+import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
+import org.codehaus.jackson.node.NullNode;
+
+public class DomainTypeIsSubtypeOfReprRenderer extends ReprRendererAbstract<DomainTypeIsSubtypeOfReprRenderer, ObjectSpecAndSuperSpec> {
+
+    public static class Factory extends ReprRendererFactoryAbstract {
+        public Factory() {
+            super(RepresentationType.DOMAIN_TYPE_IS_SUBTYPE_OF);
+        }
+
+        @Override
+        public ReprRenderer<?, ?> newRenderer(ResourceContext resourceContext, LinkFollower linkFollower, JsonRepresentation representation) {
+            return new DomainTypeIsSubtypeOfReprRenderer(resourceContext, linkFollower, getRepresentationType(), representation);
+        }
+    }
+
+    public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, Rel rel, ObjectSpecAndSuperSpec objectSpecAndSuperSpec) {
+        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 JsonRepresentation arguments = argumentsTo(resourceContext, objectSpecAndSuperSpec.getSuperSpecification());
+        
+        return linkBuilder.withArguments(arguments);
+    }
+
+    private static JsonRepresentation argumentsTo(ResourceContext resourceContext, final ObjectSpecification superSpec) {
+        final JsonRepresentation arguments = JsonRepresentation.newMap();
+        final JsonRepresentation supertypeLink = JsonRepresentation.newMap();
+        arguments.mapPut("supertype", supertypeLink);
+        if(superSpec != null) {
+            supertypeLink.mapPut("href", resourceContext.urlFor("domainTypes/" + superSpec.getFullIdentifier()));
+        } else {
+            supertypeLink.mapPut("href", NullNode.instance);
+        }
+        return arguments;
+    }
+
+    private ObjectSpecification objectSpecification;
+    private ObjectSpecification superSpecification;
+
+    public DomainTypeIsSubtypeOfReprRenderer(ResourceContext resourceContext, LinkFollower linkFollower, RepresentationType representationType, JsonRepresentation representation) {
+        super(resourceContext, linkFollower, representationType, representation);
+    }
+
+    @Override
+    public DomainTypeIsSubtypeOfReprRenderer with(ObjectSpecAndSuperSpec objectSpecAndSuperSpec) {
+        this.objectSpecification = objectSpecAndSuperSpec.getObjectSpecification();
+        this.superSpecification = objectSpecAndSuperSpec.getSuperSpecification();
+        return cast(this);
+    }
+
+    public JsonRepresentation render() {
+
+        // self
+        if(includesSelf) {
+            final JsonRepresentation selfLink = newLinkToBuilder(getResourceContext(), Rel.SELF, new ObjectSpecAndSuperSpec(objectSpecification, superSpecification)).build();
+            getLinks().arrayAdd(selfLink);
+        }
+
+        representation.mapPut("isSubtypeOf", isSubtypeOf());
+        getExtensions();
+        
+        return representation;
+    }
+    
+    private boolean isSubtypeOf() {
+        return objectSpecification.isOfType(superSpecification);
+    }
+
+    protected void putExtensionsIfService() {
+        getExtensions().mapPut("isService", objectSpecification.isService());
+    }
+
+}
\ No newline at end of file

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=1198645&r1=1198644&r2=1198645&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 Mon Nov  7 08:28:59 2011
@@ -23,13 +23,12 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer.Contributed;
 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.OneToOneActionParameter;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 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.representations.LinkFollower;
 import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkFollower;
 import org.apache.isis.viewer.json.viewer.representations.Rel;
 import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
 import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
@@ -68,23 +67,26 @@ public class DomainTypeReprRenderer exte
         return cast(this);
     }
 
-
     public JsonRepresentation render() {
 
+        if(objectSpecification == null) {
+            throw new IllegalStateException("ObjectSpecification not specified");
+        } 
+
         // self
         if(includesSelf) {
             final JsonRepresentation selfLink = newLinkToBuilder(getResourceContext(), Rel.SELF, objectSpecification).build();
             getLinks().arrayAdd(selfLink);
         }
         
-        if(objectSpecification != null) {
-            representation.mapPut("canonicalName", objectSpecification.getFullIdentifier());
-            addMembers();
-
-            putExtensionsNames();
-            putExtensionsDescriptionIfAvailable();
-            putExtensionsIfService();
-        }
+        representation.mapPut("canonicalName", objectSpecification.getFullIdentifier());
+        addMembers();
+        
+        addTypeActions();
+
+        putExtensionsNames();
+        putExtensionsDescriptionIfAvailable();
+        putExtensionsIfService();
 
         return representation;
     }
@@ -109,7 +111,22 @@ public class DomainTypeReprRenderer exte
             final LinkBuilder linkBuilder = TypeActionReprRenderer.newLinkToBuilder(getResourceContext(), Rel.ACTION, objectSpecification, action);
             membersList.arrayAdd(linkBuilder.build());
         }
-        
+    }
+
+    private JsonRepresentation getTypeActions() {
+        JsonRepresentation typeActions = representation.getArray("typeActions");
+        if(typeActions == null) {
+            typeActions = JsonRepresentation.newArray();
+            representation.mapPut("typeActions", typeActions);
+        }
+        return typeActions;
+    }
+
+    private void addTypeActions() {
+        final ObjectSpecAndSuperSpec objectSpecAndSuperSpec = new ObjectSpecAndSuperSpec(objectSpecification, null);
+        final LinkBuilder linkBuilder = DomainTypeIsSubtypeOfReprRenderer.newLinkToBuilder(getResourceContext(), Rel.TYPE_ACTION, objectSpecAndSuperSpec);
+        JsonRepresentation link = linkBuilder.withId("isSubtypeOf").build();
+        getTypeActions().arrayAdd(link);
     }