incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1354715 - in /incubator/isis/trunk/framework: quickstart-archetype/src/main/resources/archetype-resources/ quickstart-archetype/src/main/resources/archetype-resources/webapp/ tck/ viewer/ viewer/json/ viewer/restfulobjects/ viewer/restfulo...
Date Wed, 27 Jun 2012 20:38:57 GMT
Author: danhaywood
Date: Wed Jun 27 20:38:52 2012
New Revision: 1354715

URL: http://svn.apache.org/viewvc?rev=1354715&view=rev
Log:
ISIS-233: renaming json-viewer to restfulobjects-viewer

Added:
    incubator/isis/trunk/framework/viewer/restfulobjects/
      - copied from r1354232, incubator/isis/trunk/framework/viewer/json/
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/
      - copied from r1354232, incubator/isis/trunk/framework/viewer/json/json-applib/
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/
      - copied from r1354232, incubator/isis/trunk/framework/viewer/json/json-tck/
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/
      - copied from r1354232, incubator/isis/trunk/framework/viewer/json/json-viewer/
    incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
      - copied, changed from r1354232, incubator/isis/trunk/framework/viewer/json/src/docbkx/guide/isis-json-viewer.xml
Removed:
    incubator/isis/trunk/framework/viewer/json/
    incubator/isis/trunk/framework/viewer/restfulobjects/json-applib/
    incubator/isis/trunk/framework/viewer/restfulobjects/json-tck/
    incubator/isis/trunk/framework/viewer/restfulobjects/json-viewer/
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_clientAcceptHeader_exceptionHandling.java
    incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-json-viewer.xml
Modified:
    incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
    incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml
    incubator/isis/trunk/framework/tck/pom.xml
    incubator/isis/trunk/framework/viewer/pom.xml
    incubator/isis/trunk/framework/viewer/restfulobjects/pom.xml
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getMediaType_lookup.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/version/VersionResourceTest_representationAndHeaders.java
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
    incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
    incubator/isis/trunk/framework/viewer/restfulobjects/src/site/apt/index.apt
    incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml?rev=1354715&r1=1354714&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml Wed Jun 27 20:38:52 2012
@@ -387,17 +387,17 @@
             <!-- isis: viewer: json -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json</artifactId>
+                <artifactId>restfulobjects</artifactId>
                 <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json-applib</artifactId>
+                <artifactId>restfulobjects-applib</artifactId>
                 <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json-viewer</artifactId>
+                <artifactId>restfulobjects-viewer</artifactId>
                 <version>${isis.version}</version>
             </dependency>
 

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml?rev=1354715&r1=1354714&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml Wed Jun 27 20:38:52 2012
@@ -127,7 +127,7 @@
 
         <dependency>
             <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>json-viewer</artifactId>
+            <artifactId>restfulobjects-viewer</artifactId>
         </dependency>
 
         <dependency>

Modified: incubator/isis/trunk/framework/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/pom.xml?rev=1354715&r1=1354714&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/pom.xml Wed Jun 27 20:38:52 2012
@@ -451,17 +451,17 @@
             <!-- isis: viewer: json -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json</artifactId>
+                <artifactId>restfulobjects</artifactId>
                 <version>0.3.1-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json-applib</artifactId>
+                <artifactId>restfulobjects-applib</artifactId>
                 <version>0.3.1-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>json-viewer</artifactId>
+                <artifactId>restfulobjects-viewer</artifactId>
                 <version>0.3.1-incubating-SNAPSHOT</version>
             </dependency>
 

Modified: incubator/isis/trunk/framework/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/pom.xml?rev=1354715&r1=1354714&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/pom.xml Wed Jun 27 20:38:52 2012
@@ -46,7 +46,7 @@
 		<module>html-tck</module>
 		<module>scimpi</module>
 		<module>wicket</module>
-		<module>json</module>
+		<module>restfulobjects</module>
 		<module>bdd</module>
 		<module>junit</module>
 		<module>junit-tck</module>

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/pom.xml?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/pom.xml Wed Jun 27 20:38:52 2012
@@ -28,19 +28,19 @@
 	</parent>
 
 	<groupId>org.apache.isis.viewer</groupId>
-	<artifactId>json</artifactId>
+	<artifactId>restfulobjects</artifactId>
 
-	<name>JSON Viewer</name>
+	<name>RestfulObjects Viewer</name>
 
 	<packaging>pom</packaging>
 
     <properties>
         <siteBaseDir>../..</siteBaseDir>
-		<relativeUrl>viewer/json/</relativeUrl>
+		<relativeUrl>viewer/restfulobjects/</relativeUrl>
 
-        <docbkxGuideTitle>Apache Isis JSON Viewer</docbkxGuideTitle>
+        <docbkxGuideTitle>RestfulObjects for Isis</docbkxGuideTitle>
         <docbkxGuideSubTitle>Programming, Configuration and Deployment Guide</docbkxGuideSubTitle>
-        <docbkxGuideName>isis-json-viewer</docbkxGuideName>
+        <docbkxGuideName>isis-restfulobjects-viewer</docbkxGuideName>
     </properties>
 	
     <!-- used in Site generation for relative references. -->
@@ -95,26 +95,26 @@
                 <scope>import</scope>
             </dependency>
 
-			<!-- JSON Viewer -->
+			<!-- RestfulObjectRestfulObjects Viewer -->
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>json-applib</artifactId>
+				<artifactId>restfulobjects-applib</artifactId>
 				<version>0.3.1-incubating-SNAPSHOT</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>json-applib</artifactId>
+				<artifactId>restfulobjects-applib</artifactId>
 				<version>0.3.1-incubating-SNAPSHOT</version>
                 <type>test-jar</type>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>json-viewer</artifactId>
+				<artifactId>restfulobjects-viewer</artifactId>
 				<version>0.3.1-incubating-SNAPSHOT</version>
 			</dependency>
 	   		<dependency>
 				<groupId>org.apache.isis.viewer</groupId>
-				<artifactId>json-viewer</artifactId>
+				<artifactId>restfulobjects-viewer</artifactId>
 				<version>0.3.1-incubating-SNAPSHOT</version>
                 <type>test-jar</type>
 			</dependency>
@@ -126,9 +126,9 @@
 
     <!-- USE -pl xxx TO SELECT A SINGLE MODULE -->
     <modules>
-	    <module>json-applib</module>
-	    <module>json-viewer</module>
-	    <module>json-tck</module>
+	    <module>restfulobjects-applib</module>
+	    <module>restfulobjects-viewer</module>
+	    <module>restfulobjects-tck</module>
     </modules>
 
 </project>

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/pom.xml Wed Jun 27 20:38:52 2012
@@ -22,16 +22,16 @@
 
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
-		<artifactId>json</artifactId>
+		<artifactId>restfulobjects</artifactId>
 		<version>0.3.1-incubating-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>json-applib</artifactId>
