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/22 19:21:09 UTC

svn commit: r1026411 - in /incubator/isis/trunk: ./ alternatives/ alternatives/bytecode/src/site/apt/ alternatives/objectstore/ alternatives/objectstore/sql/src/site/ alternatives/objectstore/src/site/ alternatives/progmodel/ alternatives/remoting/src/...

Author: danhaywood
Date: Fri Oct 22 17:21:07 2010
New Revision: 1026411

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

Added:
    incubator/isis/trunk/viewer/html/src/main/src-archived/
      - copied from r1026337, incubator/isis/trunk/viewer/html/src/main/ARCHIVED/
Removed:
    incubator/isis/trunk/viewer/dnd/src/site/apt/TOREVIEW/
    incubator/isis/trunk/viewer/html/src/main/ARCHIVED/
Modified:
    incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt
    incubator/isis/trunk/alternatives/objectstore/pom.xml
    incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml
    incubator/isis/trunk/alternatives/objectstore/src/site/site.xml
    incubator/isis/trunk/alternatives/pom.xml
    incubator/isis/trunk/alternatives/progmodel/pom.xml
    incubator/isis/trunk/alternatives/remoting/src/site/apt/index.apt
    incubator/isis/trunk/alternatives/remoting/src/site/site.xml
    incubator/isis/trunk/alternatives/security/pom.xml
    incubator/isis/trunk/alternatives/src/site/apt/index.apt
    incubator/isis/trunk/applib/src/docbkx/guide/isis-applib.xml
    incubator/isis/trunk/applib/src/site/site.xml
    incubator/isis/trunk/core/metamodel/src/site/apt/index.apt
    incubator/isis/trunk/core/runtime/src/site/apt/index.apt
    incubator/isis/trunk/core/src/site/apt/index.apt
    incubator/isis/trunk/core/testsupport/src/site/apt/index.apt
    incubator/isis/trunk/core/webserver/src/site/apt/index.apt
    incubator/isis/trunk/defaults/bytecode/src/site/apt/index.apt
    incubator/isis/trunk/defaults/objectstore/src/site/apt/index.apt
    incubator/isis/trunk/defaults/progmodel/pom.xml
    incubator/isis/trunk/defaults/progmodel/src/site/apt/index.apt
    incubator/isis/trunk/defaults/security/src/site/apt/index.apt
    incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml
    incubator/isis/trunk/defaults/src/site/apt/index.apt
    incubator/isis/trunk/pom.xml
    incubator/isis/trunk/src/site/site.xml
    incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/story/bootstrapping/InitNakedObjects.java
    incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_RemoveLeadingWhiteSpace.java
    incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_SplitOnCommas.java
    incubator/isis/trunk/viewer/dnd/src/site/apt/index.apt
    incubator/isis/trunk/viewer/dnd/src/site/apt/jottings.apt
    incubator/isis/trunk/viewer/html/src/site/apt/index.apt
    incubator/isis/trunk/viewer/pom.xml
    incubator/isis/trunk/viewer/scimpi/src/site/apt/index.apt
    incubator/isis/trunk/viewer/src/site/site.xml
    incubator/isis/trunk/viewer/wicket/src/site/apt/index.apt

Modified: incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/alternatives/bytecode/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,7 +19,11 @@
 
 Alternative Bytecode Implementations
  
- The <alternative bytecode implementations> module is ...
+ This module is module is the parent for a
+ number of alternative implementations for the bytecode enhancement API
+ as defined in the {{{../../core/index.html}core}} framework.
+
+
  
  
- []
\ No newline at end of file
+ []

Modified: incubator/isis/trunk/alternatives/objectstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/pom.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/pom.xml Fri Oct 22 17:21:07 2010
@@ -19,7 +19,7 @@
         <siteBaseDir>../../..</siteBaseDir>
 
         <pdf.title>Apache Isis Alternative ObjectStores</pdf.title>
-        <pdf.outputName>apache-isis-alternatives-objectstores-${project.version}</pdf.outputName>
+        <pdf.outputName>apache-isis-alternatives-objectstores</pdf.outputName>
 	</properties>
 
 	<modules>

