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 2012/06/30 16:32:08 UTC
svn commit: r1355743 [8/8] - in /incubator/isis/trunk/framework:
applib/src/docbkx/guide/
quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/
src/site/ src/site/apt/ src/site/apt/use-cases/ tck/ viewer/bdd/src/si...
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java (from r1355516, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java&r1=1355516&r2=1355743&rev=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainResourceHelperTest_readBodyAsMap.java Sat Jun 30 14:31:11 2012
@@ -16,15 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.viewer.resources.domainobjects;
+package org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.junit.Test;
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
-import org.apache.isis.viewer.json.viewer.JsonApplicationException;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplicationException;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects.DomainResourceHelper;
public class DomainResourceHelperTest_readBodyAsMap {
@@ -70,7 +71,7 @@ public class DomainResourceHelperTest_re
assertThat(representation.size(), is(1));
}
- @Test(expected = JsonApplicationException.class)
+ @Test(expected = RestfulObjectsApplicationException.class)
public void whenArray() throws Exception {
DomainResourceHelper.readAsMap("[]");
}
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java (from r1355516, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java&r1=1355516&r2=1355743&rev=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asAdapter.java Sat Jun 30 14:31:11 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.viewer.resources.domainobjects;
+package org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -43,7 +43,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.Facet;
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 org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects.JsonValueEncoder;
@RunWith(JMock.class)
public class JsonValueEncoderTest_asAdapter {
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java (from r1355516, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java&r1=1355516&r2=1355743&rev=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/JsonValueEncoderTest_asObject.java Sat Jun 30 14:31:11 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.viewer.resources.domainobjects;
+package org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -36,7 +36,8 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.Facet;
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 org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.viewer.resources.domainobjects.JsonValueEncoder;
@RunWith(JMock.class)
public class JsonValueEncoderTest_asObject {
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/MapUtilsTest.java (from r1355516, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/MapUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/MapUtilsTest.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/MapUtilsTest.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/MapUtilsTest.java&r1=1355516&r2=1355743&rev=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/MapUtilsTest.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/MapUtilsTest.java Sat Jun 30 14:31:11 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.viewer.util;
+package org.apache.isis.viewer.restfulobjects.viewer.util;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -25,6 +25,8 @@ import java.util.Map;
import org.junit.Test;
+import org.apache.isis.viewer.restfulobjects.viewer.util.MapUtils;
+
public class MapUtilsTest {
@Test
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtilsTest.java (from r1355516, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/UrlParserUtilsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtilsTest.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtilsTest.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/UrlParserUtilsTest.java&r1=1355516&r2=1355743&rev=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/json/viewer/util/UrlParserUtilsTest.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/util/UrlParserUtilsTest.java Sat Jun 30 14:31:11 2012
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.viewer.util;
+package org.apache.isis.viewer.restfulobjects.viewer.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.apache.isis.viewer.json.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.viewer.util.UrlParserUtils;
public class UrlParserUtilsTest {
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml?rev=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml Sat Jun 30 14:31:11 2012
@@ -60,12 +60,13 @@
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>RestfulObjects for Isis</emphasis>
+ is an Isis viewer
+ <package>[oai.viewer:restfulobjects]</package> that implements 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 +78,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 +93,7 @@
</listitem>
<listitem>
- <para>The JSON Viewer Modules</para>
+ <para>The RestfulObjects Viewer Modules</para>
<para>This ....</para>
</listitem>
@@ -132,8 +133,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
+ RestfulObjects viewer. We also use the "oai" abbreviation within package
names.</para>
</sect1>
</preface>
@@ -149,7 +150,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 +195,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>
+ <emphasis>restfulobjects-viewer</emphasis> of course 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 +220,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 +240,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 <emphasis>restfulobjects viewer</emphasis> 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>RestfulObjects for Isis 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 +261,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 +271,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 +293,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 +311,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 +331,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 +393,7 @@
....
</properties></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 +403,34 @@
<programlisting><dependencyManagement>
<dependencies>
...
- <!-- viewer: json -->
+ <!-- viewer: restfulobjects -->
<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>
...
</dependencies>
</dependencyManagement></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><packaging>pom</packaging></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 +444,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>viewer-restfulobjects</emphasis> module inherits from the
parent module and so inherits the various definitions of the parent
module. And, not surprisingly, its <code><dependencies></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>viewer-restfulobjects</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 +468,7 @@
<programlisting><context-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>org.apache.isis.viewer.json.viewer.JsonApplication</param-value>
+ <param-value>org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication</param-value>
</context-param></programlisting>
<para>This is used by <emphasis>RestEasy</emphasis> (the underlying
@@ -520,7 +521,7 @@
<filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>authenticationSessionLookupStrategy</param-name>
- <param-value>org.apache.isis.viewer.json.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
+ <param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
</init-param>
</filter>
...
@@ -624,8 +625,8 @@
<listitem>
<para>run from the command-line using Maven:</para>
- <programlisting>cd viewer-json
-mvn antrun:run -D exec=json</programlisting>
+ <programlisting>cd viewer-restfulobjects
+mvn antrun:run -D exec=restfulobjects</programlisting>
</listitem>
<listitem>
@@ -743,18 +744,18 @@ 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 restfulobjects-viewer'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
- and can parse <acronym>JSONL</acronym>, they can interact with the
+ and can parse <acronym>JSON</acronym>, they can interact with the
resources provided by the viewer.</para>
<para>That said, if you are writing Java applications, then there is also
@@ -767,7 +768,7 @@ mvn jetty:run</programlisting>
...
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>json-applib</artifactId>
+ <artifactId>restfulobjects-applib</artifactId>
<version>${isis.version}</version>
</dependency>
...
@@ -852,7 +853,7 @@ mvn jetty:run</programlisting>
</chapter>
<chapter id="chp.DeployingRestfulObjectsWebapps">
- <title>Deploying JSON Viewer Webapps</title>
+ <title>Deploying RestfulObjects Viewer Webapps</title>
<abstract>
<para>Guidance on how to deploy Isis using the <emphasis>xhtml
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=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/src/site/site.xml Sat Jun 30 14:31:11 2012
@@ -25,7 +25,7 @@
<item name="RestfulObjects" href="index.html"/>
</breadcrumbs>
- <menu name="RestfulObjects Viewer">
+ <menu name="RestfulObjects for Isis">
<item name="About" href="index.html" />
<item name="Jottings" href="jottings.html" />
</menu>
Modified: incubator/isis/trunk/framework/viewer/scimpi/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/src/site/site.xml?rev=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/src/site/site.xml Sat Jun 30 14:31:11 2012
@@ -31,11 +31,11 @@
<menu name="Viewer Modules">
<item name="HTML" href="../html/index.html" />
- <item name="JSON" 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" />
<item name="Wicket" href="../wicket/index.html" />
+ <item name="RestfulObjects" href="../restfulobjects/index.html" />
+ <item name="JUnit Support" href="../junit/index.html" />
+ <item name="BDD Integration" href="../bdd/index.html" />
<item name="DnD" href="../dnd/index.html" />
</menu>
Modified: incubator/isis/trunk/framework/viewer/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/src/site/apt/index.apt?rev=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/framework/viewer/src/site/apt/index.apt Sat Jun 30 14:31:11 2012
@@ -21,9 +21,9 @@
The <viewer> module is the parent of the different viewer implementations.
- * {{{./json/index.html}JSON (Restful) viewer}}
+ * {{{./restfulobjects/index.html}RestfulObjects for Isis}}
- The <json> viewer provides the RESTful API to the domain object model,
+ The <restfulobjects> viewer provides the RESTful API to the domain object model,
providing JSON representations of domain objects. This is great as a back-end
where the client is either a custom UI (written using JQuery, say), or for
data integration scenarios.
Modified: incubator/isis/trunk/framework/viewer/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/src/site/site.xml?rev=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/src/site/site.xml Sat Jun 30 14:31:11 2012
@@ -31,17 +31,20 @@
<menu name="Deployable Viewers">
<item name="HTML" href="./html/index.html" />
- <item name="JSON" href="./json/index.html" />
+ <item name="RestfulObjects for Isis" href="./restfulobjects/index.html" />
<item name="JUnit Support" href="./junit/index.html" />
<item name="BDD Integration" href="./bdd/index.html" />
</menu>
<menu name="Other Viewers">
- <item name="DnD" href="./dnd/index.html" />
<item name="Scimpi" href="./scimpi/index.html" />
<item name="Wicket" href="./wicket/index.html" />
</menu>
+ <menu name="Dev-Only Viewers">
+ <item name="DnD" href="./dnd/index.html" />
+ </menu>
+
</body>
</project>
Modified: incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml?rev=1355743&r1=1355742&r2=1355743&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml Sat Jun 30 14:31:11 2012
@@ -31,11 +31,11 @@
<menu name="Viewer Modules">
<item name="HTML" href="../html/index.html" />
- <item name="JSON" 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" />
<item name="Wicket" href="../wicket/index.html" />
+ <item name="RestfulObjects" href="../restfulobjects/index.html" />
+ <item name="JUnit Support" href="../junit/index.html" />
+ <item name="BDD Integration" href="../bdd/index.html" />
<item name="DnD" href="../dnd/index.html" />
</menu>