-	<name>JSON Viewer AppLib</name>
+	<artifactId>restfulobjects-applib</artifactId>
+	<name>RestfulObjects Viewer AppLib</name>
 
 	<properties>
 		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/json/applib/</relativeUrl>
+		<relativeUrl>viewer/restfulobjects/applib/</relativeUrl>
 	</properties>
 
     <!-- used in Site generation for relative references. -->

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RepresentationType.java Wed Jun 27 20:38:52 2012
@@ -44,14 +44,26 @@ import org.apache.isis.viewer.json.appli
 
 public enum RepresentationType {
 
-    HOME_PAGE(RestfulMediaType.APPLICATION_JSON_HOME_PAGE, HomePageRepresentation.class), USER(RestfulMediaType.APPLICATION_JSON_USER, UserRepresentation.class), VERSION(RestfulMediaType.APPLICATION_JSON_VERSION, VersionRepresentation.class), LIST(RestfulMediaType.APPLICATION_JSON_LIST,
-            ListRepresentation.class), SCALAR_VALUE(RestfulMediaType.APPLICATION_JSON_SCALAR_VALUE, ScalarValueRepresentation.class), DOMAIN_OBJECT(RestfulMediaType.APPLICATION_JSON_DOMAIN_OBJECT, DomainObjectRepresentation.class), TRANSIENT_DOMAIN_OBJECT(
-            RestfulMediaType.APPLICATION_JSON_TRANSIENT_DOMAIN_OBJECT, TransientDomainObjectRepresentation.class), OBJECT_PROPERTY(RestfulMediaType.APPLICATION_JSON_OBJECT_PROPERTY, ObjectPropertyRepresentation.class), OBJECT_COLLECTION(RestfulMediaType.APPLICATION_JSON_OBJECT_COLLECTION,
-            ObjectCollectionRepresentation.class), OBJECT_ACTION(RestfulMediaType.APPLICATION_JSON_OBJECT_ACTION, ObjectActionRepresentation.class), ACTION_RESULT(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT, ActionResultRepresentation.class), TYPE_LIST(
-            RestfulMediaType.APPLICATION_JSON_TYPE_LIST, TypeListRepresentation.class), DOMAIN_TYPE(RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPE, DomainTypeRepresentation.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_TYPE_ACTION_RESULT, TypeActionResultRepresentation.class), ERROR(RestfulMediaType.APPLICATION_JSON_ERROR,
-            ErrorRepresentation.class), GENERIC(MediaType.APPLICATION_JSON, JsonRepresentation.class);
+    HOME_PAGE(RestfulMediaType.APPLICATION_JSON_HOME_PAGE, HomePageRepresentation.class), 
+    USER(RestfulMediaType.APPLICATION_JSON_USER, UserRepresentation.class), 
+    VERSION(RestfulMediaType.APPLICATION_JSON_VERSION, VersionRepresentation.class), 
+    LIST(RestfulMediaType.APPLICATION_JSON_LIST, ListRepresentation.class), 
+    SCALAR_VALUE(RestfulMediaType.APPLICATION_JSON_SCALAR_VALUE, ScalarValueRepresentation.class), 
+    DOMAIN_OBJECT(RestfulMediaType.APPLICATION_JSON_DOMAIN_OBJECT, DomainObjectRepresentation.class), 
+    TRANSIENT_DOMAIN_OBJECT(RestfulMediaType.APPLICATION_JSON_TRANSIENT_DOMAIN_OBJECT, TransientDomainObjectRepresentation.class), 
+    OBJECT_PROPERTY(RestfulMediaType.APPLICATION_JSON_OBJECT_PROPERTY, ObjectPropertyRepresentation.class), 
+    OBJECT_COLLECTION(RestfulMediaType.APPLICATION_JSON_OBJECT_COLLECTION, ObjectCollectionRepresentation.class), 
+    OBJECT_ACTION(RestfulMediaType.APPLICATION_JSON_OBJECT_ACTION, ObjectActionRepresentation.class), 
+    ACTION_RESULT(RestfulMediaType.APPLICATION_JSON_ACTION_RESULT, ActionResultRepresentation.class), 
+    TYPE_LIST(RestfulMediaType.APPLICATION_JSON_TYPE_LIST, TypeListRepresentation.class), 
+    DOMAIN_TYPE(RestfulMediaType.APPLICATION_JSON_DOMAIN_TYPE, DomainTypeRepresentation.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_TYPE_ACTION_RESULT, TypeActionResultRepresentation.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/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/RestfulMediaType.java Wed Jun 27 20:38:52 2012
@@ -30,26 +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:repr-types/";
 
     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_VERSION = BASE + "version";
     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_SCALAR_VALUE = BASE + "scalar-value";
+    public final static String APPLICATION_JSON_DOMAIN_OBJECT = BASE + "object";
     public final static String APPLICATION_JSON_TRANSIENT_DOMAIN_OBJECT = BASE + "transient";
-    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_TYPE_LIST = BASE + "typelist";
-    public final static String APPLICATION_JSON_DOMAIN_TYPE = BASE + "domaintype";
-    public final static String APPLICATION_JSON_TYPE_ACTION_RESULT = BASE + "typeactionresult";
-    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_OBJECT_PROPERTY = BASE + "object-property";
+    public final static String APPLICATION_JSON_OBJECT_COLLECTION = BASE + "object-collection";
+    public final static String APPLICATION_JSON_OBJECT_ACTION = BASE + "object-action";
+    public final static String APPLICATION_JSON_ACTION_RESULT = BASE + "action-result";
+    public final static String APPLICATION_JSON_TYPE_LIST = BASE + "type-list";
+    public final static String APPLICATION_JSON_DOMAIN_TYPE = BASE + "domain-type";
+    public final static String APPLICATION_JSON_TYPE_ACTION_RESULT = BASE + "type-action-result";
+    public final static String APPLICATION_JSON_PROPERTY_DESCRIPTION = BASE + "property-description";
+    public final static String APPLICATION_JSON_COLLECTION_DESCRIPTION = BASE + "collection-description";
+    public final static String APPLICATION_JSON_ACTION_DESCRIPTION = BASE + "action-description";
+    public final static String APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION = BASE + "action-param-description";
     public final static String APPLICATION_JSON_ERROR = BASE + "error";
 
 }

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/json/applib/links/Rel.java Wed Jun 27 20:38:52 2012
@@ -23,8 +23,29 @@ public enum Rel {
     SELF("self"), DESCRIBEDBY("describedby"), UP("up"), HELP("help"), ICON("icon"),
 
     // Restful Objects namespace
-    ICON16("icon16"), ICON32("icon32"), OBJECT("object"), SERVICE("service"), CHOICE("choice"), DEFAULT("default"), DETAILS("details"), MODIFY("modify"), CLEAR("clear"), ADD_TO("addto"), REMOVE_FROM("removefrom"), INVOKE("invoke"), PERSIST("persist"), PROPERTY("property"), COLLECTION("collection"), ACTION(
-            "action"), TYPE_ACTION("typeaction"), ACTION_PARAM("actionparam"), RETURN_TYPE("returntype"), ELEMENT_TYPE("elementtype"), VERSION("version"), USER("user"), SERVICES("services"), TYPES("types"), DOMAIN_TYPE("domaintype"),
+    OBJECT("urn:org.restfulobjects:rels/object"), 
+    SERVICE("urn:org.restfulobjects:rels/service"), 
+    CHOICE("urn:org.restfulobjects:rels/choice"), 
+    DEFAULT("urn:org.restfulobjects:rels/default"), 
+    DETAILS("urn:org.restfulobjects:rels/details"), 
+    MODIFY("urn:org.restfulobjects:rels/modify"), 
+    CLEAR("urn:org.restfulobjects:rels/clear"), 
+    ADD_TO("urn:org.restfulobjects:rels/add-to"), 
+    REMOVE_FROM("urn:org.restfulobjects:rels/remove-from"), 
+    INVOKE("urn:org.restfulobjects:rels/invoke"), 
+    PERSIST("urn:org.restfulobjects:rels/persist"), 
+    PROPERTY("urn:org.restfulobjects:rels/property"), 
+    COLLECTION("urn:org.restfulobjects:rels/collection"), 
+    ACTION("urn:org.restfulobjects:rels/action"), 
+    TYPE_ACTION("urn:org.restfulobjects:rels/typeaction"), 
+    ACTION_PARAM("urn:org.restfulobjects:rels/action-param"), 
+    RETURN_TYPE("urn:org.restfulobjects:rels/return-type"), 
+    ELEMENT_TYPE("urn:org.restfulobjects:rels/element-type"), 
+    VERSION("urn:org.restfulobjects:rels/version"), 
+    USER("urn:org.restfulobjects:rels/user"), 
+    SERVICES("urn:org.restfulobjects:rels/services"), 
+    DOMAIN_TYPES("urn:org.restfulobjects:rels/domain-types"), 
+    DOMAIN_TYPE("urn:org.restfulobjects:rels/domain-type"),
 
     // implementation specific
     CONTRIBUTED_BY("contributedby");

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getMediaType_lookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getMediaType_lookup.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getMediaType_lookup.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getMediaType_lookup.java Wed Jun 27 20:38:52 2012
@@ -50,7 +50,7 @@ public class RepresentationTypeTest_getM
 
     @Test
     public void getMediaTypeProfile() {
-        assertThat(RepresentationType.VERSION.getMediaTypeWithProfile(), is("urn:org.restfulobjects/version"));
+        assertThat(RepresentationType.VERSION.getMediaTypeWithProfile(), is("urn:org.restfulobjects:repr-types/version"));
         assertThat(RepresentationType.GENERIC.getMediaTypeWithProfile(), is(nullValue()));
     }
 

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml Wed Jun 27 20:38:52 2012
@@ -27,17 +27,17 @@
     </parent>
 
     <groupId>org.apache.isis.viewer</groupId>
-	<artifactId>json-tck</artifactId>
-	<name>JSON Viewer for TCK</name>
+	<artifactId>restfulobjects-tck</artifactId>
+	<name>RestfulObjects Viewer for TCK</name>
 	
 	<packaging>war</packaging>
 	
     <properties>
         <maven.test.skip>true</maven.test.skip>
 		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/json/json-tck/</relativeUrl>
+		<relativeUrl>viewer/restfulobjects/restfulobjects-tck/</relativeUrl>
 		<!-- until someone comes up with a better solution -->
-        <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/json</distMgmtSiteUrl>
+        <distMgmtSiteUrl>file:///tmp/m2-sites/isis/viewer/restfulobjects</distMgmtSiteUrl>
     </properties>
 	
 
@@ -84,7 +84,7 @@
         <!-- isis viewer -->
 		<dependency>
 	        <groupId>org.apache.isis.viewer</groupId>
-			<artifactId>json-viewer</artifactId>
+			<artifactId>restfulobjects-viewer</artifactId>
 		</dependency>
 
         <!-- isis runtime -->

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/RepresentationMatchers.java Wed Jun 27 20:38:52 2012
@@ -99,7 +99,7 @@ public class RepresentationMatchers {
         };
     }
 
-    public static <T extends JsonRepresentation> Matcher<T> isFollowableLinkToSelf(final RestfulClient client) {
+    public static <T extends JsonRepresentation> Matcher<T> hasFollowableLinkToSelf(final RestfulClient client) {
         return new TypeSafeMatcher<T>() {
 
             @Override

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/AnyResourceTest_serverSideException_exceptionHandling.java Wed Jun 27 20:38:52 2012
@@ -21,10 +21,6 @@ package org.apache.isis.viewer.json.tck.
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import javax.ws.rs.core.MediaType;
-
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,13 +28,11 @@ import org.junit.Test;
 import org.apache.isis.runtimes.dflt.webserver.WebServer;
 import org.apache.isis.viewer.json.applib.HttpMethod;
 import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.applib.RestfulClient;
 import org.apache.isis.viewer.json.applib.RestfulRequest;
 import org.apache.isis.viewer.json.applib.RestfulRequest.Header;
 import org.apache.isis.viewer.json.applib.RestfulResponse;
 import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
-import org.apache.isis.viewer.json.applib.homepage.HomePageRepresentation;
 import org.apache.isis.viewer.json.applib.util.Parser;
 import org.apache.isis.viewer.json.tck.IsisWebServerRule;
 
@@ -59,8 +53,8 @@ public class AnyResourceTest_serverSideE
     public void runtimeException_isMapped() throws Exception {
 
         // given
-        final RestfulRequest restfulReq = client.createRequest(HttpMethod.GET, "version");
-        final Header<Boolean> header = new Header<Boolean>("X-FAIL", Parser.forBoolean());
+        final RestfulRequest restfulReq = client.createRequest(HttpMethod.GET, "/");
+        final Header<Boolean> header = new Header<Boolean>("X-FAIL", Parser.forBoolean()); // force a failure...
         restfulReq.withHeader(header, true);
 
         // when

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_accept.java Wed Jun 27 20:38:52 2012
@@ -23,12 +23,16 @@ import static org.junit.Assert.assertTha
 
 import javax.ws.rs.core.MediaType;
 
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
 import org.apache.isis.runtimes.dflt.webserver.WebServer;
 import org.apache.isis.viewer.json.applib.HttpMethod;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
 import org.apache.isis.viewer.json.applib.RepresentationType;
 import org.apache.isis.viewer.json.applib.RestfulClient;
 import org.apache.isis.viewer.json.applib.RestfulRequest;
@@ -51,30 +55,74 @@ public class HomePageResourceTest_accept
     }
 
     @Test
-    public void applicationJson() throws Exception {
+    public void noAcceptHeader_isOk() throws Exception {
+        // given
+        final RestfulRequest restfulReq = client.createRequest(HttpMethod.GET, "/");
 
+        // when
+        final RestfulResponse<HomePageRepresentation> restfulResp = restfulReq.executeT();
+
+        // then
+        assertThat(restfulResp.getStatus(), is(HttpStatusCode.OK));
+    }
+
+    @Test
+    public void applicationJson_profileParameterOmitted_isOk() throws Exception {
+
+        // given
         final RestfulRequest request = client.createRequest(HttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, MediaType.APPLICATION_JSON_TYPE);
+
+        // when
         final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
 
+        // then
         assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
     }
 
     @Test
-    public void applicationJson_profileHomePage() throws Exception {
+    public void applicationJson_profileParameterCorrectlySetToHomePage_isOk() throws Exception {
 
+        // given
         final RestfulRequest request = client.createRequest(HttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.HOME_PAGE.getMediaType());
+        
+        // when
         final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
 
+        // then
         assertThat(restfulResponse.getStatus(), is(HttpStatusCode.OK));
     }
 
     @Test
-    public void applicationJson_invalid() throws Exception {
+    public void applicationJson_profileParameterIncorrectlySet_isNotAcceptable() throws Exception {
 
+        // given
         final RestfulRequest request = client.createRequest(HttpMethod.GET, "/").withHeader(RestfulRequest.Header.ACCEPT, RepresentationType.USER.getMediaType());
+        
+        // when
         final RestfulResponse<HomePageRepresentation> restfulResponse = request.executeT();
 
+        // then
         assertThat(restfulResponse.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
     }
 
+
+    @Ignore("RestEasy seems to reject with a 500, 'No match for accept header', rather than a 405.")
+    @Test
+    public void incorrectMediaType_isNotAcceptable() throws Exception {
+
+        // given
+        final ClientRequest clientRequest = client.getClientRequestFactory().createRelativeRequest("/");
+        clientRequest.accept(MediaType.APPLICATION_ATOM_XML_TYPE);
+
+        // when
+        final ClientResponse<?> resp = clientRequest.get();
+        final RestfulResponse<JsonRepresentation> restfulResp = RestfulResponse.of(resp);
+        
+        @SuppressWarnings("unused")
+        final String entity = restfulResp.getEntity().toString();
+
+        // then
+        assertThat(restfulResp.getStatus(), is(HttpStatusCode.NOT_ACCEPTABLE));
+    }
+    
 }

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_representationAndHeaders.java Wed Jun 27 20:38:52 2012
@@ -24,7 +24,7 @@ import static org.apache.isis.viewer.jso
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasSubType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isArray;
-import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isFollowableLinkToSelf;
+import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasFollowableLinkToSelf;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isLink;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isMap;
 import static org.hamcrest.CoreMatchers.is;
@@ -110,7 +110,7 @@ public class HomePageResourceTest_repres
         final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
         assertThat(contentType, hasType("application"));
         assertThat(contentType, hasSubType("json"));
-        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/homepage"));
+        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/homepage"));
         assertThat(contentType, is(RepresentationType.HOME_PAGE.getMediaType()));
 
         // then
@@ -125,7 +125,8 @@ public class HomePageResourceTest_repres
         final HomePageRepresentation repr = givenRepresentation();
 
         // when, then
-        assertThat(repr, isFollowableLinkToSelf(client));
+        assertThat(repr, hasFollowableLinkToSelf(client));
+        assertThat(repr.getSelf(), isLink(client).returning(HttpStatusCode.OK));
     }
 
     @Test

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/home/HomePageResourceTest_xrofollowlinks.java Wed Jun 27 20:38:52 2012
@@ -73,7 +73,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void canFollowUser() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=user]");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/user]");
 
         assertThat(repr.getUser().getValue(), is(not(nullValue())));
     }
@@ -81,7 +81,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void canFollowServices() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=services]");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/services]");
 
         assertThat(repr.getServices().getValue(), is(not(nullValue())));
     }