Modified: incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -12,7 +12,7 @@
 			<item name="About" href="index.html" />
             <item name="Jottings" href="jottings.html" />
 		</menu>
-        <menu ref="module"/>
+        <menu ref="modules"/>
 
 		<menu name="Documentation">
 			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />

Modified: incubator/isis/trunk/alternatives/objectstore/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/objectstore/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -14,7 +14,7 @@
 			<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
 		</menu>
 
-        <menu ref="module"/>
+        <menu ref="modules"/>
 
         <menu name="Maven Reports" ref="reports" />
 	</body>

Modified: incubator/isis/trunk/alternatives/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/pom.xml (original)
+++ incubator/isis/trunk/alternatives/pom.xml Fri Oct 22 17:21:07 2010
@@ -23,7 +23,7 @@
         <siteBaseDir>..</siteBaseDir>
 
         <pdf.title>Apache Isis Alternatives</pdf.title>
-        <pdf.outputName>apache-isis-alternatives-${project.version}</pdf.outputName>
+        <pdf.outputName>apache-isis-alternatives</pdf.outputName>
 	</properties>
 
 	<modules>

Modified: incubator/isis/trunk/alternatives/progmodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/progmodel/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/progmodel/pom.xml (original)
+++ incubator/isis/trunk/alternatives/progmodel/pom.xml Fri Oct 22 17:21:07 2010
@@ -19,7 +19,7 @@
         <siteBaseDir>../..</siteBaseDir>
         
     	<pdf.title>Alternative Programming Models</pdf.title>
-    	<pdf.outputName>alternative-progmodels-${project.version}</pdf.outputName>
+    	<pdf.outputName>alternative-progmodels</pdf.outputName>
 	</properties>
 
 

Modified: incubator/isis/trunk/alternatives/remoting/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/alternatives/remoting/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,8 +19,17 @@
 
 Remoting
  
- The <remoting> module is the parent of a set of submodules that collectively provide a remoting
- infrastructure for client/server deployments.
+   The <remoting> module is the parent of a set of submodules that collectively provide a remoting
+   infrastructure for client/server deployments.
  
- 
- []
\ No newline at end of file
+   Although categorized as an {{{../alternatives/index.html}alternative}} implementation, it 
+   is slightly different to the others in that it has no corresponding module under
+   {{{../defaults/index.html}defaults}}.  Instead, it provides alternative implementations of 
+   several internal APIs that are defined within the {{{../core/index.html}core}} (specifically,
+   <<<ObjectPersistor>>> and <<<Viewer>>>).  It provides implementations of these APIs in order to 
+   allow two instances of the application to interact across the nework in client/server mode.
+   
+   These implementations also define their own APIs, one being the transport protocol, the other a 
+   marshalling mechanism for network interactions.  The <remoting> component both defines these APIs
+   and provides several implementations.
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/alternatives/remoting/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/remoting/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/remoting/src/site/site.xml (original)
+++ incubator/isis/trunk/alternatives/remoting/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -13,7 +13,7 @@
             <item name="Jottings" href="jottings.html" />
 		</menu>
         
-        <menu ref="module"/>
+        <menu ref="modules"/>
 
 		<menu name="Documentation">
 			<item name="${docbkxGuideTitle} (PDF)" href="docbkx/pdf/${docbkxGuideName}.pdf" />

Modified: incubator/isis/trunk/alternatives/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/pom.xml (original)
+++ incubator/isis/trunk/alternatives/security/pom.xml Fri Oct 22 17:21:07 2010
@@ -19,7 +19,7 @@
         <siteBaseDir>../..</siteBaseDir>
 
     	<pdf.title>Alternative Security Implementations</pdf.title>
-    	<pdf.outputName>apache-isis-alternatives-security-${project.version}</pdf.outputName>
+    	<pdf.outputName>apache-isis-alternatives-security</pdf.outputName>
 	</properties>
 
 

Modified: incubator/isis/trunk/alternatives/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/alternatives/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -22,26 +22,38 @@ Alternatives
  The <alternatives> module is a parent for alternative implementations of the
  following APIs:
   
