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 2010/10/23 00:40:16 UTC

svn commit: r1026516 - in /incubator/isis/trunk: alternatives/objectstore/sql/tests-common/ alternatives/objectstore/sql/tests-served/ applib/src/docbkx/guide/ site-skin/src/main/resources/css/ viewer/bdd/common/src/site/apt/ viewer/bdd/concordion/src/...

Author: danhaywood
Date: Fri Oct 22 22:40:15 2010
New Revision: 1026516

URL: http://svn.apache.org/viewvc?rev=1026516&view=rev
Log:
more on site docs

Removed:
    incubator/isis/trunk/viewer/restful/applib/src/main/java/org/starobjects/
    incubator/isis/trunk/viewer/wicket/src/site/apt/color-scheme.apt
Modified:
    incubator/isis/trunk/alternatives/objectstore/sql/tests-common/   (props changed)
    incubator/isis/trunk/alternatives/objectstore/sql/tests-served/   (props changed)
    incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
    incubator/isis/trunk/site-skin/src/main/resources/css/site.css
    incubator/isis/trunk/viewer/bdd/common/src/site/apt/index.apt
    incubator/isis/trunk/viewer/bdd/concordion/src/site/apt/index.apt
    incubator/isis/trunk/viewer/bdd/src/site/apt/index.apt
    incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt
    incubator/isis/trunk/viewer/html/src/site/apt/index.apt
    incubator/isis/trunk/viewer/junit/src/site/apt/index.apt
    incubator/isis/trunk/viewer/restful/applib/src/site/apt/index.apt
    incubator/isis/trunk/viewer/restful/src/site/apt/index.apt
    incubator/isis/trunk/viewer/restful/viewer/src/site/apt/index.apt
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/apt/index.apt
    incubator/isis/trunk/viewer/scimpi/servlet/src/site/apt/index.apt
    incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/applib/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/facets/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/model/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/ui/src/site/apt/index.apt
    incubator/isis/trunk/viewer/wicket/ui/src/site/apt/jottings.apt
    incubator/isis/trunk/viewer/wicket/viewer/src/site/apt/index.apt

Propchange: incubator/isis/trunk/alternatives/objectstore/sql/tests-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 22 22:40:15 2010
@@ -1,2 +1,6 @@
 hsql-db
 isis.log
+.settings
+target
+.classpath
+.project

Propchange: incubator/isis/trunk/alternatives/objectstore/sql/tests-served/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 22 22:40:15 2010
@@ -1 +1,5 @@
 isis.log
+.settings
+target
+.classpath
+.project

Modified: incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml (original)
+++ incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml Fri Oct 22 22:40:15 2010
@@ -812,16 +812,19 @@
       <para><emphasis>Apache Isis</emphasis> provides an
       <acronym>API</acronym>s for both authentication and authorization.</para>
 
-      <para>The core implementation of these <acronym>API</acronym>s are very
-      basic file-based authentication and authorization mechanisms, the
-      configuration of which is described in <xref
-      linkend="chp.SecurityApi" />. These default mechanisms are suitable for
-      simple applications, but are unlikely to meet the security requirements
-      of larger enterprises.</para>
-
-      <para>As an alternative, you can use implementations that integrate with
-      <acronym>LDAP</acronym> (in <filename>alternates/ldap-auth</filename>)
-      module, or consider writing your own.</para>
+      <para>The core implementation of these <acronym>API</acronym>s are simple
+      basic noop-based authentication and authorization mechanisms.  For 
+      deployment into production, you'll need to configure with another
+      alternative implementation.</para>
+
+      <para>One option is the file-based implementation (in <filename>alternatives/security/file</filename>), 
+      that stores the security information in flat files.  This is simple, but unlikely
+      to be robust enough for enterprise use.</para>
+
+      <para>Another alternative is to use the LDAP implementation (in 
+      <filename>alternatives/security/ldap</filename>), which can integrate with an
+      LDAP infrastructure if you have one.  If you have a different security infrastructure,
+      then you might consider to write your own implementation (the API is not complex).</para>
     </sect1>
 
     <sect1 id="sec.DeployingAnIsisApplication">

Modified: incubator/isis/trunk/site-skin/src/main/resources/css/site.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/site-skin/src/main/resources/css/site.css?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/site-skin/src/main/resources/css/site.css (original)
+++ incubator/isis/trunk/site-skin/src/main/resources/css/site.css Fri Oct 22 22:40:15 2010
@@ -128,6 +128,7 @@ contentBox + section {
     background-color:transparent;
     border: none;
     border-right:1px solid #EEEEEE;
+    min-height: 800px; 
 }
 
 #navcolumn {