@@ -89,7 +89,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void canFollowVersion() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=version]");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/version]");
 
         assertThat(repr.getVersion().getValue(), is(not(nullValue())));
     }
@@ -98,7 +98,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void canFollowAll() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=user],links[rel=services],links[rel=version]");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/user],links[rel=urn:org.restfulobjects:rels/services],links[rel=urn:org.restfulobjects:rels/version]");
 
         assertThat(repr.getUser().getValue(), is(not(nullValue())));
         assertThat(repr.getVersion().getValue(), is(not(nullValue())));
@@ -108,7 +108,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void servicesValues() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=services].values");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/services].values");
 
         final JsonRepresentation servicesValue = repr.getServices().getValue();
         assertThat(servicesValue, is(not(nullValue())));
@@ -132,7 +132,7 @@ public class HomePageResourceTest_xrofol
     @Test
     public void servicesValuesWithCriteria() throws Exception {
 
-        repr = whenExecuteAndFollowLinksUsing("/", "links[rel=services].values[id=simples]");
+        repr = whenExecuteWithFollowLinksUsing("/", "links[rel=urn:org.restfulobjects:rels/services].values[id=simples]");
 
         final JsonRepresentation servicesValue = repr.getServices().getValue();
         assertThat(servicesValue, is(not(nullValue())));
@@ -140,9 +140,7 @@ public class HomePageResourceTest_xrofol
         final JsonRepresentation serviceLinkList = servicesValue.getArray("values");
         assertThat(serviceLinkList, isArray());
 
-        JsonRepresentation service;
-
-        service = serviceLinkList.getRepresentation("[id=%s]", "simples");
+        JsonRepresentation service = serviceLinkList.getRepresentation("[id=%s]", "simples");
         assertThat(service, isMap());
         assertThat(service.getString("id"), is("simples"));
         assertThat(service.getRepresentation("value"), is(not(nullValue())));
@@ -151,7 +149,7 @@ public class HomePageResourceTest_xrofol
         assertThat(service.getRepresentation("value"), is(nullValue()));
     }
 