- * {{{./objectstores/index.html}object stores}}
+ * {{{./objectstore/index.html}object stores}}
  
    The object store API allows Isis to persist domain objects using different 
    technologies.
    
- * programming model / other language support
+ * {{{./progmodel/index.html}programming model}} / other language support
  
-   The Isis programming model is well-defined (see the 
-   {{{../applib/index.html}applib}} module for details) and generally should
-   not require adjusting; but can be modified if required.
+   These either refine the Isis programming model (as described in the 
+   {{{../applib/index.html}applib}} module) or could replace it (for example, if supporting
+   another language).
 
- * security (authentication & authorization)
+ * {{{./security/index.html}security}} (authentication & authorization)
  
    The mechanisms for authentication ("who are you"?) and authorization 
    ("what can you do?") are both pluggable.
  
- * remoting APIs
+ * {{{./bytecode/index.html}bytecode}} enhancement
  
-   Client/server deployments require both a transport protocol and a 
-   marshalling mechanism for network interactions.
+   This API allows the framework to automatically perform lazy loading and
+   dirty object tracking
+ 
+ * {{{./remoting/index.html}remoting}} APIs
+ 
+   The above items in this list are straightforward alternatives to {{{../defaults/index.html}default}}
+   implementations.  Remoting though is slightly different; it is an alternative implementation of 
+   several internal APIs that are defined within the {{{../core/index.html}core}} (specifically,
+   <<<ObjectPersistor>>> and <<<Viewer>>>).  It provides implementations of these APIs in order to 
+   allow two instances of the application to interact across the nework in client/server mode.
+   
+   These implementations also define their own APIs, one being the transport protocol, the other a 
+   marshalling mechanism for network interactions.  The <remoting> component both defines these APIs
+   and provides several implementations.
  
  []
  

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=1026411&r1=1026410&r2=1026411&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 17:21:07 2010
@@ -810,8 +810,7 @@
       <title>Authentication and Authorization</title>
 
       <para><emphasis>Apache Isis</emphasis> provides an
-      <acronym>API</acronym>s for both authentication and authorization, see
-      <xref linkend="chp.SecurityApi" />.</para>
+      <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

Modified: incubator/isis/trunk/applib/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/site/site.xml (original)
+++ incubator/isis/trunk/applib/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -6,6 +6,8 @@
 			<item name="AppLib"/>
 		</breadcrumbs>
 
+        <menu ref="parent"/>
+        
 		<menu name="Application Library">
 			<item name="About" href="index.html" />
 		</menu>

Modified: incubator/isis/trunk/core/metamodel/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/metamodel/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -21,4 +21,3 @@ MetaModel
 
  Defines a metamodel API and an extensible and customizable implementation.
  
- The provided implementation is based on the {{{../applib/index.html}AppLib}}.

Modified: incubator/isis/trunk/core/runtime/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/runtime/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -24,6 +24,4 @@ Runtime
  object specification (cf <<<java.lang.Class>>>) can be obtained.
  
  The <runtime> also manages persistence and transactions, with the actual
- persistence being delegated to an object store.  The <runtime> module does provide
- one implementation of an object store, namely the in-memory object store useful
- for prototyping. 
+ persistence being delegated to an object store.

Modified: incubator/isis/trunk/core/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/core/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -34,17 +34,15 @@ Core Framework
 
   []
   
-  Across these modules a number of APIs are defined:  
+  Across these modules a number of APIs are defined, each of which have {{{../default/index.html}default}} 
+  and {{{../alternatives.html}alternative}} implementations:  
   
   * persistence (object store API)
-   
+  
   * bytecode enhancement
    
   * security (authentication and authorization)
    
   * programming model definition
    
-  []
-
- 
- []
\ No newline at end of file
+  []
\ No newline at end of file

Modified: incubator/isis/trunk/core/testsupport/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/testsupport/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/core/testsupport/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/testsupport/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,4 +19,6 @@
 
 Test Support
  
