Author: buildbot
Date: Mon Nov 26 17:09:50 2012
New Revision: 839632
Log:
Staging update by buildbot for isis
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/getting-started/icons.html
websites/staging/isis/trunk/content/learning-more/isis-programming-model.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov 26 17:09:50 2012
@@ -1 +1 @@
-1413726
+1413728
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov 26 17:09:50 2012
@@ -1 +1 @@
-1413726
+1413728
Modified: websites/staging/isis/trunk/content/getting-started/icons.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/icons.html (original)
+++ websites/staging/isis/trunk/content/getting-started/icons.html Mon Nov 26
17:09:50 2012
@@ -190,7 +190,7 @@
<p>Most Isis viewers use icons to help identify domain objects in the user
interface. It's a good idea to ensure that these are styled consistently. To
get you started, we provide a number of icon sets, and reference a few others
freely available.</p>
-<p>Currently our <a href="http://incubator.apache.org/isis/icons.html";>icon
sets</a> are available from our original incubator website. We will move this
content when that site is decommissioned.</p>
+<p>Currently our <a href="http://incubator.apache.org/isis/icons.html";>icon
sets</a> are available from our original incubator website. We will move the
content here when that site is decommissioned.</p>
Modified:
websites/staging/isis/trunk/content/learning-more/isis-programming-model.html
==============================================================================
---
websites/staging/isis/trunk/content/learning-more/isis-programming-model.html
(original)
+++
websites/staging/isis/trunk/content/learning-more/isis-programming-model.html
Mon Nov 26 17:09:50 2012
@@ -188,13 +188,11 @@
</h1>
</div>
-<p><div class="stub">
-This page is a stub.
-</div></p>
+<p>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.</p>
-<p>Isis graduated from the Apache incubator in October 2012; we are currently
setting ourselves up as a top-level project.</p>
+<p>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.</p>
-<p>In the meantime you can access our original incubator website <a
href="http://incubator.apache.org/isis"; title="Apache Isis (incubator
website)">here</a>.</p>
+<p>See the AppLib guide (HTML or PDF) for further details. (These resources
are currently on our priginal incubator website. We will move the content here
when that site is decommissioned.</p>