-    private HomePageRepresentation whenExecuteAndFollowLinksUsing(final String uriTemplate, final String followLinks) throws JsonParseException, JsonMappingException, IOException {
+    private HomePageRepresentation whenExecuteWithFollowLinksUsing(final String uriTemplate, final String followLinks) throws JsonParseException, JsonMappingException, IOException {
         request = client.createRequest(HttpMethod.GET, uriTemplate).withArg(RequestParameter.FOLLOW_LINKS, followLinks);
         restfulResponse = request.executeT();
         return restfulResponse.getEntity();

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/object/DomainObjectResourceTest.java Wed Jun 27 20:38:52 2012
@@ -97,8 +97,8 @@ public class DomainObjectResourceTest {
 
         // then
         final LinkRepresentation self = domainObjectRepr.getSelf();
-        assertThat(self, isLink().rel(Rel.SELF).href(matches(".+objects/OID:32")).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domainobject"));
-        assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
+        assertThat(self, isLink().rel(Rel.SELF).href(matches(".+objects/OID:32")).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects:repr-types/object"));
+        assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects:repr-types/domain-type"));
 
         assertThat(domainObjectRepr.getTitle(), is("parent 4 - child 2"));
         assertThat(domainObjectRepr.getOid(), is("OID:32"));
@@ -144,7 +144,7 @@ public class DomainObjectResourceTest {
         final DomainObjectRepresentation domainObjectRepr = givenDomainObjectRepresentationFor("OID:32");
 
         // then
-        assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects/domaintype"));
+        assertThat(domainObjectRepr.getLinkWithRel(Rel.DESCRIBEDBY), isLink().href(matches(".+" + ChildEntity.class.getName())).httpMethod(HttpMethod.GET).type(MediaType.APPLICATION_JSON_TYPE).typeParameter("profile", "urn:org.restfulobjects:repr-types/domain-type"));
     }
 
     @Test

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/serviceId/DomainServiceResourceTest_serviceId_representationAndHeaders.java Wed Jun 27 20:38:52 2012
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.json.tck.
 import static org.apache.isis.core.commons.matchers.IsisMatchers.matches;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.assertThat;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isArray;
-import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isFollowableLinkToSelf;
+import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasFollowableLinkToSelf;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isLink;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isMap;
 import static org.hamcrest.CoreMatchers.is;
@@ -109,7 +109,7 @@ public class DomainServiceResourceTest_s
         final DomainObjectRepresentation repr = givenRepresentation("simples");
 
         // when, then
-        assertThat(repr, isFollowableLinkToSelf(client));
+        assertThat(repr, hasFollowableLinkToSelf(client));
     }
 
     @Test

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java Wed Jun 27 20:38:52 2012
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.json.tck.
 
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.assertThat;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isArray;
-import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isFollowableLinkToSelf;
+import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasFollowableLinkToSelf;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isLink;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isMap;
 import static org.hamcrest.CoreMatchers.is;
@@ -95,7 +95,7 @@ public class DomainServiceResourceTest_s
         final ListRepresentation repr = givenRepresentation();
 
         // when, then
-        assertThat(repr, isFollowableLinkToSelf(client));
+        assertThat(repr, hasFollowableLinkToSelf(client));
     }
 
     @Test

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/user/UserResourceTest_representationAndHeaders.java Wed Jun 27 20:38:52 2012
@@ -24,7 +24,7 @@ import static org.apache.isis.viewer.jso
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasSubType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isArray;
-import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isFollowableLinkToSelf;
+import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasFollowableLinkToSelf;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isLink;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isMap;
 import static org.hamcrest.CoreMatchers.is;
@@ -117,7 +117,7 @@ public class UserResourceTest_representa
         final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
         assertThat(contentType, hasType("application"));
         assertThat(contentType, hasSubType("json"));
-        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/user"));
+        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/user"));
         assertThat(contentType, is(RepresentationType.USER.getMediaType()));
 
         // then
@@ -132,7 +132,7 @@ public class UserResourceTest_representa
         final UserRepresentation repr = givenRepresentation();
 
         // when, then
-        assertThat(repr, isFollowableLinkToSelf(client));
+        assertThat(repr, hasFollowableLinkToSelf(client));
     }
 
     private UserRepresentation givenRepresentation() throws JsonParseException, JsonMappingException, IOException {

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/version/VersionResourceTest_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/version/VersionResourceTest_representationAndHeaders.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/version/VersionResourceTest_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/version/VersionResourceTest_representationAndHeaders.java Wed Jun 27 20:38:52 2012
@@ -24,7 +24,7 @@ import static org.apache.isis.viewer.jso
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasSubType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasType;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isArray;
-import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isFollowableLinkToSelf;
+import static org.apache.isis.viewer.json.tck.RepresentationMatchers.hasFollowableLinkToSelf;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isLink;
 import static org.apache.isis.viewer.json.tck.RepresentationMatchers.isMap;
 import static org.hamcrest.CoreMatchers.is;
@@ -125,7 +125,7 @@ public class VersionResourceTest_represe
         final MediaType contentType = restfulResponse.getHeader(Header.CONTENT_TYPE);
         assertThat(contentType, hasType("application"));
         assertThat(contentType, hasSubType("json"));
-        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects/version"));
+        assertThat(contentType, hasParameter("profile", "urn:org.restfulobjects:repr-types/version"));
         assertThat(contentType, is(RepresentationType.VERSION.getMediaType()));
 
         // then
@@ -140,7 +140,7 @@ public class VersionResourceTest_represe
         final VersionRepresentation repr = givenRepresentation();
 
         // when, then
-        assertThat(repr, isFollowableLinkToSelf(client));
+        assertThat(repr, hasFollowableLinkToSelf(client));
     }
 
     private VersionRepresentation givenRepresentation() throws JsonParseException, JsonMappingException, IOException {

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml Wed Jun 27 20:38:52 2012
@@ -23,16 +23,16 @@
 
 	<parent>
 		<groupId>org.apache.isis.viewer</groupId>
-		<artifactId>json</artifactId>
+		<artifactId>restfulobjects</artifactId>
 		<version>0.3.1-incubating-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>json-viewer</artifactId>
-	<name>JSON Viewer Implementation</name>
+	<artifactId>restfulobjects-viewer</artifactId>
+	<name>RestfulObjects Viewer Implementation</name>
 
 	<properties>
 		<siteBaseDir>../../..</siteBaseDir>
-		<relativeUrl>viewer/json/viewer/</relativeUrl>
+		<relativeUrl>viewer/restfulobjects/viewer/</relativeUrl>
 	</properties>
 
     <!-- used in Site generation for relative references. -->
@@ -41,7 +41,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>json-applib</artifactId>
+			<artifactId>restfulobjects-applib</artifactId>
 		</dependency>
 
 		<dependency>

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java Wed Jun 27 20:38:52 2012
@@ -147,7 +147,7 @@ public class HomePageReprRenderer extend
 
     private void addLinkToDomainTypes() {
 
-        final JsonRepresentation link = LinkBuilder.newBuilder(getResourceContext(), Rel.TYPES, RepresentationType.TYPE_LIST, "domainTypes").build();
+        final JsonRepresentation link = LinkBuilder.newBuilder(getResourceContext(), Rel.DOMAIN_TYPES, RepresentationType.TYPE_LIST, "domainTypes").build();
 
         final LinkFollower linkFollower = getLinkFollower().follow("links[rel=types]");
         if (linkFollower.matches(link)) {

Copied: incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml (from r1354232, incubator/isis/trunk/framework/viewer/json/src/docbkx/guide/isis-json-viewer.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml?p2=incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml&p1=incubator/isis/trunk/framework/viewer/json/src/docbkx/guide/isis-json-viewer.xml&r1=1354232&r2=1354715&rev=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/src/docbkx/guide/isis-json-viewer.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml Wed Jun 27 20:38:52 2012
@@ -60,12 +60,12 @@
     url="http://www.apache.org/licenses/LICENSE-2.0.html">Apache Software
     License v2</ulink>.</para>
 
-    <para><emphasis>Isis</emphasis>' <emphasis>json</emphasis> viewer
-    <package>[oai.viewer:json]</package> is an implementation of the the
+    <para><emphasis>Isis</emphasis>' <emphasis>restfulobjects viewer</emphasis> 
+    <package>[oai.viewer:restfulobjects]</package> is an implementation of the the
     <ulink url="http://restfulobjects.org">Restful Objects</ulink>
     specification (hosted at <ulink
     url="http://restfulobjects.org">http://restfulobjects.org</ulink>). This
-    defines a set of RESTful resources, and corresponding JSON
+    defines a set of RESTful resources, and corresponding <acronym>JSON</acronym>
     representations, for accessing and manipulating a domain object
     model.</para>
 
@@ -77,11 +77,11 @@
     <sect1>
       <title>Who this Guide is For</title>
 
-      <para>This guide describes how to use the <emphasis>jsonl viewer
+      <para>This guide describes how to use the <emphasis>restfulobjects viewer
       </emphasis>both in prototype mode and how to deploy it into production
-      as a webapp. It also describes how to use the <emphasis>json
+      as a webapp. It also describes how to use the <emphasis>restfulobjects
       viewer</emphasis>'s application library
-      <package>[oai.viewer.json:applib]</package> to write client-side
+      <package>[oai.viewer.restfulobjects:applib]</package> to write client-side
       applications. It is divided into the following chapters:<itemizedlist>
           <listitem>
             <para>Introduction</para>
@@ -92,7 +92,7 @@
           </listitem>
 
           <listitem>
-            <para>The JSON Viewer Modules</para>
+            <para>The RestfulObjects Viewer Modules</para>
 
             <para>This ....</para>
           </listitem>
@@ -132,8 +132,8 @@
 
       <para>As a further convenience, we use "oai" as an abbreviation for
       <package>org.apache.isis</package>. Hence
-      <package>(oai.viewer:json)</package> refers to the parent module for
-      JSON viewer. We also use the "oai" abbreviation within package
+      <package>(oai.viewer:restfulobjects)</package> refers to the parent module for
+      <emphasis>restfulobjects viewer</emphasis>. We also use the "oai" abbreviation within package
       names.</para>
     </sect1>
   </preface>
@@ -149,7 +149,7 @@
     </abstract>
 
     <para>This chapter briefly explains what <acronym>REST</acronym> is, and
-    why you might want to use it. It then explains how the <emphasis>json
+    why you might want to use it. It then explains how the <emphasis>restfulobjects
     viewer</emphasis> exposes your domain model using
     <acronym>REST</acronym>.</para>
 
@@ -194,7 +194,7 @@
       that resource. <acronym>REST</acronym> doesn't mandate what that
       representation is, but typical choices are <acronym>JSON</acronym>,
       <acronym>XHTML</acronym> or a custom <acronym>XML</acronym> dialect. The
-      json-viewer of course uses <acronym>JSON</acronym>
+      restfulobjects viewer uses <acronym>JSON</acronym>
       (<emphasis>J</emphasis>ava<emphasis>S</emphasis>cript
       <emphasis>O</emphasis>bject <emphasis>N</emphasis>otation) as its
       representation media type.</para>
@@ -219,7 +219,7 @@
       specification defines a set of RESTful resources, and corresponding
       <acronym>JSON</acronym> representations, for accessing and manipulating
       a domain object model. Because it is a specification, it allows for
-      multiple implementations. Apache Isis' <emphasis>json viewer</emphasis>
+      multiple implementations. Apache Isis' <emphasis>restfulobjects viewer</emphasis>
       is one such implementation; another is <ulink
       url="http://nakedobjects.net">Restful Objects for .NET</ulink>.</para>
 
@@ -239,19 +239,19 @@
       serializable as a graph of <acronym>JSON</acronym> objects, but there
       are also libraries for all the main stream platforms (Java, .NET, Ruby,
       Python) to consume and create <acronym>JSON</acronym>. The
-      <emphasis>json viewer</emphasis> therefore opens up a domain objects
+      <emphasis>restfulobjects viewer</emphasis> therefore opens up a domain objects
       model for consumption in other languages.</para>
 
       <para>We do recommend that you download the <emphasis>Restful
       Objects</emphasis> spec and at least review its introductory chapters
       (part A). However, given that the spec is pretty close to 200 pages,
       please don't consider that a mandatory first step. You can get a pretty
-      good idea of what the Isis json viewer does just by playing with Isis'
+      good idea of what the Isis restfulobjects viewer does just by playing with Isis'
       quickstart archetype, discussed later.</para>
     </sect1>
 
     <sect1 id="sec.IntroducingRestfulObjects">
-      <title>The JSON viewer as an RO implementation</title>
+      <title>The RestfulObjects viewer as an RO implementation</title>
 
       <para><emphasis>Restful Objects</emphasis> defines a core set of
       functionality that all implementations must honour, and also defines a
@@ -260,7 +260,7 @@
       of the) "version" resource, specificially the "optionalCapabilities"
       property map.</para>
 
-      <para>As such, the <emphasis>json viewer</emphasis> returns the
+      <para>As such, the <emphasis>restfulobjects viewer</emphasis> returns the
       following representation:</para>
 
       <para><programlisting>** TODO</programlisting></para>
@@ -270,21 +270,21 @@
     </sect1>
 
     <sect1>
-      <title>The JSON viewer modules</title>
+      <title>The RestfulObjects viewer modules</title>
 
-      <para>In terms of software, the <emphasis>json viewer</emphasis>
+      <para>In terms of software, the <emphasis>restfulobjects viewer</emphasis>
       comprises a number of Maven modules:</para>
 
       <itemizedlist>
         <listitem>
-          <para>org.apache.isis.viewer.json</para>
+          <para>org.apache.isis.viewer.restfulobjects</para>
 
           <para>is the parent module; this also has the site and documentation
           (this guide)</para>
         </listitem>
 
         <listitem>
-          <para>org.apache.isis.viewer.json-applib</para>
+          <para>org.apache.isis.viewer.restfulobjects-applib</para>
 
           <para>is a client-side library to simplify the task of writing
           Java-based applications that consume <emphasis>Restful
@@ -292,7 +292,7 @@
         </listitem>
 
         <listitem>
-          <para>org.apache.isis.viewer.json-viewer</para>
+          <para>org.apache.isis.viewer.restfulobjects-viewer</para>
 
           <para>is the server-side implementation of the resources and
           representations defined by the <emphasis>Restful Objects</emphasis>
@@ -310,11 +310,11 @@
   </chapter>
 
   <chapter>
-    <title id="chp.Prototyping">Using the QuickStart Archetype and the JSON
+    <title id="chp.Prototyping">Using the QuickStart Archetype and the RestfulObjects
     Viewer</title>
 
     <abstract>
-      <para>How to get started prototyping with <emphasis>json
+      <para>How to get started prototyping with <emphasis>restfulobjects
       viewer.</emphasis></para>
     </abstract>
 
@@ -330,21 +330,21 @@
     <emphasis>Isis</emphasis> quickstart archetype (eg as documented on
     <emphasis>Isis</emphasis>' website). Once you've done this, you'll end up
     with an set of modules that allow the application to be booted using the
-    <emphasis>json viewer</emphasis>. It includes the following
+    <emphasis>restfulobjects viewer</emphasis>. It includes the following
     modules:</para>
 
     <programlisting>myapp/pom.xml
     myapp-dom/pom.xml             # domain object model
     myapp-fixture/pom.xml         # fixtures for seeding object store
     myapp-objstore-dflt/pom.xml   # repository implementations for the default object store
-    myapp-webapp/pom.xml          # run the application as a webapp using either the HTML viewer or the JSON viewer
+    myapp-webapp/pom.xml          # run the application as a webapp using either the HTML viewer or the RestfulObjects viewer
 </programlisting>
 
     <para>where 'myapp' is the artifactId specified when you ran the <code>mvn
     archetype:generate</code> goal.</para>
 
     <para>This chapter describes in more detail the contents of these modules,
-    and then describes how to get started with running the <emphasis>json
+    and then describes how to get started with running the <emphasis>restfulobjects
     viewer</emphasis> for prototyping purposes.</para>
 
     <sect1 id="sec.ParentModule">
@@ -392,7 +392,7 @@
     ....
 &lt;/properties&gt;</programlisting>
 
-        <para>where y.y.y is the corresponding version of the json
+        <para>where y.y.y is the corresponding version of the restfulobjects
         viewer.</para>
 
         <para>In the <emphasis>release</emphasis> artifact's
@@ -402,34 +402,34 @@
         <programlisting>&lt;dependencyManagement&gt;
   &lt;dependencies&gt;
     ...
-    &lt;!-- viewer: json --&gt;
+    &lt;!-- viewer: restfulobjects --&gt;
     &lt;dependency&gt;
       &lt;groupId&gt;org.apache.isis.viewer&lt;/groupId&gt;
-      &lt;artifactId&gt;json&lt;/artifactId&gt;
+      &lt;artifactId&gt;restfulobjects&lt;/artifactId&gt;
       &lt;version&gt;${isis.version}&lt;/version&gt;
     &lt;/dependency&gt;
     &lt;dependency&gt;
       &lt;groupId&gt;org.apache.isis.viewer&lt;/groupId&gt;
-      &lt;artifactId&gt;json-applib&lt;/artifactId&gt;
+      &lt;artifactId&gt;restfulobjects-applib&lt;/artifactId&gt;
       &lt;version&gt;${isis.version}&lt;/version&gt;
     &lt;/dependency&gt;
     &lt;dependency&gt;
       &lt;groupId&gt;org.apache.isis.viewer&lt;/groupId&gt;
-      &lt;artifactId&gt;json-viewer&lt;/artifactId&gt;
+      &lt;artifactId&gt;restfulobjects-viewer&lt;/artifactId&gt;
       &lt;version&gt;${isis.version}&lt;/version&gt;
     &lt;/dependency&gt;
     ...
   &lt;/dependencies&gt;
 &lt;/dependencyManagement&gt;</programlisting>
 
-        <para>The <package>[oai.viewer:json]</package> module is the parent
-        for <emphasis>json viewer</emphasis>
+        <para>The <package>[oai.viewer:restfulobjects]</package> module is the parent
+        for <emphasis>restfulobjects viewer</emphasis>
         (<code>&lt;packaging&gt;pom&lt;/packaging&gt;</code>). That means that
-        it doesn't provide any Java classesper se. The <emphasis>json
-        viewer</emphasis> module <package>[oai.viewer.json:viewer]</package>
+        it doesn't provide any Java classesper se. The <emphasis>restfulobjects
+        viewer</emphasis> module <package>[oai.viewer.restfulobjects:viewer]</package>
         on the other hand does provide a <acronym>JAR</acronym> artifact,
-        being the main implementation of the viewer. The <emphasis>json
-        applib</emphasis> module <package>[oai.viewer.json:applib]</package>
+        being the main implementation of the viewer. The <emphasis>restfulobjects
+        applib</emphasis> module <package>[oai.viewer.restfulobjects:applib]</package>
         meanwhile is used for writing client-side applications that use an
         exposed <emphasis>Isis</emphasis> module, the topic of <xref
         linkend="chp.WritingClientSideApps" />.</para>
@@ -443,13 +443,13 @@
         xxx-jetty-console.war that embeds a Jetty webserver and allows the WAR
         to be self-hosting.</para>
 
-        <para>The <emphasis>viewer-json</emphasis> module inherits from the
+        <para>The <emphasis>restfulobjects-viewer</emphasis> module inherits from the
         parent module and so inherits the various definitions of the parent
         module. And, not surprisingly, its <code>&lt;dependencies&gt;</code>
         section includes a reference to the
-        <package>[oai.viewer.json:viewer]</package> module.</para>
+        <package>[oai.viewer.restfulobjects:viewer]</package> module.</para>
 
-        <para>More significantly, the <emphasis>viewer-json</emphasis> has the
+        <para>More significantly, the <emphasis>restfulobjects viewer</emphasis> has the
         standard directory structure for a webapp, with
         <filename>src/main/webapp/WEB-INF</filename> holding the
         <filename>web.xml</filename> along with <emphasis>Isis</emphasis>' own
@@ -467,7 +467,7 @@
 
           <programlisting>&lt;context-param&gt;
   &lt;param-name&gt;javax.ws.rs.Application&lt;/param-name&gt;
-  &lt;param-value&gt;org.apache.isis.viewer.json.viewer.JsonApplication&lt;/param-value&gt;
+  &lt;param-value&gt;org.apache.isis.viewer.restfulobjects.viewer.JsonApplication&lt;/param-value&gt;
 &lt;/context-param&gt;</programlisting>
 
           <para>This is used by <emphasis>RestEasy</emphasis> (the underlying
@@ -520,7 +520,7 @@
   &lt;filter-class&gt;org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter&lt;/filter-class&gt;
   &lt;init-param&gt;
     &lt;param-name&gt;authenticationSessionLookupStrategy&lt;/param-name&gt;
-    &lt;param-value&gt;org.apache.isis.viewer.json.viewer.authentication.AuthenticationSessionLookupStrategyTrusted&lt;/param-value&gt;
+    &lt;param-value&gt;org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionLookupStrategyTrusted&lt;/param-value&gt;
   &lt;/init-param&gt;
 &lt;/filter&gt;
 ...
@@ -624,8 +624,8 @@
           <listitem>
             <para>run from the command-line using Maven:</para>
 
-            <programlisting>cd viewer-json
-mvn antrun:run -D exec=json</programlisting>
+            <programlisting>cd restfulobjects-viewer
+mvn antrun:run -D exec=restfulobjects</programlisting>
           </listitem>
 
           <listitem>
@@ -743,14 +743,14 @@ mvn jetty:run</programlisting>
   </chapter>
 
   <chapter id="chp.WritingClientSideApps">
-    <title>The JSON Viewer AppLib</title>
+    <title>The RestfulObjects Viewer AppLib</title>
 
     <abstract>
       <para>How to write custom client-side applications to consume the
-      RESTful resources using the json-viewer's applib.</para>
+      RESTful resources using the <emphasis>restfulobjects-viewer</emphasis>'s applib.</para>
     </abstract>
 
-    <para>The point of the <emphasis>json viewer</emphasis> is to provide our
+    <para>The point of the <emphasis>restfulobjects viewer</emphasis> is to provide our
     domain objects as <acronym>REST</acronym>ful resources so that they can be
     used by any other client application. These applications can be written in
     any language; so long as they can submit <acronym>HTTP </acronym>requests
@@ -767,7 +767,7 @@ mvn jetty:run</programlisting>
   ...
   &lt;dependency&gt;
     &lt;groupId&gt;org.apache.isis.viewer&lt;/groupId&gt;
-    &lt;artifactId&gt;json-applib&lt;/artifactId&gt;
+    &lt;artifactId&gt;restfulobjects-applib&lt;/artifactId&gt;
     &lt;version&gt;${isis.version}&lt;/version&gt;
   &lt;/dependency&gt;
   ...
@@ -852,7 +852,7 @@ mvn jetty:run</programlisting>
   </chapter>
 
   <chapter id="chp.DeployingRestfulObjectsWebapps">
-    <title>Deploying JSON Viewer Webapps</title>
+    <title>Deploying RestfulObjects Webapps</title>
 
     <abstract>
       <para>Guidance on how to deploy Isis using the <emphasis>xhtml

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/src/site/apt/index.apt?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/src/site/apt/index.apt Wed Jun 27 20:38:52 2012
@@ -16,21 +16,24 @@
 ~~  under the License.
 
 
-JSON Viewer
+RestfulObjects for Isis
 
- The <json> viewer provides a RESTful interface to the domain object model,
- running over the HTTP protocol, and implemented as a webapp (servlet).
+ The <restfulobjects> viewer provides a RESTful interface to the domain object 
+ model, running over the HTTP protocol, and implemented as a webapp (servlet).
  
  Each domain object (or part of object) is exposed as a RESTful resource, in
  a JSON representation.
 
- The viewer is an implementation of the {{{http://restfulobjects.org}Restful Objects}}
- specification, intended to allow other server-side frameworks to be implemented
+ The viewer is an implementation of the 
+ {{{http://restfulobjects.org}Restful Objects}} specification, intended to 
+ allow other server-side frameworks to be implemented
  to support the same protocol.
 
 
 Further Info
   
-  See this module's {{{./json-applib/index.html}applib}},  {{{./json-viewer/index.html}viewer}} and 
-  {{{./docbkx/html/guide/isis-json-viewer.html}user guide}} for more information.
+  See this module's {{{./restfulobjects-applib/index.html}applib}}, 
+  {{{./restfulobjects-viewer/index.html}viewer}} and 
+  {{{./docbkx/html/guide/isis-restfulobjects-viewer.html}user guide}} for more 
+  information.
  

Modified: incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml?rev=1354715&r1=1354232&r2=1354715&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml Wed Jun 27 20:38:52 2012
@@ -22,17 +22,17 @@
 
 	<body>
 		<breadcrumbs>
-			<item name="JSON" href="index.html"/>
+			<item name="RestfulObjects" href="index.html"/>
 		</breadcrumbs>
 
-		<menu name="JSON Viewer">
+		<menu name="RestfulObjects for Isis">
 			<item name="About" href="index.html" />
             <item name="Jottings" href="jottings.html" />
 		</menu>
 		
         <menu name="Viewer Modules">
             <item name="HTML" href="../html/index.html" />
-            <item name="JSON" href="../json/index.html" />
+            <item name="RestfulObjects" href="../json/index.html" />
             <item name="JUnit Support" href="../junit/index.html" />
             <item name="BDD Integration" href="../bdd/index.html" />
             <item name="Scimpi" href="../scimpi/index.html" />
@@ -40,7 +40,7 @@
             <item name="DnD" href="../dnd/index.html" />
         </menu>
 
-        <menu name="JSON Modules">
+        <menu name="RestfulObjects Modules">
             <item name="Applib" href="./json-applib/index.html" />
             <item name="Viewer" href="./json-viewer/index.html" />
         </menu>



Mime
View raw message