incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1141017 - in /incubator/isis/trunk/framework: src/docbkx/guide/ viewer/json/applib/src/main/java/ viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/...
Date Wed, 29 Jun 2011 09:18:01 GMT
Author: danhaywood
Date: Wed Jun 29 09:18:00 2011
New Revision: 1141017

URL: http://svn.apache.org/viewvc?rev=1141017&view=rev
Log:
updates to json and xhtml viewers as a result of testing the quickstart app

Added:
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/BootstrapResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/DomainObjectResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/HomePageResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ServicesResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/SpecsResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/UserResource.java
      - copied, changed from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java
Removed:
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/bootstrap/
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-rest-support.js
Modified:
    incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
    incubator/isis/trunk/framework/viewer/json/applib/src/main/java/   (props changed)
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/   (props changed)
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/index.html
    incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-json-support.js
    incubator/isis/trunk/framework/viewer/xhtml/src/docbkx/guide/isis-xhtml-viewer.xml

Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Wed Jun 29
09:18:00 2011
@@ -5596,8 +5596,7 @@ gpg --armor --export nnnnnnnn >>KE
                   at the time of writing there are known issues with the
                   integration between m2eclipse and <acronym>WTP</acronym>: it
                   does not reliably deploy transitive dependencies. For this
-                  reason we omit testing the <acronym>WTP</acronym>
-                  support.</para>
+                  reason we omit testing using <acronym>WTP</acronym>.</para>
                 </note>
               </listitem>
             </itemizedlist>
@@ -5671,10 +5670,15 @@ gpg --armor --export nnnnnnnn &gt;&gt;KE
             <para>This command also runs tests, so a successful build means
             that the JUnit tests in the <filename>tests-junit</filename> and
             <filename>tests-bdd</filename> modules have passed. As a
-            side-effect of running the tests, the Concordion BDD tests in
-            tests-bdd will generate a set of annotated <acronym>HTML</acronym>
-            files. These can be found in
-            <filename>tests-bdd/target/concordion</filename>. For example, the
+            side-effect of running the tests, the Concordion
+            <acronym>BDD</acronym> tests in <filename>tests-bdd</filename>
+            will generate a set of annotated <acronym>HTML</acronym> files.
+            These can be found in
+            <filename>tests-bdd/target/concordion</filename> (as defined by
+            the <varname>${concordion.output.dir}</varname> system property
+            for the surefire plugin).</para>
+
+            <para>For example, the
             <filename>tests-bdd/target/concordion/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html</filename>
             should look something like:</para>
 
@@ -5758,7 +5762,7 @@ $ mvn antrun:run -D exec=html</programli
 $ mvn antrun:run -D exec=json</programlisting></entry>
 
                     <entry><ulink
-                    url="http://localhost:8080">http://localhost:8080/services</ulink><para>Use
+                    url="http://localhost:8080">http://localhost:8080</ulink><para>Use
                     Chrome to view the JSON</para></entry>
                   </row>
 
@@ -5831,7 +5835,7 @@ $ mvn jetty:run</programlisting></entry>
 $ mvn jetty:run</programlisting></entry>
 
                     <entry><ulink
-                    url="http://localhost:8080/quickstart-viewer-json/services">http://localhost:8080/quickstart-viewer-json/services</ulink><para>use
+                    url="http://localhost:8080/quickstart-viewer-json">http://localhost:8080/quickstart-viewer-json</ulink><para>use
                     Chrome to view the JSON</para></entry>
                   </row>
 
@@ -6001,7 +6005,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>DnD</entry>
 
-                    <entry><filename>quickstart-quickrun-dnd.launch</filename></entry>
+                    <entry><filename>quickrun/ide/eclipse/launch/quickstart-quickrun-dnd.launch</filename></entry>
 
                     <entry>n/a</entry>
                   </row>
@@ -6009,7 +6013,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>HTML</entry>
 
-                    <entry><filename>quickstart-quickrun-html.launch</filename></entry>
+                    <entry><filename>quickrun/ide/eclipse/launch/quickstart-quickrun-html.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080/logon.app">http://localhost:8080/logon.app</ulink></entry>
@@ -6018,7 +6022,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>JSON (Restful)</entry>
 
-                    <entry><filename>quickstart-quickrun-json.launch</filename></entry>
+                    <entry><filename>quickrun/ide/eclipse/launch/quickstart-quickrun-json.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080/quickstart-viewer-wicket">http://localhost:8080</ulink></entry>
@@ -6027,7 +6031,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>XHTML (Restful)</entry>
 
-                    <entry><filename>quickstart-quickrun-xhtml.launch</filename></entry>
+                    <entry><filename>quickrun/ide/eclipse/launch/quickstart-quickrun-xhtml.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080">http://localhost:8080</ulink></entry>
@@ -6076,7 +6080,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>Viewer</entry>
 
-                    <entry align="center">Module</entry>
+                    <entry align="center">Launch Configuration</entry>
 
                     <entry>Browse to</entry>
                   </row>
@@ -6086,7 +6090,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>HTML</entry>
 