Modified: incubator/isis/trunk/viewer/bdd/common/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,7 +19,13 @@
 
 BDD Common
 
- The BDD common module provides ...
-  
+ The BDD <common> module provides integration logic with <Apache Isis>, 
+ independent of any particular BDD testing framework.   Although
+ the {{{../concordion/index.html}concordion}} module is the only user,
+ it is separate from that module in order to enable integrations with other 
+ BDD frameworks in the future.
     
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-bdd-viewer.html}user guide}} for more information.
  

Modified: incubator/isis/trunk/viewer/bdd/concordion/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/concordion/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/bdd/concordion/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -17,12 +17,12 @@
 
 
 
-BDD Viewer
+BDD Concordion support
 
- The BDD viewer provides ...
+ The <concordion> module provides an integration between the Isis (via {{{../common/index.html}common})
+ and the {{{http://concordion.org}Concordion}} framework itself.
+ 
+Further Info
   
-Alternatives
-
- JUnit viewer ...
-    
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-bdd-viewer.html}user guide}} for more information.
  

Modified: incubator/isis/trunk/viewer/bdd/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/bdd/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,10 +19,16 @@
 
 BDD Viewer
 
- The BDD viewer provides ...
+ The <bdd> viewer provides the ability to story-test the functionality
+ in your domain objects, using a behaviour-driven design (BDD)
+ framework.
+ 
+ Currently the only framework supported is {{{http://concordion.org}Concordion}},
+ though we expect others to be supported in the future.
   
 Alternatives
 
- JUnit viewer ...
-    
- 
+ The {{{../junit/index.html}JUnit}} viewer can also be used for testing.
+ However, with the junit viewer the actual test is written in {{{http://junit.org}JUnit}}
+ (rather than XHTML as is the case for Concordion) and so is closer to a 
+ developer test than a story test.

Modified: incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -25,10 +25,13 @@ DnD Viewer
  and keyboard. Dragging and dropping domain objects plays a major role in
  this interface, hence its name.
  
-
- 
 Customization
 
   The DnD viewer defines its own API to allow new views to be defined.  These can be for
   entities, for entity properties (and action parameters), for entity collections, and
-  for collections of entities.
\ No newline at end of file
+  for collections of entities.
+  
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{docbkx/html/guide/isis-dnd-viewer.html}user guide}} for more information.
+  
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/html/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/html/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -40,3 +40,8 @@ Alternatives
     (and allows you to define your own components also).
     
   []
+
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{docbkx/html/guide/isis-html-viewer.html}user guide}} for more information.
+  
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/junit/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/junit/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,5 +19,11 @@
 
 JUnit Viewer
  
- The <junit viewer> module provides JUnit4 integration, allowing unit tests to be written exercising business
+ The <junit> viewer module provides JUnit4 integration, allowing 
+ unit tests to be written exercising business
  rules by catching the exceptions thrown by proxied domain objects.
+
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{docbkx/html/guide/isis-junit-viewer.html}user guide}} for more information.
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/restful/applib/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -17,4 +17,12 @@
 
 Restful AppLib
 
-  The Restful AppLib module ...
+  The restful viewer's <applib> module defines (among other things) the
+  JAX-RS (JSR-311) compliant interfaces which define the URIs exposed by
+  the viewer.  These do allow frameworks (such as JBoss' {{{http://jboss.org/resteasy}RestEasy}}
+  framework) to generate client-side bindings.  
+
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-restful-viewer.html}user guide}} for more information.
+  
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/restful/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/restful/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -16,10 +16,38 @@
 ~~  under the License.
 
 
-
 Restful Viewer
 
- The Restful viewer provides ...
-  
+ The <restful> 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, as
+ defined by the following table:
+ 
++-----------------+------------------+------------------+------------------+------------------+
+|Method \ Resource|Object            |Property          |Collection        |Action            |
++-----------------+------------------+------------------+------------------+------------------+
+|GET              |List all property |n/a               |List all objects  |n/a               |
+|                 |values for object |                  |in collection     |                  |
++-----------------+------------------+------------------+------------------+------------------+
+|PUT              |Add new object    |Set value         |Add object into   |n/a               |
+|                 |                  |                  |collection        |                  |
++-----------------+------------------+------------------+------------------+------------------+
+|DELETE           |Delete            |Clear value       |Remove object     |n/a               |
+|                 |existing object   |                  |collection        |                  |
++-----------------+------------------+------------------+------------------+------------------+
+|POST             |                  |                  |                  |Invoke            |
++-----------------+------------------+------------------+------------------+------------------+
+ 
+
+Representation
+
+  The viewer currently represents all domain object as XHTML, meaning that it can be rendered by
+  browers.  This XHTML also serves up a small amount of JavaScript which enables the HTTP PUT
+  and HTTP DELETE methods.  This allows the developer to interact with the system through
+  the browser.   
     
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{docbkx/html/guide/isis-restful-viewer.html}user guide}} for more information.
  

