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 2014/07/28 15:28:56 UTC
[18/39] git commit: ISIS-839: reinstating some material that was
pruned from the about/index.html
ISIS-839: reinstating some material that was pruned from the about/index.html
... specifically the links to navigate to the app itself (!).
Also using HTML encoded chars to avoid accidental replacement when archetype is created from this project.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24aeeba4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24aeeba4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24aeeba4
Branch: refs/heads/master
Commit: 24aeeba4ef29a1b72633e53f3ba796b611593547
Parents: a2c8b57
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 24 08:25:46 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 24 18:21:39 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/webapp/welcome.html | 6 +-
.../webapp/src/main/webapp/about/index.html | 41 ++++++++---
.../src/main/resources/webapp/welcome.html | 4 +-
.../webapp/src/main/webapp/about/index.html | 76 +++++++++++++-------
4 files changed, 87 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/24aeeba4/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html b/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html
index fdfd6dd..49cfbcd 100644
--- a/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html
+++ b/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html
@@ -23,12 +23,12 @@
<br/>
<br/>
This app has been generated using Isis'
- <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html" target="_blank">SimpleApp</a> archetype,
+ <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype,
which configures Isis' most commonly used components as part of a very simple and purposefully minimal application.
<br/>
<br/>
- The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java" target="_blank">SimpleObject</a>,
- along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java" target="_blank">SimpleObjects</a>.
+ The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObject.java" target="_blank">SimpleObject</a>,
+ along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObjects.java" target="_blank">SimpleObjects</a>.
<br/>
<br/>
For more details, see the <a href="http://isis.apache.org/documentation.html" target="_blank">Isis website</a>.
http://git-wip-us.apache.org/repos/asf/isis/blob/24aeeba4/example/application/simpleapp/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/about/index.html b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
index 3b9ef8f..8d32f47 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/about/index.html
+++ b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
@@ -59,23 +59,44 @@ th, td {
<p>
<a href="http://isis.apache.org" target="_blank">Apache Isis</a>™ is a framework to let you rapidly develop
domain-driven apps in Java. This app has been generated using Isis'
- <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html" target="_blank">SimpleApp</a> archetype,
+ <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype,
which configures Isis to run a very simple and purposefully minimal application.
<p>
The app itself consists of a single domain class,
- <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java" target="_blank"><tt>SimpleObject</tt></a>,
- along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java" target="_blank"><tt>SimpleObjects</tt></a>.
+ <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObject.java" target="_blank"><tt>SimpleObject</tt></a>,
+ along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObjects.java" target="_blank"><tt>SimpleObjects</tt></a>.
</p>
-
- <p>
- Alternatively, if you'd like to start from a richer starting point, you might want to use the
- <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html" target="_blank">TodoApp</a> archetype.
- </p>
-
+
+ <p>To access the app:</p>
+ <ul>
+ <li>
+ <p>
+ <b><a href="wicket/">wicket/</a></b>
+ </p>
+ <p>
+ provides accesses to a generic UI for end-users,
+ Isis' <a href="http://isis.apache.org/components/viewers/wicket/about.html" target="_blank">Wicket Viewer</a>.
+ As its name suggests, this viewer is built on top of <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>™.
+ </p>
+ </li>
+ <li>
+ <p>
+ <b>
+ <a href="restful/">restful/</a>
+ </b>
+ </p>
+ <p>
+ provides access to a RESTful API conformant with the
+ <a href="http://restfulobjects.org">Restful Objects</a> spec</td>. This is part of Isis Core. The
+ implementation technology is JBoss RestEasy.
+ </p>
+ </li>
+ </ul>
+
<p>
The default user/password is <b><i>sven/pass</i></b> (as configured in the
- <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">shiro.ini</a> file).
+ <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">shiro.ini</a> file).
</p>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/24aeeba4/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html b/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html
index 1dbee0b..97b389c 100644
--- a/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html
+++ b/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html
@@ -23,12 +23,12 @@
<br/>
<br/>
This app has been generated using Isis'
- <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html" target="_blank">TodoApp</a> archetype,
+ <a href="http://isis.apache.org/intro/getting-started/todo%61pp-archetype.html" target="_blank">TodoApp</a> archetype,
which configures Isis' most commonly used components in a straightforward "todo" app.
<br/>
<br/>
The core functionality of the app is provided by the
- <a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank">ToDoItem</a> domain class.
+ <a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank">ToDoItem</a> domain class.
Supporting services provide additional capabilities.
<br/>
<br/>
http://git-wip-us.apache.org/repos/asf/isis/blob/24aeeba4/example/application/todoapp/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/about/index.html b/example/application/todoapp/webapp/src/main/webapp/about/index.html
index f248f38..a4bb026 100644
--- a/example/application/todoapp/webapp/src/main/webapp/about/index.html
+++ b/example/application/todoapp/webapp/src/main/webapp/about/index.html
@@ -59,62 +59,88 @@ th, td {
<p>
<a href="http://isis.apache.org" target="_blank">Apache Isis</a>™ is a framework to let you rapidly develop
domain-driven apps in Java. This app has been generated using Isis'
- <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html" target="_blank">TodoApp</a> archetype,
+ <a href="http://isis.apache.org/intro/getting-started/todo%61pp-archetype.html" target="_blank">TodoApp</a> archetype,
which configures Isis to run a (quite feature rich) "todo" app.
<p>
The app itself consists of a single domain class, <tt>ToDoItem</tt>, along with a number of supporting
services.
</p>
-
+
+ <p>To access the app:</p>
+ <ul>
+ <li>
+ <p>
+ <b><a href="wicket/">wicket/</a></b>
+ </p>
+ <p>
+ provides accesses to a generic UI for end-users,
+ Isis' <a href="http://isis.apache.org/components/viewers/wicket/about.html" target="_blank">Wicket Viewer</a>.
+ As its name suggests, this viewer is built on top of <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>™.
+ </p>
+ </li>
+ <li>
+ <p>
+ <b>
+ <a href="restful/">restful/</a>
+ </b>
+ </p>
+ <p>
+ provides access to a RESTful API conformant with the
+ <a href="http://restfulobjects.org">Restful Objects</a> spec</td>. This is part of Isis Core. The
+ implementation technology is JBoss RestEasy.
+ </p>
+ </li>
+ </ul>
+
<p>
- To build your own app, while you could start with this todo app and remove/rename as required, you are
- probably better off using the extremely minimal
- <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html" target="_blank">SimpleApp</a> archetype.
+ The default user/password is <b><i>sven/pass</i></b> (as configured in the
+ <a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">shiro.ini</a> file).
</p>
<p>
- The default user/password is <b><i>sven/pass</i></b> (as configured in the
- <a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">shiro.ini</a> file).
+ To build your own app, while you could start with this todo app and remove/rename as required, you are
+ probably better off using the extremely minimal
+ <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html" target="_blank">SimpleApp</a> archetype.
</p>
-
- <h2>App contents</h2>
+
+ <h2>App contents</h2>
<p>The key files in this "todo" app are:</p>
<!-- the hrefs below are partially URL encoded to prevent them from being modified when the archetype is created -->
<ul>
<li>Domain classes (todo functionality) (in <tt>dom</tt> module)
<ul>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank"><tt>ToDoItem</tt></a> domain entity
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank"><tt>ToDoItem</tt></a> domain entity
</li>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java" target="_blank"><tt>ToDoItems</tt></a> domain service (repository/factory)
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/dom/src/main/java/dom/todo/ToDoItems.java" target="_blank"><tt>ToDoItems</tt></a> domain service (repository/factory)
</li>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java" target="_blank"><tt>ToDoItemAnalysis</tt></a> application service analysing todo items
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/dom/src/main/java/app/ToDoItemAnalysis.java" target="_blank"><tt>ToDoItemAnalysis</tt></a> application service analysing todo items
</li>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java" target="_blank"><tt>ToDoAppDashboard</tt></a> dashboard application service
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/dom/src/main/java/app/ToDoAppDashboard.java" target="_blank"><tt>ToDoAppDashboard</tt></a> dashboard application service
</li>
</ul>
</li>
<li>Fixture scripts (in <tt>fixture</tt> module)
<ul>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java" target="_blank"><tt>ToDoItemsFixtureService</tt></a> domain service to install fixtures at run-time
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java" target="_blank"><tt>ToDoItemsFixtureService</tt></a> domain service to install fixtures at run-time
</li>
</ul>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml" target="_blank">WEB-INF/web.xml</a></tt> (in <tt>webapp</tt> module)
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml" target="_blank">WEB-INF/web.xml</a></tt> (in <tt>webapp</tt> module)
<ul>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L98" target="_blank">ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L134" target="_blank">ResourceServlet</a></tt> - filter and servlet for serving up static resources.
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L98" target="_blank">ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L134" target="_blank">ResourceServlet</a></tt> - filter and servlet for serving up static resources.
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L174" target="_blank">WicketFilter</a></tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt>
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L174" target="_blank">WicketFilter</a></tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L223" target="_blank">ResteasyBootstrap</a></tt>,
- <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L240" target="_blank">IsisSessionFilterForRestfulObjects</a></tt>,
- <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L271" target="_blank">RestfulObjectsRestEasyDispatcher</a></tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/restful/*</tt>.
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L223" target="_blank">ResteasyBootstrap</a></tt>,
+ <tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L240" target="_blank">IsisSessionFilterForRestfulObjects</a></tt>,
+ <tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L271" target="_blank">RestfulObjectsRestEasyDispatcher</a></tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/restful/*</tt>.
</li>
- <li>commented out <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L208" target="_blank">IsisWebAppBootstrapper</a></tt> listener; this is NOT required unless wicket viewer config is removed
+ <li>commented out <tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/web.xml#L208" target="_blank">IsisWebAppBootstrapper</a></tt> listener; this is NOT required unless wicket viewer config is removed
</li>
</ul>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties" target="_blank">WEB-INF/isis.properties</a></tt> (in <tt>webapp</tt> module)
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/isis.properties" target="_blank">WEB-INF/isis.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
<li><tt>isis.services</tt> - specifies the two domain services described above (<tt>ToDoItems</tt> and <tt>ToDoItemsFixtureService</tt>), appearing on the menu bar in the Wicket viewer,
along with a number of hidden framework-provided domain services demonstrating Isis' support for publishing, auditing and customizable error handling
@@ -125,19 +151,19 @@ th, td {
</li>
</ul>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties" target="_blank">WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>webapp</tt> module)
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties" target="_blank">WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
<li>configuration for JDO object store
</li>
</ul>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties" target="_blank">WEB-INF/persistor.properties</a></tt> (in <tt>webapp</tt> module)
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/persistor.properties" target="_blank">WEB-INF/persistor.properties</a></tt> (in <tt>webapp</tt> module)
<ul>
<li>JDBC URL for JDO object store
</li>
</ul>
</li>
- <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">WEB-INF/shiro.ini</a></tt> (in <tt>webapp</tt> module)
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todo%61pp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">WEB-INF/shiro.ini</a></tt> (in <tt>webapp</tt> module)
<ul>
<li>configuration for Shiro security
</li>