-                    <entry>viewer-html</entry>
+                    <entry><filename>viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080/logon.app">http://localhost:8080/logon.app</ulink></entry>
@@ -6095,7 +6099,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>JSON (Restful)</entry>
 
-                    <entry>viewer-json</entry>
+                    <entry><filename>viewer-json/ide/eclipse/launch/quickstart-viewer-json.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080">http://localhost:8080</ulink></entry>
@@ -6104,7 +6108,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>Scimpi</entry>
 
-                    <entry>viewer-scimpi</entry>
+                    <entry><filename>viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080">http://localhost:8080</ulink></entry>
@@ -6113,7 +6117,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>Wicket</entry>
 
-                    <entry>viewer-wicket</entry>
+                    <entry><filename>viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080">http://localhost:8080</ulink></entry>
@@ -6122,7 +6126,7 @@ $ mvn jetty:run</programlisting></entry>
                   <row>
                     <entry>XHTML (Restful)</entry>
 
-                    <entry>viewer-xhtml</entry>
+                    <entry><filename>viewer-xhtml/ide/eclipse/launch/quickstart-viewer-xhtml.launch</filename></entry>
 
                     <entry><ulink
                     url="http://localhost:8080">http://localhost:8080</ulink></entry>
@@ -6170,6 +6174,10 @@ $ mvn jetty:run</programlisting></entry>
                 </tbody>
               </tgroup>
             </table>
+
+            <para>When run from within Eclipse, the BDD tests will generate
+            their test script in <filename>/tmp/concordion</filename> (the
+            default location).</para>
           </sect3>
         </sect2>
 

Propchange: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 29 09:18:00 2011
@@ -0,0 +1 @@
+META-INF

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/BootstrapResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/BootstrapResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/BootstrapResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/BootstrapResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/BootstrapResource.java
Wed Jun 29 09:18:00 2011
@@ -16,10 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/DomainObjectResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/DomainObjectResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/DomainObjectResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/DomainObjectResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/DomainObjectResource.java
Wed Jun 29 09:18:00 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import java.io.InputStream;
 import java.util.List;

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/HomePageResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/HomePageResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/HomePageResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/HomePageResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/HomePageResource.java
Wed Jun 29 09:18:00 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Produces;

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ServicesResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ServicesResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ServicesResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/ServicesResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/ServicesResource.java
Wed Jun 29 09:18:00 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/SpecsResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/SpecsResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/SpecsResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/SpecsResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/SpecsResource.java
Wed Jun 29 09:18:00 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