Modified: incubator/isis/trunk/viewer/restful/viewer/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -18,3 +18,8 @@
 Restful Viewer
 
   The <viewer> module provides a set of servlets that serve up the domain objects as RESTful resources. 
+
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-restful-viewer.html}user guide}} for more information.
+  
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -16,8 +16,12 @@
 ~~  under the License.
 
 
-
 Scimpi Dispatcher
 
  The <dispatcher> module provides much of the core implementation of scimpi, including
- the handling for the generic view definitions and tag handling.
\ No newline at end of file
+ the handling for the generic view definitions and tag handling.
+ 
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-scimpi-viewer.html}user guide}} for more information.
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/scimpi/servlet/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/servlet/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/servlet/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/scimpi/servlet/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -20,4 +20,9 @@
 Scimpi Servlet
 
  The <servlet> module provides implementations of the JEE <<<HttpServlet>>> interface
- as the entry point and bootstrapping of a Scimpi webapp.
\ No newline at end of file
+ as the entry point and bootstrapping of a Scimpi webapp.
+ 
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-scimpi-viewer.html}user guide}} for more information.
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -37,4 +37,7 @@ Alternatives
   An alternative to Scimpi which offers similar customization though through a different
   means is the {{{../wicket/index.html}Wicket}} viewer.
  
-      
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{./docbkx/html/guide/isis-scimpi-viewer.html}user guide}} for more information.
+      
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/applib/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/applib/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/applib/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/applib/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -15,10 +15,10 @@
 ~~  specific language governing permissions and limitations
 ~~  under the License.
 
-
-
 Application Library
 
   The Wicket viewer applib holds annotations that can be applied to your domain object and that will alter the rendering of your domain objects.
+
+Further Info
   
-  See this module's {{{apidocs/index.html}Javadoc}} and the {{{../documentation/docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.

Modified: incubator/isis/trunk/viewer/wicket/facets/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/facets/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/facets/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/facets/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,9 +19,9 @@
 
 Facets
 
-  The <facets> module for <Apache Isis Wicket Viewer> extends the standard <Apache Isis> programming model so that it picks up annotations defined 
-  in the {{{../applib/index.html}applib}}.
+  The <facets> module for the <wicket> Viewer extends the standard Apache Isis programming model so 
+  that it picks up annotations defined in Wicket's own {{{../applib/index.html}applib}}.
   
-  These facets are enabled by editing the <<<isis.properties>>> configuration file.  
+Further Info
   
-  See this module's {{{apidocs/index.html}Javadoc}} and the {{{../docbkx/html/user-guide/user-guide.html}user guide}} for more information.
\ No newline at end of file
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.

Modified: incubator/isis/trunk/viewer/wicket/model/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/model/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,12 +19,14 @@
 
 Model
 
-  The <model> module for <Apache Isis Wicket Viewer> holds the implementations of <Apache Wicket> <<<IModel>>>s, with these 
-  <<<IModel>>>s wrapping <Apache Isis> domain objects.  These <<<IModel>>>s are shared among different views 
-  defined in the {{{.../ui}ui}} module.
+  The <model> module for the <wicket> viewer holds the implementations of <Apache Wicket> <<<IModel>>>s, with these 
+  <<<IModel>>>s wrapping <Apache Isis> domain objects.  The <<<IModel>>>s are shared among different views 
+  defined in the {{{../ui/index.html}ui}} module.
   
   The <<<IModel>>>s also handle serialization issues required by <Wicket>'s stateful architecture,
   storing the state of these domain objects transparently in mementos (even if the underlying pojos are not
   serializable).
 
-  See this module's {{{apidocs/index.html}Javadoc}} and the {{{../docbkx/html/user-guide/user-guide.html}user guide}} for more information.
\ No newline at end of file
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.