- The <testsupport> module ...
\ No newline at end of file
+ The <testsupport> module holds helper classes to support writing unit
+ tests in either {{{http://junit.org}JUnit}} or {{{http://jmock.org}JMock}}.
+ It should only ever be added as a dependency with a <<<scope>>> of <test>.

Modified: incubator/isis/trunk/core/webserver/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/core/webserver/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -22,7 +22,7 @@ WebServer (Jetty)
  The <webserver> module bundles up {{{http://jetty.codehaus.org/jetty/}Jetty}} to make it easy to any application that's
  in webapp format.
  
- There are a couple of use case:
+ There are a couple of use cases:
  
  * if using the {{{../webapp/index.html}webapp}} module to deploy your application
    as a webapp, then you can check that your deployment runs ok an on webserver

Modified: incubator/isis/trunk/defaults/bytecode/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/defaults/bytecode/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -22,10 +22,6 @@ Default (CGLib) Bytecode Support
  The <Default Bytecode Support> module enables transparent lazy loading and object dirtying 
  support.
  
-Configuring CGLib
-
- TODO... <<<isis.properties>>>
-
 Alternatives
 
  * As an alternative to CGLib you can use {{{../../alternatives/bytecode/javassist/index.html}Javassist}}.

Modified: incubator/isis/trunk/defaults/objectstore/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/defaults/objectstore/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,5 +19,22 @@
 
 Default Object Store (In-Memory)
  
- The <Default Object Store> module enables ...
+ The <default object store> module provides an in-memory object store implementation.  As such, the
+ objects are only ever "persisted" for the duration of the running program, and not persisted
+ in between runs.
  
+ This makes the default object store suitable only for prototyping and for unit testing.  For 
+ deployment you will typically need to configure one of the {{{../../alternatives/objectstore/index.html}alternative}} implementations. 
+ 
+
+Alternatives
+
+  Alternatives include:
+  
+  * the {{{../../alternatives/objectstore/xml/index.html}XML}} object store
+
+  * the {{{../../alternatives/objectstore/sql/index.html}SQL}} object store
+
+  * the {{{../../alternatives/objectstore/nosql/index.html}NoSQL}} object store
+
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/defaults/progmodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/pom.xml (original)
+++ incubator/isis/trunk/defaults/progmodel/pom.xml Fri Oct 22 17:21:07 2010
@@ -9,7 +9,7 @@
 
 	<groupId>org.apache.isis.defaults</groupId>
 	<artifactId>progmodel</artifactId>
-	<name>Default Programming Model (Java)</name>
+	<name>Default ProgModel (Java)</name>
 
 	<properties>
         <siteBaseDir>../..</siteBaseDir>

Modified: incubator/isis/trunk/defaults/progmodel/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/defaults/progmodel/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,5 +19,23 @@
 
 Default Programming Model (Java)
  
- The <Default Programming Model> module enables ...
+ The <default progmodel> module defines an implementation of the default programming model as described by the
+ {{{../../../applib/index.html}applib}} documentation.
  
+ This programming model is defined by specifying a collection of <<<FacetFactory>>>s, which are
+ used to build up the metamodel.  The actual <<<FacetFactory>>>s are defined within the
+ {{{../../../core/index.html}core}} framework (in the <<<progmodel>>> module).
+ 
+Alternatives
+
+  Alternatives include:
+  
+  * the {{{../../alternatives/progmodel/headless/index.html}headless}} programming model.
+  
+    This extends the default programming model by providing the ability for domain objects to
+    interact with each other <as if> through the user interface (that is, obeying any business
+    rules that would otherwise be enforced at the application layer).
+
+  * the {{{../../alternatives/progmodel/groovy/index.html}Groovy}} programming model.
+  
+    This provides the ability to write domain objects using {{{http://groovy.codehaus.org}Groovy}}.

Modified: incubator/isis/trunk/defaults/security/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/defaults/security/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -19,5 +19,22 @@
 
 Default Security (No-op)
  
- The <Default Security> module enables ...
+ The <default security> module provides a stub implementation of Isis' authentication and
+ authorization APIs.  The authentation will accept any credentials as valid, and authorization will
+ grant all permissions.
  
+ This makes the default security implementation only suitable for prototyping and unit testing,
+ when security is not of concern.  For deployment you will typically need to configure one of 
+ the {{{../../alternatives/security/index.html}alternative}} implementations. 
+ 
+
+Alternatives
+
+  Alternatives include:
+  
+  * the {{{../../alternatives/security/file/index.html}file-based}} security (reading from simple flat files)
+
+  * the {{{../../alternatives/security/ldap/index.html}LDAP}} security
+
+
+ 
\ No newline at end of file

Modified: incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml (original)
+++ incubator/isis/trunk/defaults/src/docbkx/guide/isis-defaults.xml Fri Oct 22 17:21:07 2010
@@ -36,11 +36,6 @@
         <firstname>Robert</firstname>
         <surname>Matthews</surname>
       </author>
-
-      <author>
-        <firstname>Kevin</firstname>
-        <surname>Meyer</surname>
-      </author>
     </authorgroup>
 
     <legalnotice>

Modified: incubator/isis/trunk/defaults/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/src/site/apt/index.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/defaults/src/site/apt/index.apt Fri Oct 22 17:21:07 2010
@@ -20,6 +20,6 @@
 Default Implementations
  
  The <defaults> module is the parent of a set of submodules that collectively provide the default
- implementations for key APIs of the <core> framework.
+ implementations for key APIs of the {{{../core/index.html}core}} framework.
  
  []
\ No newline at end of file

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Fri Oct 22 17:21:07 2010
@@ -74,7 +74,7 @@
 
         <!-- used by maven-pdf-plugin for site PDFs; override as required -->
         <pdf.title>Apache Isis</pdf.title>
-        <pdf.outputName>apache-isis-${project.version}</pdf.outputName>
+        <pdf.outputName>apache-isis</pdf.outputName>
 
         <!-- used by maven-pdf-plugin for site PDFS; do not change -->
         <pdf.author>Apache Isis Contributors</pdf.author>

Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -51,15 +51,7 @@
 		<!-- Components menu is inherited -->
 		<menu name="Components" inherit="bottom" href="core/index.html">
 			<item name="Application Library" href="applib/index.html" />
-			<item name="Core Framework" href="core/index.html">
-	            <item name="Commons" href="core/commons/index.html" />
-	            <item name="Meta Model" href="core/metamodel/index.html" />
-                <item name="Prog Model" href="core/progmodel/index.html" />
-	            <item name="Runtime &amp; CmdLine" href="core/runtime/index.html" />
-	            <item name="Webapp Support" href="core/webapp/index.html" />
-	            <item name="Web Server (Jetty)" href="core/webserver/index.html" />
-	            <item name="Test Support" href="core/testsupport/index.html" />
-			</item>
+			<item name="Core Framework" href="core/index.html"/>
             <item name="Defaults" href="defaults/index.html">
                 <item name="Object Store" href="defaults/objectstore/index.html">
                 </item>

Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/story/bootstrapping/InitNakedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/story/bootstrapping/InitNakedObjects.java?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/story/bootstrapping/InitNakedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/extensions/bdd/common/story/bootstrapping/InitNakedObjects.java Fri Oct 22 17:21:07 2010
@@ -1,7 +1,5 @@
 package org.apache.isis.extensions.bdd.common.story.bootstrapping;
 
-import java.util.List;
-
 import org.apache.isis.extensions.bdd.common.Story;
 import org.apache.isis.extensions.bdd.common.components.StoryAuthenticationManagerInstaller;
 import org.apache.isis.extensions.bdd.common.components.StoryInMemoryPersistenceMechanismInstaller;
@@ -10,10 +8,7 @@ import org.apache.isis.runtime.context.I
 import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerNoop;
 import org.apache.isis.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.installers.InstallerLookupDefault;
-import org.apache.isis.runtime.options.standard.OptionHandlerDeploymentType;
 import org.apache.isis.runtime.runner.IsisModule;
-import org.apache.isis.runtime.runner.IsisRunner;
-import org.apache.isis.runtime.runner.options.OptionHandler;
 import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.isis.runtime.system.IsisSystem;
 import org.apache.isis.runtime.system.SystemConstants;

Modified: incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_RemoveLeadingWhiteSpace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_RemoveLeadingWhiteSpace.java?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_RemoveLeadingWhiteSpace.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_RemoveLeadingWhiteSpace.java Fri Oct 22 17:21:07 2010
@@ -1,6 +1,5 @@
 package org.apache.isis.extensions.bdd.common.util;
 
-import org.apache.isis.extensions.bdd.common.util.Strings;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;

Modified: incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_SplitOnCommas.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_SplitOnCommas.java?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_SplitOnCommas.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/test/java/org/apache/isis/extensions/bdd/common/util/Strings_SplitOnCommas.java Fri Oct 22 17:21:07 2010
@@ -1,6 +1,5 @@
 package org.apache.isis.extensions.bdd.common.util;
 
-import org.apache.isis.extensions.bdd.common.util.Strings;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.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=1026411&r1=1026410&r2=1026411&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 17:21:07 2010
@@ -19,12 +19,16 @@
 
 DnD Viewer
 
- The Drag and Drop (DnD) viewer is graphical user interface for working with [[NAME]]. 
- It renders each domain object as an icon or a
-    window and allows the user to manage and manipulate them using the mouse
-    and keyboard. Dragging and dropping domain objects plays a major role in
-    this interface, hence its name.
-    
- ~~The viewer comes with a number of basic views, such as forms,
- ~~tables, calendar etc, and others can be added.</para>
+ The Drag and Drop (DnD) viewer is non-web graphical user interface that employs a 
+ desktop metaphor for interacting with domain objects.  It renders each domain object 
+ as an icon or a window and allows the user to manage and manipulate them using the mouse
+ 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

Modified: incubator/isis/trunk/viewer/dnd/src/site/apt/jottings.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/site/apt/jottings.apt?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/site/apt/jottings.apt (original)
+++ incubator/isis/trunk/viewer/dnd/src/site/apt/jottings.apt Fri Oct 22 17:21:07 2010
@@ -22,3 +22,17 @@ Jottings
   This page is to capture any random jottings relating to this module prior 
   to being moved into formal documentation. 
  
+
+Useful tools for the DND developer
+
+  When space is limited us the limitText method in the TextUtils class.  This will return the maximum amount of text to fit a specified space.
+
+------
+TextUtils.limitText(title, TITLE_STYLE, availableWidth);
+----
+ 
+ 
+User Profiles
+
+  When the DND viewer is exited (DndViewer.quit()) a call is made to saveDesktop() that will 
+  cause the UserProifile to be persisted under the user's name. This is stored using the UserProfileStore

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=1026411&r1=1026410&r2=1026411&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 17:21:07 2010
@@ -19,15 +19,24 @@
 
 HTML Viewer
 
- The HTML viewer provides a web interface to a [[NAME]] domain model. 
+ The HTML viewer provides a simple webapp interface for interacting with an Isis domain model.
+  
  It renders each domain object or collection of domain objects as a web page, with
  hyperlinks used to navigate between objects.  In addition, object actions can also be invoked,
  with hyperlinks bringing up a page for action parameters if required.
  
+Customization
+ 
+  The HTML viewer offers only very limited customization opportunities; the CSS can be
+  altered, but that's about it. 
+ 
 Alternatives
 
- One limitation of the HTML viewer is that it is not customizable, other than through CSS.  
- If you want the ability for more far-reaching customization, then consider {{{../scimpi/index.html}Scimpi}} webapp viewer
- or the {{{../wicket/index.html}Wicket}} viewer.
+  There are two other webapp viewers which provide more far wider customization opportunities:
+  
+  * the {{{../scimpi/index.html}Scimpi}} viewer uses a JSF-like markup metaphor
+  
+  * the {{{../wicket/index.html}Wicket}} viewer uses a {{{http://wicket/apache.org}Apache Wicket}} components
+    (and allows you to define your own components also).
     
- 
+  []

Modified: incubator/isis/trunk/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/pom.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/pom.xml Fri Oct 22 17:21:07 2010
@@ -18,7 +18,7 @@
         <siteBaseDir>..</siteBaseDir>
         
     	<pdf.title>Apache Isis Viewers</pdf.title>
-    	<pdf.outputName>apache-isis-viewers-${project.version}</pdf.outputName>
+    	<pdf.outputName>apache-isis-viewers</pdf.outputName>
 	</properties>
 
 

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=1026411&r1=1026410&r2=1026411&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 17:21:07 2010
@@ -16,46 +16,25 @@
 ~~  under the License.
 
 
- -----
- Welcome to Scimpi
- -----
- The [[NAME]] Team
- -----
-
-Welcome to Scimpi
+Scimpi Viewer
 
+  The <scimpi> module provides a webapp viewer that out-of-the-box provides a similar
+  interface to that provided by the {{{../html/index.html}HTML}} viewer.
   
+  However, unlike the HTML viewer it allows the user interface to be extensively customized. 
   
- Scimpi is an ultra-lightweight framework for developing web 
-      applications that are based on strong domain models. It will appeal strongly 
-      to any developer who identifies with the principles of {{{http://en.wikipedia.org/wiki/Domain_driven_design}domain-driven 
-      design}} and/or {{{http://agilemanifesto.org/} agile      development}}.
-      
-      
- <<A Scimpi web-application has just two elements:>>
+Customization
+
+  Scimpi works by searching for a specific page to render the domain object, eg <<<Customer.shtml>>>
+  to render a <<<Customer>>> object.  If none is found, it always falls back to a generic page, 
+  which can render any object.
+  
+  Customization therefore is accomplished by providing a specific page.  The elements of this
+  page can be any of the tags that Scimpi understands. 
+
+Alternatives
 
-	* <<Domain objects>>, written as {{{http://en.wikipedia.org/wiki/POJO} Plain 
-      Old Java Objects (POJOs)}}, that follow a few simple conventions, and 
-      which are persisted via {{{http://www.hibernate.org/} Hibernate}}.
-
-	* <<Web pages>>, written as pure HTML, with embedded 
-      tags to display information from the domain objects, and/or to invoke their 
-      methods.
-
- <<The benefits are:>> 
-
-    * Very rapid prototyping. As soon as you have any domain objects you 
-          view them and invoke their actions via a generic Scimpi web page. Then 
-          you add customised web pages and navigation only as you need them.
-
-    * Much less code to write, and to maintain, as business requirements 
-          change
-
-    * Supports an agile, iterative, approach to development.
-
-    * No need to keep multiple layers in synch using complex configuration 
-          files.
-
-    *<All> business logic is encapsulated on the domain objects, 
-          instead of being scattered across multiple layers, making them more 
-          re-usable between applications
+  An alternative to Scimpi which offers similar customization though through a different
+  means is the {{{../wicket/index.html}Wicket}} viewer.
+ 
+      

Modified: incubator/isis/trunk/viewer/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/src/site/site.xml?rev=1026411&r1=1026410&r2=1026411&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/src/site/site.xml (original)
+++ incubator/isis/trunk/viewer/src/site/site.xml Fri Oct 22 17:21:07 2010
@@ -14,6 +14,6 @@
 			<item name="${pdf.title} (PDF)" href="${pdf.outputName}.pdf" />
 		</menu>
 
-        <menu ref="module"/>
+        <menu ref="modules"/>
 	</body>
 </project>

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=1026411&r1=1026410&r2=1026411&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 17:21:07 2010
@@ -17,21 +17,24 @@
 
 
 
-Overview
+Wicket Viewer
 
-  <Apache Isis Wicket Viewer> is a viewer extension for the 
-  <Apache Isis> framework, providing a customizable web app using the
-  {{{http://wicket.apache.org}Apache Wicket}} web framework.
+  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>. 
 
-  The diagram below shows how <Apache Isis Wicket Viewer> relates to the rest of <Apache Isis>, in terms 
-  of the {{{http://alistair.cockburn.us/Hexagonal+architecture}hexagonal architecture}}.
+Customization
 
-[images/HexagonalArchitectureOverview.png] Apache Isis.
+  TODO: explain 
+
+Alternatives
+
+  An alternative to Wicket which offers similar customization though through a different
+  means is the {{{../scimpi/index.html}Scimpi}} viewer.
 
 Status
 
@@ -39,4 +42,5 @@ Status
 
 Color Scheme
 
-  See {{{color-scheme.html}color scheme}}.
\ No newline at end of file
+  See {{{color-scheme.html}color scheme}}.
+  
\ No newline at end of file