Copied: incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/UserResource.java
(from r1140344, incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/UserResource.java?p2=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/UserResource.java&p1=incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java&r1=1140344&r2=1141017&rev=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/xhtml/applib/resources/UserResource.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/applib/src/main/java/org/apache/isis/viewer/json/applib/resources/UserResource.java
Wed Jun 29 09:18:00 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.xhtml.applib.resources;
+package org.apache.isis.viewer.json.applib.resources;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Produces;

Propchange: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 29 09:18:00 2011
@@ -0,0 +1 @@
+META-INF

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/JsonApplication.java
Wed Jun 29 09:18:00 2011
@@ -18,7 +18,6 @@
  */
 package org.apache.isis.viewer.json.viewer;
 
-import org.apache.isis.viewer.json.viewer.resources.bootstrap.BootstrapResourceImpl;
 import org.apache.isis.viewer.json.viewer.resources.home.HomePageResourceImpl;
 import org.apache.isis.viewer.json.viewer.resources.objects.DomainObjectResourceImpl;
 import org.apache.isis.viewer.json.viewer.resources.services.ServicesResourceImpl;
@@ -26,7 +25,6 @@ import org.apache.isis.viewer.json.viewe
 public class JsonApplication extends AbstractJaxRsApplication {
 
     public JsonApplication() {
-        addSingleton(new BootstrapResourceImpl());
         addSingleton(new HomePageResourceImpl());
         addSingleton(new ServicesResourceImpl());
         addSingleton(new DomainObjectResourceImpl());

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java
Wed Jun 29 09:18:00 2011
@@ -37,7 +37,7 @@ public class JsonViewerInstaller extends
 
     protected static final String EVERYTHING = "*";
     protected static final String ROOT = "/";
-    protected static final String[] STATIC_CONTENT = new String[] { "*.js", "*.gif", "*.png"
};
+    protected static final String[] STATIC_CONTENT = new String[] { "*.js", "*.gif", "*.png",
"*.html" };
 
     public JsonViewerInstaller() {
         super("json");

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageResourceImpl.java
Wed Jun 29 09:18:00 2011
@@ -22,16 +22,16 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.isis.viewer.json.applib.resources.HomePageResource;
 import org.apache.isis.viewer.json.viewer.representations.LinkRepBuilder;
 import org.apache.isis.viewer.json.viewer.representations.Representation;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.xhtml.applib.resources.HomePageResource;
 
 /**
  * Implementation note: it seems to be necessary to annotate the implementation with {@link
Path} rather than the
  * interface (at least under RestEasy 1.0.2 and 1.1-RC2).
  */
-@Path("/index")
+@Path("/")
 public class HomePageResourceImpl extends ResourceAbstract implements HomePageResource {
 
 

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/DomainObjectResourceImpl.java
Wed Jun 29 09:18:00 2011
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.viewer.json.applib.resources.DomainObjectResource;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
 import org.apache.isis.viewer.json.viewer.util.UrlDecoderUtils;
-import org.apache.isis.viewer.xhtml.applib.resources.DomainObjectResource;
 
 @Path("/objects")
 public class DomainObjectResourceImpl extends ResourceAbstract implements DomainObjectResource
{

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberRepType.java
Wed Jun 29 09:18:00 2011
@@ -17,7 +17,7 @@
 package org.apache.isis.viewer.json.viewer.resources.objects;
 
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.xhtml.applib.resources.DomainObjectResource;
+import org.apache.isis.viewer.json.applib.resources.DomainObjectResource;
 
 /**
  * Whether the representation of an {@link ObjectMember} (as generated by

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/objects/MemberType.java
Wed Jun 29 09:18:00 2011
@@ -55,7 +55,7 @@ public enum MemberType {
         }
     },
     ACTION("actions/", ImmutableMap.of(
-            "invoke", MutatorSpec.of(ActionValidationFacet.class, ActionInvocationFacet.class,
HttpMethod.PUT, BodyArgs.MANY, "invoke")
+            "invoke", MutatorSpec.of(ActionValidationFacet.class, ActionInvocationFacet.class,
HttpMethod.POST, BodyArgs.MANY, "invoke")
             )) {
         @Override
         public ObjectSpecification specFor(ObjectMember objectMember) {

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java
Wed Jun 29 09:18:00 2011
@@ -22,13 +22,14 @@ import java.util.List;
 
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.json.applib.resources.ServicesResource;
 import org.apache.isis.viewer.json.viewer.RepContext;
 import org.apache.isis.viewer.json.viewer.representations.Representation;
 import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
 import org.apache.isis.viewer.json.viewer.resources.objects.DomainObjectRepBuilder;
-import org.apache.isis.viewer.xhtml.applib.resources.ServicesResource;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -43,7 +44,7 @@ import com.google.common.collect.Lists;
 public class ServicesResourceImpl extends ResourceAbstract implements ServicesResource {
 
     @Override
-    @Produces({ "application/json" })
+    @Produces({ MediaType.APPLICATION_JSON })
     public String services() {
         init();
 

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/index.html?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/index.html (original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/index.html Wed Jun
29 09:18:00 2011
@@ -1,8 +1,8 @@
 <html>
     <head>
-        <title>Restful Objects</title>
-        <script type="text/javascript" src="/jquery-1.6.1.js"></script>
-        <script type="text/javascript" src="/isis-json-support.js"></script>
+        <title>JSON Objects</title>
+        <script type="text/javascript" src="jquery-1.6.1.js"></script>
+        <script type="text/javascript" src="isis-json-support.js"></script>
     </head>
     <body>
         <div id="services">

Modified: incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-json-support.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-json-support.js?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-json-support.js
(original)
+++ incubator/isis/trunk/framework/viewer/json/viewer/src/main/resources/isis-json-support.js
Wed Jun 29 09:18:00 2011
@@ -1,3 +1,4 @@
+// licensed under ALv2; see full statement at end of file.
 function add_links(ul, linkable) {
     var el = $("<a>", {
          href: linkable.link.url,
@@ -10,7 +11,7 @@ function add_links(ul, linkable) {
 }
 
 function bootstrap_app() {
-    $.getJSON('/index', 
+    $.getJSON('/', 
         undefined,
 		function load_services (data) {
 	        $.getJSON(data.services.url,
@@ -26,10 +27,6 @@ function bootstrap_app() {
     });
 }   
 
-
-
-
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

Modified: incubator/isis/trunk/framework/viewer/xhtml/src/docbkx/guide/isis-xhtml-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/xhtml/src/docbkx/guide/isis-xhtml-viewer.xml?rev=1141017&r1=1141016&r2=1141017&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/xhtml/src/docbkx/guide/isis-xhtml-viewer.xml (original)
+++ incubator/isis/trunk/framework/viewer/xhtml/src/docbkx/guide/isis-xhtml-viewer.xml Wed
Jun 29 09:18:00 2011
@@ -2622,11 +2622,10 @@ public interface UserResource {
     and can parse <acronym>XHTML</acronym>, they can interact with the
     resources provided by the viewer.</para>
 
-    <para>That said, if you are writing Java applications, then
-    <emphasis>restful Objects</emphasis> provides an application library
-    (applib) to simplify the task. To reference this applib, add the following
-    to your Maven pom's <sgmltag>&lt;dependencies&gt;</sgmltag>
-    section:</para>
+    <para>That said, if you are writing Java applications, then there is also 
+    an application library (applib) to simplify the task. To reference this 
+    applib, add the following to your Maven pom's 
+    <sgmltag>&lt;dependencies&gt;</sgmltag> section:</para>
 
     <programlisting>&lt;properties&gt;
     &lt;isis.viewer-restful.version&gt;y.y.y&lt;/isis.viewer-restful.version&gt;



Mime
View raw message