Modified: isis/site/trunk/content/core/applib.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/core/applib.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/core/applib.md (original)
+++ isis/site/trunk/content/core/applib.md Mon Dec 10 12:12:18 2012
@@ -1,9 +1,8 @@
 Title: Application Library
 
-{stub
-This page is a stub.
-}
+Apache Isis works using convention-over-configuration; you write your domain 
objects following a set of conventions, and these are interpreted by the 
framework in order to render, persist, remote or otherwise interact with your 
domain model.
 
-Isis graduated from the Apache incubator in October 2012; we are currently 
setting ourselves up as a top-level project.
+These conventions are together known as the Apache Isis Programming Model. The 
Apache Isis Application Library - or AppLib - constitutes those elements of the 
programming model that are declarative (such as annotations and interfaces). It 
also contains the `DomainObjectContainer` interface, which is normally injected 
into your domain objects and represents the only point of coupling from your 
domain into the framework.
+
+See the applib programming guide 
([HTML](http://incubator.apache.org/isis/applib/docbkx/html/guide/isis-applib.html)
 or [PDF](http://incubator.apache.org/isis/applib/docbkx/pdf/isis-applib.pdf)) 
for further details.
 
-In the meantime you can access our original incubator website 
[here](http://incubator.apache.org/isis "Apache Isis (incubator website)").

Modified: isis/site/trunk/content/core/runtime.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/core/runtime.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/core/runtime.md (original)
+++ isis/site/trunk/content/core/runtime.md Mon Dec 10 12:12:18 2012
@@ -7,3 +7,67 @@ This page is a stub.
 Isis graduated from the Apache incubator in October 2012; we are currently 
setting ourselves up as a top-level project.
 
 In the meantime you can access our original incubator website 
[here](http://incubator.apache.org/isis "Apache Isis (incubator website)").
+
+<!--
+Runtimes
+
+  The <runtimes> module is a parent for the various implementations of
+  a runtime for the framework.
+
+  A 'runtime' in this context means providing some or all of:
+
+  * object persistence
+
+  * object identity management
+
+  * bootstrapping the framework
+
+  * service location / dependency injection
+
+  []
+
+  The only implementation currently available is:
+
+  * {{{./dflt/index.html}Default runtime}}
+
+  The <dflt> (default) runtime implementation (as inherited originally
+  from Naked Objects Framework) provides all of these services.  Other
+  implementations may provide a subset of these (eg the 'embedded' runtime),
+  or provide all of these features but using different technologies.
+
+
+
+Default Runtime
+
+  The default runtime module comprises a set of modules that provide
+  for persistence and entity lifecycle management.  They also provide support
+  for remoting (by an abstraction over the persistence mechanism) and
+  incorporate a bytecode enhancement API to enable transparent lazy
+  loading/unit of work tracking.
+
+  The modules that make up the default runtime are:
+
+  * {{{./runtime/index.html}runtime}} module, providing the core functionality
+
+  * {{{./objectstores/index.html}objectstores}} module, under which there are
+    various objectstore implementations (for persisting domain objects)
+
+  * {{{./profilestores/index.html}profilestores}} module, under which there are
+    various profilestore implementations (for persisting user preferences)
+
+  * {{{./bytecode/index.html}bytecode}} module, under which there are
+    various bytecode enhancement implementations (used for transparent lazy
+    loading/unit of work support)
+
+  * {{{./webapp/index.html}webapp}} module, providing the ability to bootstrap 
t
+he
+    default runtime within a web application
+
+  * {{{./webserver/index.html}webserver}} module, providing the ability to run
+    Isis webapps under a webserver instance (Jetty)
+
+  * {{{./remoting/index.html}remoting}} module, acting as a parent to the
+    modules that provide support for client/server deployments
+
+
+-->
\ No newline at end of file

Modified: isis/site/trunk/content/documentation.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Mon Dec 10 12:12:18 2012
@@ -10,6 +10,7 @@ Title: Documentation
 
 - [Demo App](getting-started/demo-app.html) (`0.2.0-incubating`)
 - [Examples](getting-started/examples.html) (`0.3.1-SNAPSHOT`)
+- [Editor templates](getting-started/editor-templates.html)
 - [Cheat Sheet](getting-started/cheat-sheet.html)
 - [Icons](getting-started/icons.html)
 
@@ -30,11 +31,14 @@ Title: Documentation
 
 - [Common Use Cases](learning-more/common-use-cases.html)
 - [Presentations](learning-more/presentations.html)
-- [Isis Programming Model](learning-more/isis-programming-model.html)
+<!--
+- [Hexagonal Architecture](learning-more/hexagonal-architecture.html)
+-->
 - [Isis Reference 
Documentation](learning-more/isis-reference-documentation.html)
 - [Books](learning-more/books.html)
 - [Articles](learning-more/articles.html) [stub]
 - [Tutorials](learning-more/tutorials.html)
+- [Richard Pawson's Naked Objects 
thesis](learning-more/resources/Pawson-Naked-Objects-thesis.pdf)
 
 }
 

Modified: isis/site/trunk/content/download.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/download.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/download.md (original)
+++ isis/site/trunk/content/download.md Mon Dec 10 12:12:18 2012
@@ -6,8 +6,27 @@ Isis graduated from the Apache incubator
 
 In the meantime, you can download the Isis source code using:
 
-    git clone https://git.apache.org/isis.git
+<pre>
+git clone git://git.apache.org/isis.git
+</pre>
 
+or
+
+<pre>
+git clone http://git.apache.org/isis.git
+</pre>
+
+The code is also mirrored on [github](http://github.com/apache/isis), where 
you can browse it or fork it.   And if you're interested in contributing back 
to Isis, see [here](contributors/git-workflow.html).
+       
+### Committers
+
+Committers should use the read/write repo:
+
+<pre>
+https://git-wip-us.apache.org/repos/asf/isis.git
+</pre>
+
+You can browse the repo 
[here](https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary)
 
 ## Examples
 
@@ -15,4 +34,4 @@ There are some examples of running again
 
 ## Previous releases
 
-Our previous incubator release, 0.2.0-incubating, is still available from 
Maven central repo.  Easiest way to use that the [Quickstart 
Archetype](getting-started/quickstart-archetype.html).
+Our previous incubator release, 0.2.0-incubating, is still available from 
Maven central repo.  Easiest way to use that the [quickstart 
archetype](getting-started/quickstart-archetype.html).

Modified: isis/site/trunk/content/getting-started/about.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/about.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/about.md (original)
+++ isis/site/trunk/content/getting-started/about.md Mon Dec 10 12:12:18 2012
@@ -3,5 +3,6 @@ Title: Getting started
 - [Demo application](demo-app.html)
 - [Examples](examples.html)
 - [Quickstart archetype](quickstart-archetype.html)
+- [Editor templates](editor-templates.html)
 - [Cheat sheet](cheat-sheet.html)
 - [Icons](icons.html)

Modified: isis/site/trunk/content/getting-started/cheat-sheet.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/cheat-sheet.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/cheat-sheet.md (original)
+++ isis/site/trunk/content/getting-started/cheat-sheet.md Mon Dec 10 12:12:18 
2012
@@ -1,3 +1,3 @@
 Title: Cheat Sheet
 
-This [cheat sheet](resources/IsisCheatSheet.pdf) (pdf) summarises the main 
programming conventions to follow when writing an Isis application.
\ No newline at end of file
+The cheat sheet ([pdf](resources/IsisCheatSheet.pdf) 
[docx](resources/IsisCheatSheet.docx]) summarises the main programming 
conventions to follow when writing an Isis application.

Added: isis/site/trunk/content/getting-started/editor-templates.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/editor-templates.md?rev=1419364&view=auto
==============================================================================
--- isis/site/trunk/content/getting-started/editor-templates.md (added)
+++ isis/site/trunk/content/getting-started/editor-templates.md Mon Dec 10 
12:12:18 2012
@@ -0,0 +1,11 @@
+Title: Editor Templates
+
+The following Java editor templates (for Eclipse) provide snippets to speed up 
w
+riting domain objects and unit testing:
+
+- `Windows > Preferences > Java > Editor > Templates`
+  - [Isis domain object snippets](resources/isis-templates.xml)
+  - [JUnit snippets](resources/junit4-templates.xml)
+  - [JMock templates](resources/jmock2-templates.xml)
+
+

Modified: isis/site/trunk/content/getting-started/examples.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/examples.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/examples.md (original)
+++ isis/site/trunk/content/getting-started/examples.md Mon Dec 10 12:12:18 2012
@@ -4,7 +4,7 @@ The following examples are zipped-up ver
 
 * if you've built Isis from the source code, then these examples will run 
against your local cached Isis modules
 
-* If you **haven't** built Isis from source code, then these examples will 
pull down the current snapshots on the [Apache snapshot 
repo](https://repository.apache.org/index.html).
+* If you **haven't** built Isis from source code, then these examples will 
pull down the current snapshots from the [ASF's Nexus 
repo](https://repository.apache.org/index.html).
 
 In both cases the domain object model is a very simple todo application.  No 
prizes for originality there, but we wanted a one domain class that you could 
easily refactor for your own purposes.
 
@@ -38,9 +38,13 @@ cd viewer-restfulobjects
 mvn antrun:run
 </pre>
 
+If you are prompted for user/password, then you can use `sven:pass`.  This is 
one of the accounts configured for the [file-based 
security](../components/security/file/about.html); see the 
`authentication_file.passwd` file in `src/main/webapp/WEB-INF` directory.
+
 ### DnD/Junit/BDD (Concordion)
 
-This example demonstrates the use of domain object testing using the [junit 
viewer](../components/viewers/junit/about.html), BDD-style testing using the 
[BDD viewer](../components/viewers/bdd/about.html), as well as using the [DnD 
viewer](../components/viewers/dnd/about.html) to explore the domain model.  The 
viewers are configured to use the [in-memory 
objectstore](../components/objectstores/inmemory/about.html), so changes are 
never persisted between runs.
+This example demonstrates the use of domain object testing using the [junit 
viewer](../components/viewers/junit/about.html), and BDD-style testing using 
the [BDD viewer](../components/viewers/bdd/about.html).  It alsoconfigures the 
[DnD viewer](../components/viewers/dnd/about.html) to explore the domain model.
+
+Each of these viewers are configured to use the [in-memory 
objectstore](../components/objectstores/inmemory/about.html), so changes are 
never persisted between runs.  They all share the configuration defined in the 
DnD viewer's `config` directory.
 
 To build the example:
 

Modified: isis/site/trunk/content/getting-started/icons.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/icons.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/icons.md (original)
+++ isis/site/trunk/content/getting-started/icons.md Mon Dec 10 12:12:18 2012
@@ -4,3 +4,11 @@ Most Isis viewers use icons to help iden
 
 Currently our [icon sets](http://incubator.apache.org/isis/icons.html) are 
available from our original incubator website.   We will move the content here 
when that site is decommissioned.
 
+
+<!--
+## Third Party Icon Sets
+
+You might also want to explore these additional icon sets.  We believe they 
can be used freely in your applications, but please do double check their 
licensing first:
+
+* 
+-->
\ No newline at end of file

Added: isis/site/trunk/content/getting-started/resources/IsisCheatSheet.docx
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/resources/IsisCheatSheet.docx?rev=1419364&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
isis/site/trunk/content/getting-started/resources/IsisCheatSheet.docx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: isis/site/trunk/content/learning-more/about.md
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/learning-more/about.md?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/learning-more/about.md (original)
+++ isis/site/trunk/content/learning-more/about.md Mon Dec 10 12:12:18 2012
@@ -2,9 +2,11 @@ Title: Learning More
 
 - [Common Use Cases](common-use-cases.html)
 - [Presentations](presentations.html)
-- [Isis Programming Model](isis-programming-model.html)
-- [Isis Reference Documentation](isis-reference-documentation.html)
+<!--
+- [Hexagonal Architecture](hexagonal-architecture.html)
+-->
 - [Books](books.html)
 - [Articles](articles.html)
 - [Tutorials](tutorials.html)
 - [Integration Testing](integtest.html)
+- [Richard Pawson's Naked Objects 
thesis](resources/Pawson-Naked-Objects-thesis.pdf)

Copied: isis/site/trunk/content/learning-more/hexagonal-architecture.md (from 
r1416378, isis/site/trunk/content/learning-more/isis-programming-model.md)
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/learning-more/hexagonal-architecture.md?p2=isis/site/trunk/content/learning-more/hexagonal-architecture.md&p1=isis/site/trunk/content/learning-more/isis-programming-model.md&r1=1416378&r2=1419364&rev=1419364&view=diff
==============================================================================
--- isis/site/trunk/content/learning-more/isis-programming-model.md (original)
+++ isis/site/trunk/content/learning-more/hexagonal-architecture.md Mon Dec 10 
12:12:18 2012
@@ -1,7 +1,9 @@
-Title: Isis Programming Model
+Title: Hexagonal Architecture
 
-Apache Isis works using convention-over-configuration; you write your domain 
objects following a set of conventions, and these are interpreted by the 
framework in order to render, persist, remote or otherwise interact with your 
domain model.
+<!--
 
-These conventions are together known as the Apache Isis Programming Model. The 
Apache Isis Application Library - or AppLib - constitutes those elements of the 
programming model that are declarative (such as annotations and interfaces). It 
also contains the DomainObjectContainer interface, which is normally injected 
into your domain objects and represents the only point of coupling from your 
domain into the framework.
 
-See the AppLib guide 
([HTML](http://incubator.apache.org/isis/applib/docbkx/html/guide/isis-applib.html)
 or [PDF](http://incubator.apache.org/isis/applib/docbkx/pdf/isis-applib.pdf)) 
for further details.  (These resources are currently on our priginal incubator 
website.  We will move the content here when that site is decommissioned.
+x-rf the architecture picture, 
+to explain how the docs below fit together...
+
+-->

Added: 
isis/site/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf?rev=1419364&view=auto
==============================================================================
Files 
isis/site/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf 
(added) and 
isis/site/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf 
Mon Dec 10 12:12:18 2012 differ

Modified: isis/site/trunk/templates/isis-template.html
URL: 
http://svn.apache.org/viewvc/isis/site/trunk/templates/isis-template.html?rev=1419364&r1=1419363&r2=1419364&view=diff
==============================================================================
--- isis/site/trunk/templates/isis-template.html (original)
+++ isis/site/trunk/templates/isis-template.html Mon Dec 10 12:12:18 2012
@@ -61,7 +61,7 @@
           border: 1px;
           border-style: solid;
         }
-        .stub {
+        .stub,note {
             position: relative;
             padding: 7px 15px;
             margin-bottom: 18px;


Reply via email to