Modified: incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -22,15 +22,28 @@ Wicket Viewer
   The <wicket> module provides a customizable webapp viewer for an Isis domain model, 
   implemented using the {{{http://wicket.apache.org}Apache Wicket}} web framework.
   
-  Using the <Apache Isis Wicket Viewer>, you can quickly developing domain-driven applications and run them as
-  <Apache Wicket> webapps.  You simply write your domain objects as pojos, and the viewer automatically
-  renders them as a webapp.  Later, you can start to customize the GUI by writing your own <Apache Wicket> <<<Component>>>s 
-  and plugging them into the infrastructure provided by <Apache Isis Wicket Viewer>. 
+  Like the {{{../html/index.html}HTML}} viewer, the wicket viewer provides a generic webapp with
+  a page displayed for each entity or collection of entities.  Unlike that viewer, though, you can also customize the GUI.
 
 Customization
 
-  TODO: explain 
-
+  The wicket viewer allows you to customize the GUI in 3 ways:
+  
+  * first and most straight-forwardly, you can change the styling using CSS
+  
+  * second, you can write your own views using the Apache Wicket <<<Component>>> API.
+  
+    These views will typically be to render a specific entity, a particular property/parameter type, 
+    or a collection of entities.  You can either write these views from scratch, or use existing <<<Component>>>
+    implementations (for example the open source code available at Wicket's companion site, {{{http://wicketstuff.org}WicketStuff.org}). 
+    
+  * third, you can register your own pages for a particular object type
+  
+    This allows you to render certain objects (eg a <<<DashBoard>>> object) using a completely customized
+    web page if required.
+       
+  []
+  
 Alternatives
 
   An alternative to Wicket which offers similar customization though through a different
@@ -40,7 +53,7 @@ Status
 
   See the {{{todo.html}ToDo list}}
 
-Color Scheme
-
-  See {{{color-scheme.html}color scheme}}.
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{./docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.
   
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/ui/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -16,10 +16,12 @@
 ~~  under the License.
 
 
-
 UI
 
-  The <ui> module for <Wicket Objects> holds/is intended to hold the implementations of <Wicket> <<<Component>>>s, using 
-  <<<IModel>>>s from the <model> module.
+  The <ui> module for the <wicket> viewer holds the implementations of 
+  <Wicket> <<<Component>>>s, using <<<IModel>>>s from the {{{../model/index.html}model}} module.
+  
+Further Info
   
-  See this module's {{{apidocs/index.html}Javadoc}} and the {{{../documentation/docbkx/html/user-guide/user-guide.html}user guide}} for more information.
\ No newline at end of file
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.
+    
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/ui/src/site/apt/jottings.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/site/apt/jottings.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/site/apt/jottings.apt (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/site/apt/jottings.apt Fri Oct 22 22:40:15 2010
@@ -22,3 +22,22 @@ Jottings
   This page is to capture any random jottings relating to this module prior 
   to being moved into formal documentation. 
  
+
+ Color Scheme
+
+  The color scheme for the <Wicket> viewer can be customized using CSS, but if you 
+  want to use it as is in your own custom components, then here are the values: 
+  
+  * <<<#C4D9EA>>>   - light blue, ties in with banner
+  * <<<#D7E7F5>>>   - even lighter blue, also in banner
+  * <<<#407098>>>   - darker blue, font in banner
+  * <<<#A66144>>>   - brown, accent color
+  
+  Other compatible colors:
+  * <<<#fff4d3>>>   - yellow
+  * <<<#fff9e7>>>   - pale yellow
+  * <<<#ffe0d3>>>   - pink(ish)
+  * <<<#ffeee7>>>   - pale pink(ish)
+  * <<<#bfaea6>>>   - grey/pink (to tone with brown accent)
+  
+  {{{http://colorschemedesigner.com/#3y31T5AT.w0w0}ColorSchemeDesigner}}
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/site/apt/index.apt?rev=1026516&r1=1026515&r2=1026516&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/site/apt/index.apt Fri Oct 22 22:40:15 2010
@@ -19,8 +19,12 @@
 
 Viewer
 
-  The <viewer> module for <Apache Isis Wicket Viewer> extension is used to bootstrap the webapp, providing an implementation of <Apache Wicket>'s <<<WebApplication>>> class that
-  also bootstraps the <Apache Isis> runtime.  It also provides login/logout pages, and registers default sets of
+  The <viewer> module for <wicket> viewer is used to bootstrap 
+  the webapp, providing an implementation of <Apache Wicket>'s 
+  <<<WebApplication>>> class that also bootstraps the <Apache Isis> 
+  runtime.  It also provides login/logout pages, and registers default sets of
   views which ultimately determine the look-n-feel of the running webapp.
   
-  See this module's {{{apidocs/index.html}Javadoc}} and the {{{../docbkx/html/user-guide/user-guide.html}user guide}} for more information.
\ No newline at end of file
+Further Info
+  
+  See this module's {{{./apidocs/index.html}Javadoc}} and the {{{../docbkx/html/guide/isis-wicket-viewer.html}user guide}} for more information.