You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2012/12/10 13:13:16 UTC
svn commit: r841392 [1/2] - in /websites/staging/isis/trunk: cgi-bin/
content/ content/components/ content/components/objectstores/
content/components/objectstores/inmemory/
content/components/objectstores/jdo/ content/components/objectstores/nosql/
co...
Author: buildbot
Date: Mon Dec 10 12:13:05 2012
New Revision: 841392
Log:
Staging update by buildbot for isis
Added:
websites/staging/isis/trunk/content/contributors/resources/
websites/staging/isis/trunk/content/contributors/resources/Apache-Isis-code-style-cleanup.xml (with props)
websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-formatting.xml (with props)
websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-template.xml (with props)
websites/staging/isis/trunk/content/contributors/resources/isis-templates.xml (with props)
websites/staging/isis/trunk/content/contributors/resources/isis.importorder
websites/staging/isis/trunk/content/contributors/resources/jmock2-templates.xml (with props)
websites/staging/isis/trunk/content/contributors/resources/junit4-templates.xml (with props)
websites/staging/isis/trunk/content/getting-started/editor-templates.html
websites/staging/isis/trunk/content/getting-started/resources/IsisCheatSheet.docx (with props)
websites/staging/isis/trunk/content/learning-more/hexagonal-architecture.html
websites/staging/isis/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf (with props)
Removed:
websites/staging/isis/trunk/content/learning-more/isis-programming-model.html
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/components/about.html
websites/staging/isis/trunk/content/components/objectstores/about.html
websites/staging/isis/trunk/content/components/objectstores/inmemory/about.html
websites/staging/isis/trunk/content/components/objectstores/jdo/about.html
websites/staging/isis/trunk/content/components/objectstores/jdo/hints-and-tips.html
websites/staging/isis/trunk/content/components/objectstores/nosql/about.html
websites/staging/isis/trunk/content/components/objectstores/sql/about.html
websites/staging/isis/trunk/content/components/objectstores/xml/about.html
websites/staging/isis/trunk/content/components/profilestores/about.html
websites/staging/isis/trunk/content/components/profilestores/inmemory/about.html
websites/staging/isis/trunk/content/components/profilestores/sql/about.html
websites/staging/isis/trunk/content/components/profilestores/xml/about.html
websites/staging/isis/trunk/content/components/progmodels/about.html
websites/staging/isis/trunk/content/components/progmodels/groovy/about.html
websites/staging/isis/trunk/content/components/progmodels/wrapper/about.html
websites/staging/isis/trunk/content/components/security/about.html
websites/staging/isis/trunk/content/components/security/file/about.html
websites/staging/isis/trunk/content/components/security/ldap/about.html
websites/staging/isis/trunk/content/components/security/noop/about.html
websites/staging/isis/trunk/content/components/security/sql/about.html
websites/staging/isis/trunk/content/components/viewers/about.html
websites/staging/isis/trunk/content/components/viewers/bdd/about.html
websites/staging/isis/trunk/content/components/viewers/dnd/about.html
websites/staging/isis/trunk/content/components/viewers/html/about.html
websites/staging/isis/trunk/content/components/viewers/junit/about.html
websites/staging/isis/trunk/content/components/viewers/restfulobjects/about.html
websites/staging/isis/trunk/content/components/viewers/scimpi/about.html
websites/staging/isis/trunk/content/components/viewers/wicket/about.html
websites/staging/isis/trunk/content/contributors/about.html
websites/staging/isis/trunk/content/contributors/coding-conventions.html
websites/staging/isis/trunk/content/contributors/git-workflow.html
websites/staging/isis/trunk/content/contributors/key-generation.html
websites/staging/isis/trunk/content/contributors/release-process-rat-exclusions.html
websites/staging/isis/trunk/content/contributors/release-process.html
websites/staging/isis/trunk/content/contributors/release-snapshot.html
websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html
websites/staging/isis/trunk/content/contributors/using-git.html
websites/staging/isis/trunk/content/core/about.html
websites/staging/isis/trunk/content/core/applib.html
websites/staging/isis/trunk/content/core/bytecode.html
websites/staging/isis/trunk/content/core/core.html
websites/staging/isis/trunk/content/core/integtestsupport.html
websites/staging/isis/trunk/content/core/runtime.html
websites/staging/isis/trunk/content/core/unittestsupport.html
websites/staging/isis/trunk/content/core/webserver.html
websites/staging/isis/trunk/content/documentation.html
websites/staging/isis/trunk/content/download.html
websites/staging/isis/trunk/content/getting-started/about.html
websites/staging/isis/trunk/content/getting-started/cheat-sheet.html
websites/staging/isis/trunk/content/getting-started/demo-app.html
websites/staging/isis/trunk/content/getting-started/examples.html
websites/staging/isis/trunk/content/getting-started/icons.html
websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
websites/staging/isis/trunk/content/index.html
websites/staging/isis/trunk/content/learning-more/about.html
websites/staging/isis/trunk/content/learning-more/articles.html
websites/staging/isis/trunk/content/learning-more/books.html
websites/staging/isis/trunk/content/learning-more/common-use-cases.html
websites/staging/isis/trunk/content/learning-more/isis-reference-documentation.html
websites/staging/isis/trunk/content/learning-more/presentations.html
websites/staging/isis/trunk/content/learning-more/tutorials.html
websites/staging/isis/trunk/content/other/about.html
websites/staging/isis/trunk/content/other/dsl.html
websites/staging/isis/trunk/content/other/eclipse-plugin.html
websites/staging/isis/trunk/content/other/maven-plugin.html
websites/staging/isis/trunk/content/support.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 12:13:05 2012
@@ -1 +1 @@
-1418827
+1419364
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 10 12:13:05 2012
@@ -1 +1 @@
-1418827
+1419364
Modified: websites/staging/isis/trunk/content/components/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/about.html (original)
+++ websites/staging/isis/trunk/content/components/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/inmemory/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/inmemory/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/inmemory/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/jdo/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/jdo/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/jdo/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/jdo/hints-and-tips.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/jdo/hints-and-tips.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/jdo/hints-and-tips.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/nosql/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/nosql/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/nosql/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/sql/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/sql/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/sql/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/objectstores/xml/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/objectstores/xml/about.html (original)
+++ websites/staging/isis/trunk/content/components/objectstores/xml/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/profilestores/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/profilestores/about.html (original)
+++ websites/staging/isis/trunk/content/components/profilestores/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/profilestores/inmemory/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/profilestores/inmemory/about.html (original)
+++ websites/staging/isis/trunk/content/components/profilestores/inmemory/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/profilestores/sql/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/profilestores/sql/about.html (original)
+++ websites/staging/isis/trunk/content/components/profilestores/sql/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/profilestores/xml/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/profilestores/xml/about.html (original)
+++ websites/staging/isis/trunk/content/components/profilestores/xml/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/progmodels/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/progmodels/about.html (original)
+++ websites/staging/isis/trunk/content/components/progmodels/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/progmodels/groovy/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/progmodels/groovy/about.html (original)
+++ websites/staging/isis/trunk/content/components/progmodels/groovy/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/progmodels/wrapper/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/progmodels/wrapper/about.html (original)
+++ websites/staging/isis/trunk/content/components/progmodels/wrapper/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/security/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/about.html (original)
+++ websites/staging/isis/trunk/content/components/security/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/security/file/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/file/about.html (original)
+++ websites/staging/isis/trunk/content/components/security/file/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/security/ldap/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/ldap/about.html (original)
+++ websites/staging/isis/trunk/content/components/security/ldap/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/security/noop/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/noop/about.html (original)
+++ websites/staging/isis/trunk/content/components/security/noop/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/security/sql/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/sql/about.html (original)
+++ websites/staging/isis/trunk/content/components/security/sql/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/bdd/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/bdd/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/bdd/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/dnd/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/dnd/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/dnd/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/html/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/html/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/html/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/junit/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/junit/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/junit/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/restfulobjects/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/restfulobjects/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/restfulobjects/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/scimpi/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/scimpi/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/scimpi/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/components/viewers/wicket/about.html
==============================================================================
--- websites/staging/isis/trunk/content/components/viewers/wicket/about.html (original)
+++ websites/staging/isis/trunk/content/components/viewers/wicket/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/about.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/about.html (original)
+++ websites/staging/isis/trunk/content/contributors/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/coding-conventions.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/coding-conventions.html (original)
+++ websites/staging/isis/trunk/content/contributors/coding-conventions.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -184,29 +184,39 @@
</h1>
</div>
-<p><div class="stub">
-This page is a stub.
-</div></p>
-
-<p>Isis graduated from the Apache incubator in October 2012; we are currently setting ourselves up as a top-level project.</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>Code formatting (as documented in the <code>0.2.0-incubating</code> version of the contributors guide):</p>
+<p>Code should be formatted using the following Eclipse templates:</p>
<ul>
-<li>code formatting should be checked as per sec.CodeStyleFormatter</li>
-<li>imports should be organized as per sec.ImportOrder</li>
-<li>cleanup should be performed as per sec.CodeStyleCleanup
-(this performs both code formatting and organizing imports)</li>
+<li><code>Windows > Preferences > Java > Code Style > Code Templates</code>
+<ul>
+<li>Import <a href="resources/Apache-code-style-template.xml">Apache-code-style-template.xml</a></li>
+</ul></li>
+<li><code>Windows > Preferences > Java > Code Style > Formatter</code>
+<ul>
+<li>Import <a href="resources/Apache-code-style-formatting.xml">Apache-code-style-formatting.xml</a></li>
+</ul></li>
+<li><code>Windows > Preferences > Java > Code Style > Organize Imports</code>
+<ul>
+<li>Import <a href="resources/isis.importorder">isis.importorder</a></li>
+</ul></li>
+<li><code>Windows > Preferences > Java > Code Style > Clean Up</code>
+<ul>
+<li>Import <a href="resources/Apache-Isis-code-style-cleanup.xml">Apache-Isis-code-style-cleanup.xml</a></li>
+<li>(this performs both code formatting and organizing imports)</li>
+</ul></li>
</ul>
+<p>In addition, you will probably want to import the Java editor templates, as described in the <a href="../getting-started/editor-templates.html">getting started</a> section.
+<!--
+TODO: to add from the original incubator website <a href="http://incubator.apache.org/isis" title="Apache Isis (incubator website)">here</a>.</p>
+
<p>In addition:</p>
<ul>
<li>checkstyle, as per sec.Checkstyle</li>
<li>PMD, as per sec.PMD</li>
-<li>findbugs, as per sec.FindBugs</li>
+<li>findbugs, as per sec.FindBugs
+--></li>
</ul>
Modified: websites/staging/isis/trunk/content/contributors/git-workflow.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/git-workflow.html (original)
+++ websites/staging/isis/trunk/content/contributors/git-workflow.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/key-generation.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/key-generation.html (original)
+++ websites/staging/isis/trunk/content/contributors/key-generation.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/release-process-rat-exclusions.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process-rat-exclusions.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process-rat-exclusions.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -188,12 +188,40 @@
This page is a work-in-progress.
</div></p>
-<p>Before starting off the release process it is essential to gain consensus on the isis-dev mailing list that this is the right time for a release and to agree its content. Allow at least a week for this discussion.</p>
+<p>Apache Isis consists of a number of separately releasable modules. Relative to the root of the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code repo</a>, these are:</p>
+
+<ul>
+<li><code>core</code></li>
+<li><code>component/objectstore/jdo</code></li>
+<li><code>component/objectstore/nosql</code></li>
+<li><code>component/objectstore/sql</code></li>
+<li><code>component/objectstore/xml</code></li>
+<li><code>component/security/ldap</code></li>
+<li><code>component/security/sql</code></li>
+<li><code>component/profilestore/sql</code></li>
+<li><code>component/profilestore/xml</code></li>
+<li><code>component/progmodel/groovy</code></li>
+<li><code>component/progmodel/wrapper</code></li>
+<li><code>component/viewer/bdd</code></li>
+<li><code>component/viewer/dnd</code></li>
+<li><code>component/viewer/html</code></li>
+<li><code>component/viewer/junit</code></li>
+<li><code>component/viewer/scimpi</code></li>
+<li><code>component/viewer/wicket</code></li>
+</ul>
+
+<p>All the non-core components depend on the <code>core</code>, and use the <code>core</code>'s parent <code>pom.xml</code> as their parent pom.</p>
+
+<h2>Process Prerequisites</h2>
+
+<p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p>
+
+<p>For non-<code>core</code> components, ensure that there is awareness on the dev mailing list that a release is to be cut. In particular, indicate the version of <code>core</code> that the component release will depend upon, and the version number to be used for the component's release.</p>
<p>Once agreed, the formal release can begin. The steps are:</p>
<ul>
-<li>create a branch to prepare the release</li>
+<li>create a branch locally in which to prepare the release</li>
<li>use <code>mvn release:prepare</code> to generate the signed artifacts and create a tag in the source code control system</li>
<li>use <code>mvn release:perform</code> to upload the signed artifacts to the Apache staging repository</li>
<li>vote on the staged artifacts (in particular, the signed source release ZIP from which the remaining artifacts are derivable)</li>
@@ -212,11 +240,28 @@ This page is a work-in-progress.
<p>Before any of this can happen, there are a number of prerequisites, in terms of (a) the codebase itself, (b) the community process, and (c) the contributor acting as release manager and performing the release.</p>
+<h3>Set up local environment</h3>
+
+<p>First, clear out your local Maven repo of any Isis artifacts:</p>
+
+<pre>
+cd ~/.m2/repository/org/apache
+mv isis isis-MOVED
+</pre>
+
+<p>Second, create a branch in your local Git repo:</p>
+
+<pre>
+git checkout -b release/x.y.z
+</pre>
+
+<p>All release preparation is done locally; when we are done, this branch will be pushed back to master.</p>
+
<h2>Code Prerequisites</h2>
<p>Before making any formal release, there are a number of prerequisites that should always be checked</p>
-<h3>Update Dependency Versions</h3>
+<h3>Update dependency versions</h3>
<p>First, check (via <a href="http://search.maven.org">http://search.maven.org</a>) whether there is a newer version of the Apache parent <code>org.apache:apache</code>. If so, update the <code><parent></code> element in Isis' own parent POM <code>org.apache.isis:isis</code>.</p>
@@ -231,177 +276,231 @@ grep "\->" /tmp/foo | sort -u
<h3>Sanity check</h3>
-<p>Next, perform a quick sanity check:</p>
+<p>First, clear out your local Maven repo of any Isis artifacts:</p>
-<ul>
-<li>builds ok</li>
-</ul>
+<pre>
+cd ~/.m2/repository/org/apache
+mv isis isis-MOVED
+</pre>
+
+<p>Next, check that the releasable module builds independently. For example, if releasing the <code>core</code> module, check that it builds:</p>
<pre>
+cd core
mvn clean install -o
</pre>
-<ul>
-<li>site builds ok</li>
-</ul>
+<p>Or, if you were building an objectstore, make sure that it builds independently:</p>
<pre>
-sh msdf.sh -o
+cd component/objectstore/jdo
+mvn clean install -o
</pre>
-<ul>
-<li>archetype is ok</p>
+<p><div class="note">
+All remaining steps should be performed in the base directory of the module being released.
+</div></p>
-<ul>
-<li>archetype runs ok</p>
+<!--
+- site builds ok
-<p>using <code>-D archetypeCatalog=local</code></li>
-<li>app generated from the archetype runs ok</li>
-</ul></li>
-</ul>
-<h3>Fix Line Endings</h3>
-<p>All Isis code should be saved with UNIX line endings; for contributors that use Windows, the <code>dos2unix</code> command should be used to convert line endings.</p>
+8daeb02ea775a67d739f8b27afce0e56
-<p><div class="note">
-When we move to git, this issue should be mitigated by git's default handling.
-</div></p>
-<p>In addition, the <code>svn:eol-style</code> property should be set to <code>native</code> and the <code>svn:mime-type</code> property should be set appropriately, as per this <a href="http://www.apache.org/dev/version-control.html#https-svn-config">Apache guidance</a>.</p>
-<p><div class="note">
-The move to git will need to reproduce this guidance somehow...
-</div></p>
-<p>Both line endings and Subversion properties can be set by running the provided script:</p>
-<pre>
-./fix-lineendings-and-svnprops.sh
-</pre>
+60f9fef3ce8fa7f4c9ac817ef6d43ba3
-<h3>Code Cleanup / Formatting</h3>
-<p>Make sure that all source code has been cleaned up and formatted according to the Apache Isis and ASF conventions. Full details are in <a href="coding-conventions.html">Isis coding conventions</a>.</p>
-<h2>License Notice (<code>RAT</code> tool)</h2>
-<p>The Apache Release Audit Tool <code>RAT</code> (from the <a href="http://creadur.apache.org">Apache Creadur</a> project) is designed to perform a number of basic checks, most significant being missing copyright header files.</p>
+74cd298b4ccd450e8e87b027b532ad2f
-<p>The Isis parent <code>pom.xml</code> specifies the RAT Maven plugin, with a number of <a href="release-process-rat-exclusions.html">custom exclusions</a>.</p>
-<p>To run the RAT tool, first clean up any generated artifacts:</p>
-<pre>
-mvn clean # clean up target directory
-mvn clean -P m2e # clean up target-ide directory
-</pre>
+Make sure that all source code has been cleaned up and formatted according to the Apache Isis and ASF conventions. Full details are in [Isis coding conventions](coding-conventions.html).
-<p>Then, run the tool using:</p>
-<pre>
-mvn org.apache.rat:apache-rat-plugin:check -D rat.num=50
-</pre>
-<p>where <code>rat.num</code> property is set to a high figure, temporarily overriding the default value of 0. (If this isn't overridden and there are licenses, then the command will simply fail).</p>
+f762b180b7af28fab242c26d0c5f48b8
-<p><div class="note">
-Do <em>not</em> use <code>mvn rat:check</code>; depending on your local Maven configuratoin this may bring down the obsolete mvn-rat-plugin from Codehaus repo.
-</div></p>
-<p>All being well the command should succeed. If it does not, then review the <code>rat.txt</code> files in the failing module's <code>target</code> directory. Missing license notes are indicated using the key <code>!???</code>. You can collate these together using something like:</p>
-<pre>
-for a in `find . -name rat.txt -print`; do grep '!???' $a; done
-</pre>
+The Apache Release Audit Tool `RAT` (from the [Apache Creadur](http://creadur.apache.org) project) checks for missing license header files.
-<p>Investigate and fix any reported violations.</p>
+The parent `pom.xml` of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.
-<p>You can use the groovy script <code>addmissinglicenses.groovy</code> to automatically insert missing headers</p>
+To run the RAT tool, use:
-<p>Dry run:</p>
-<pre>
-groovy addmissinglicenses.groovy
-</pre>
-<p>or actually execute:</p>
+9c6ea6ce5e449ec8111b32d6271f5131
-<pre>
-groovy addmissinglicenses.groovy -x
-</pre>
-<p>The actual files checked are those with extensions specified in the line:</p>
-<pre>
-def fileEndings = [".java", ".htm"]
-</pre>
+where `rat.numUnapprovedLicenses` property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one.
-<h2>Missing License Check</h2>
+<div class="note">
+Do *not* use `mvn rat:check`; depending on your local Maven configuratoin this may bring down the obsolete `mvn-rat-plugin` from Codehaus repo.
+</div>
-<p>Although Apache Isis has no dependencies which have incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated <code>DEPENDENCIES</code> file and generated Maven site indicating dependencies as having "unknown" licenses.</p>
+All being well the command should complete. For each failing submodule, it will have written out a `target\rat.txt`; missing license notes are indicated using the key `!???`. You can collate these together using something like:
-<p>Fortunately, Maven allows the missing information to be provided by configuring the <code>maven-remote-resources-plugin</code>. This is stored in the <code>src/main/appended-resources/supplemental-models.xml</code> file in the parent <code>[oai:isis]</code> module.</p>
-<p>To capture the missing license information, use:</p>
+34cc167261a1dd19efcf253f0f73de73
-<pre>
-mvn license:download-licenses
-</pre>
-<p>This Maven plugin creates a <code>licensexml</code> file in the <code>target/generated-resources</code> directory of each module.</p>
-<p>Then, run the Isis script:</p>
+Investigate and fix any reported violations, typically by either:
-<pre>
-groovy checkmissinglicenses.groovy
-</pre>
-<p>This searches for all <code>licenses.xml</code> files, and compares them against the contents of the <code>supplemental-models.xml</code> file. For example, the output could be something like:</p>
-<pre>
-licenses to add to supplemental-models.xml:
+d9f0f52c516be130c53e93535bd5980f
-[org.slf4j, slf4j-api, 1.5.7]
-[org.codehaus.groovy, groovy-all, 1.7.2]
+To add missing headers, you can if you wish use the groovy script `addmissinglicenses.groovy` to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line `def fileEndings = [".java", ".htm"]`:
-licenses to remove from supplemental-models.xml (are spurious):
-[org.slf4j, slf4j-api, 1.5.2]
-</pre>
-<p>If any missing entries are listed or are spurious, then update <code>supplemental-models.xml</code> and try again.</p>
+93bfa782cabaac71742021050c9e50cc
-<p><div class="note">
-Ignore any missing license warnings for the TCK modules; this is a result of the TCK modules for the viewers (eg <code>bdd-concordion-tck</code>) depending on the TCK dom, fixtures etc.
-</div></p>
-<h2>JIRA Prerequisites</h2>
+b460e06e4a17f240d0e761b506f13641
+
+
+
+
+
+ed32a4e87365839d451b6b0cf3c405b5
+
+
+1896300a163310f827c151fb370939d7
+
+
+
+Once you've fixed all issues, confirm once more that `apache-rat-plugin` no longer reports any license violations, this time leaving the `rat.numUnapprovedLicenses` property to its default, 0:
+
+
+
+22d5ba6e4d30d5dd07a4fea7734c70c0
+
+
+
+
+
+
+6148a0ccbf70a2dc3ec77678ce7d1b13
+
+
+
+Although Apache Isis has no dependencies which have incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated `DEPENDENCIES` file and generated Maven site indicating dependencies as having "unknown" licenses.
+
+Fortunately, Maven allows the missing information to be provided by configuring the `maven-remote-resources-plugin`. This is stored in the `src/main/appended-resources/supplemental-models.xml` file in the parent `[oai:isis]` module.
+
+To capture the missing license information, use:
+
+
+
+8c71e43fd0463059c7b0fc3acaf5adca
+
+
+
+This Maven plugin creates a `licensexml` file in the `target/generated-resources` directory of each module.
+
+Then, run the following script (shown here relative to the `core` module).
+
+
+
+417bbfc3142d352bf5241ba1acaae3c9
+
+
+
+This searches for all `licenses.xml` files, and compares them against the contents of the `supplemental-models.xml` file. For example, the output could be something like:
+
+
+
+87975db852b62990bd1a4becc1a32fcf
+
+
+
+If any missing entries are listed or are spurious, then update `supplemental-models.xml` and try again.
+
+<div class="note">
+Ignore any missing license warnings for the TCK modules; this is a result of the TCK modules for the viewers (eg `bdd-concordion-tck`) depending on the TCK dom, fixtures etc.
+</div>
+
+
+
+
+ffda6510d6461f9b86dee513a96bdf4e
+
+
+
+In order to prepare a release, you must have a public/private key pair, and have configured Maven. See the page on [key generation](key-generation.html) for more details.
+
+<div class="note">
+... in progress ...
+</div>
+
+
+
+c423b6c57f2041040d02abccfc2311ee
+
+
+
+
+
+
+
+
+0cbfdf1a807891dadd49110917377fea
+
+
+
+
+
+8163c884bbeef87b4ce6775aa603b3bd
+
+
+
+All JIRA tickets for the release should be closed, or moved to future releases if not yet addressed.
+
+
+
+e0f6a94b3e339b1123b033c2565ffb69
+
+
+
+For the completed release, use JIRA to generate release notes using the procedure documented [here](http://confluence.atlassian.com/display/JIRA/Creating+Release+Notes). If any of the tickets closed are tasks/subtasks, then please edit the contents of the file to associate them back together again.
+
+Then, update the appropriate section of the CMS site:
+
+
+
+bdca17d6020c21a5dbabfbc9c140ca8f
+
-<h3>Close All JIRA tickets for the release</h3>
-<p>All JIRA tickets for the release should be closed, or moved to future releases if not yet addressed.</p>
-<h3>Generate Release Notes</h3>
+a5d4ee3b87b68e98b3a01ddfe2f28406
-<p>Each release should have a release note page called <code>release-x.x.x.html</code>, in <code>src/site/resources</code> (in <code>[oai:isis]</code> parent module). This is linked to from the download page (<code>src/site/apt/downloads.apt.vm</code>); the download page should not need updating.</p>
-<p>The release notes can be generated using JIRA, using the procedure documented <a href="http://confluence.atlassian.com/display/JIRA/Creating+Release+Notes">here</a>. If any of the tickets closed are tasks/subtasks, then please edit the contents of the file to associate them back together again.</p>
-<h3>Update STATUS file</h3>
+The trunk holds a [STATUS](https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=blob_plain;f=STATUS;hb=HEAD) file which is a brief summary of the current status of the project. Update this file with details of the release.
-<p>The trunk holds a <code>STATUS</code> file which is a brief summary of the current status of the project. Update this file prior to cutting the release.</p>
+<!--
+DEFUNCT
-<h3>Update downloads.apt.vm</h3>
-<p>The website's <code>src/site/apt/downloads.apt.vm</code> file lists (what will be) the current release, along with any archived releases. Update this to reflect how things will be once the release is complete.</p>
+8b3157882ae803c85a3af0dcacfbb4be
-<h2>Preparing a Release (<code>mvn release:prepare</code>)</h2>
-<p>In order to prepare a release, you must have a public/private key pair, and have configured Maven. See the page on <a href="key-generation.html">key generation</a> for more details.</p>
-<p>... in progress ...</p>
+The website's `src/site/apt/downloads.apt.vm` file lists (what will be) the current release, along with any archived releases. Update this to reflect how things will be once the release is complete.
+-->
Modified: websites/staging/isis/trunk/content/contributors/release-snapshot.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-snapshot.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-snapshot.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Added: websites/staging/isis/trunk/content/contributors/resources/Apache-Isis-code-style-cleanup.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/Apache-Isis-code-style-cleanup.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-formatting.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-formatting.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-template.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/Apache-code-style-template.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: websites/staging/isis/trunk/content/contributors/resources/isis-templates.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/isis-templates.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: websites/staging/isis/trunk/content/contributors/resources/isis.importorder
==============================================================================
--- websites/staging/isis/trunk/content/contributors/resources/isis.importorder (added)
+++ websites/staging/isis/trunk/content/contributors/resources/isis.importorder Mon Dec 10 12:13:05 2012
@@ -0,0 +1,7 @@
+#Organize Import Order
+#Wed Dec 15 15:36:51 GMT 2010
+0=java
+1=javax
+2=com
+3=org
+4=org.apache.isis
Added: websites/staging/isis/trunk/content/contributors/resources/jmock2-templates.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/jmock2-templates.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: websites/staging/isis/trunk/content/contributors/resources/junit4-templates.xml
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/junit4-templates.xml
------------------------------------------------------------------------------
svn:mime-type = application/xml
Modified: websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html (original)
+++ websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/contributors/using-git.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/using-git.html (original)
+++ websites/staging/isis/trunk/content/contributors/using-git.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/about.html
==============================================================================
--- websites/staging/isis/trunk/content/core/about.html (original)
+++ websites/staging/isis/trunk/content/core/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/applib.html
==============================================================================
--- websites/staging/isis/trunk/content/core/applib.html (original)
+++ websites/staging/isis/trunk/content/core/applib.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -184,13 +184,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 <code>DomainObjectContainer</code> 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 programming guide (<a href="http://incubator.apache.org/isis/applib/docbkx/html/guide/isis-applib.html">HTML</a> or <a href="http://incubator.apache.org/isis/applib/docbkx/pdf/isis-applib.pdf">PDF</a>) for further details.</p>
Modified: websites/staging/isis/trunk/content/core/bytecode.html
==============================================================================
--- websites/staging/isis/trunk/content/core/bytecode.html (original)
+++ websites/staging/isis/trunk/content/core/bytecode.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/core.html
==============================================================================
--- websites/staging/isis/trunk/content/core/core.html (original)
+++ websites/staging/isis/trunk/content/core/core.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/integtestsupport.html
==============================================================================
--- websites/staging/isis/trunk/content/core/integtestsupport.html (original)
+++ websites/staging/isis/trunk/content/core/integtestsupport.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/runtime.html
==============================================================================
--- websites/staging/isis/trunk/content/core/runtime.html (original)
+++ websites/staging/isis/trunk/content/core/runtime.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -192,6 +192,36 @@ This page is a stub.
<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>
+<!--
+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:
+
+
+
+c8fab297c59dbb67687caf0ed15c5a10
+
+
+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:
+
+
+
+fc315c2f4976a413511d6d5717be830b
+
+
+-->
+
</div>
Modified: websites/staging/isis/trunk/content/core/unittestsupport.html
==============================================================================
--- websites/staging/isis/trunk/content/core/unittestsupport.html (original)
+++ websites/staging/isis/trunk/content/core/unittestsupport.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/core/webserver.html
==============================================================================
--- websites/staging/isis/trunk/content/core/webserver.html (original)
+++ websites/staging/isis/trunk/content/core/webserver.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -193,6 +193,7 @@
<ul>
<li><a href="getting-started/demo-app.html">Demo App</a> (<code>0.2.0-incubating</code>)</li>
<li><a href="getting-started/examples.html">Examples</a> (<code>0.3.1-SNAPSHOT</code>)</li>
+<li><a href="getting-started/editor-templates.html">Editor templates</a></li>
<li><a href="getting-started/cheat-sheet.html">Cheat Sheet</a></li>
<li><a href="getting-started/icons.html">Icons</a></li>
</ul>
@@ -214,12 +215,15 @@
<ul>
<li><a href="learning-more/common-use-cases.html">Common Use Cases</a></li>
-<li><a href="learning-more/presentations.html">Presentations</a></li>
-<li><a href="learning-more/isis-programming-model.html">Isis Programming Model</a></li>
+<li><a href="learning-more/presentations.html">Presentations</a>
+<!--</li>
+<li><a href="learning-more/hexagonal-architecture.html">Hexagonal Architecture</a>
+--></li>
<li><a href="learning-more/isis-reference-documentation.html">Isis Reference Documentation</a></li>
<li><a href="learning-more/books.html">Books</a></li>
<li><a href="learning-more/articles.html">Articles</a> [stub]</li>
-<li><a href="learning-more/tutorials.html">Tutorials</a>
+<li><a href="learning-more/tutorials.html">Tutorials</a></li>
+<li><a href="learning-more/resources/Pawson-Naked-Objects-thesis.pdf">Richard Pawson's Naked Objects thesis</a>
</div>
<div class="span-one-third"></li>
</ul>
Modified: websites/staging/isis/trunk/content/download.html
==============================================================================
--- websites/staging/isis/trunk/content/download.html (original)
+++ websites/staging/isis/trunk/content/download.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -190,8 +190,27 @@
<p>In the meantime, you can download the Isis source code using:</p>
-<pre><code>git clone https://git.apache.org/isis.git
-</code></pre>
+<pre>
+git clone git://git.apache.org/isis.git
+</pre>
+
+<p>or</p>
+
+<pre>
+git clone http://git.apache.org/isis.git
+</pre>
+
+<p>The code is also mirrored on <a href="http://github.com/apache/isis">github</a>, where you can browse it or fork it. And if you're interested in contributing back to Isis, see <a href="contributors/git-workflow.html">here</a>.</p>
+
+<h3>Committers</h3>
+
+<p>Committers should use the read/write repo:</p>
+
+<pre>
+https://git-wip-us.apache.org/repos/asf/isis.git
+</pre>
+
+<p>You can browse the repo <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">here</a></p>
<h2>Examples</h2>
@@ -199,7 +218,7 @@
<h2>Previous releases</h2>
-<p>Our previous incubator release, 0.2.0-incubating, is still available from Maven central repo. Easiest way to use that the <a href="getting-started/quickstart-archetype.html">Quickstart Archetype</a>.</p>
+<p>Our previous incubator release, 0.2.0-incubating, is still available from Maven central repo. Easiest way to use that the <a href="getting-started/quickstart-archetype.html">quickstart archetype</a>.</p>
Modified: websites/staging/isis/trunk/content/getting-started/about.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/about.html (original)
+++ websites/staging/isis/trunk/content/getting-started/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -188,6 +188,7 @@
<li><a href="demo-app.html">Demo application</a></li>
<li><a href="examples.html">Examples</a></li>
<li><a href="quickstart-archetype.html">Quickstart archetype</a></li>
+<li><a href="editor-templates.html">Editor templates</a></li>
<li><a href="cheat-sheet.html">Cheat sheet</a></li>
<li><a href="icons.html">Icons</a></li>
</ul>
Modified: websites/staging/isis/trunk/content/getting-started/cheat-sheet.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/cheat-sheet.html (original)
+++ websites/staging/isis/trunk/content/getting-started/cheat-sheet.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -184,7 +184,7 @@
</h1>
</div>
-<p>This <a href="resources/IsisCheatSheet.pdf">cheat sheet</a> (pdf) summarises the main programming conventions to follow when writing an Isis application.</p>
+<p>The cheat sheet (<a href="resources/IsisCheatSheet.pdf">pdf</a> <a href="resources/IsisCheatSheet.docx]">docx</a> summarises the main programming conventions to follow when writing an Isis application.</p>
Modified: websites/staging/isis/trunk/content/getting-started/demo-app.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/demo-app.html (original)
+++ websites/staging/isis/trunk/content/getting-started/demo-app.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Added: websites/staging/isis/trunk/content/getting-started/editor-templates.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/editor-templates.html (added)
+++ websites/staging/isis/trunk/content/getting-started/editor-templates.html Mon Dec 10 12:13:05 2012
@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+
+ <meta charset="utf-8">
+ <title>Editor Templates
</title>
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le styles -->
+ <link href="./../bootstrap.css" rel="stylesheet">
+ <link href="./../prettify.css" rel="stylesheet">
+ <link href="./../bootstrap-mods.css" rel="stylesheet">
+
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ }
+ .sprite {
+ display: inline-block;
+ height: 20px;
+ margin: 0 auto 4px;
+ outline: medium none;
+ text-indent: -999em;
+ width: 24px;
+ background-image: url('./../images/sprites.png');
+ background-repeat: no-repeat;
+ overflow: hidden;
+ cursor: pointer;
+ }
+ .edit-page {
+ display: inline-block;
+ height: 20px;
+ margin: 0 auto 4px;
+ outline: medium none;
+ text-indent: -999em;
+ width: 24px;
+ background-image: url('./../images/edit.png');
+ background-repeat: no-repeat;
+ overflow: hidden;
+ cursor: pointer;
+ }
+ .fb-share {
+ background-position: 0px -40px;
+ }
+ .gp-share {
+ background-position: 0px 0px;
+ }
+ .tw-share {
+ background-position: 0px -80px;
+ }
+ .markdown-content {
+ min-height: 500px;
+ }
+ .book-image img {
+ border: 1px;
+ border-style: solid;
+ }
+ .stub,note {
+ position: relative;
+ padding: 7px 15px;
+ margin-bottom: 18px;
+ color: #404040;
+ background-color: #eedc94;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+ background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+ background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+ background-image: linear-gradient(top, #fceec1, #eedc94);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #eedc94 #eedc94 #e4c652;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ border-width: 1px;
+ border-style: solid;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ }
+ </style>
+ <script type="text/javascript">
+ function fbshare () {
+ window.open(
+ "http://www.facebook.com/sharer/sharer.php?u="+document.URL,
+ 'Share on Facebook',
+ 'width=640,height=426');
+ };
+ function gpshare () {
+ window.open(
+ "https://plus.google.com/share?url="+document.URL,
+ 'Share on Google+',
+ 'width=584,height=385');
+ };
+ function twshare () {
+ window.open(
+ "https://twitter.com/intent/tweet?url="+document.URL+"&text=Editor Templates
",
+ 'Share on Twitter',
+ 'width=800,height=526');
+ };
+ </script>
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="./../images/favicon.ico">
+ <link rel="apple-touch-icon" href="./../images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="./../images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="./../images/apple-touch-icon-114x114.png">
+
+ <script src="./../javascript/prettify.js" type="text/javascript"></script>
+ <script src="./../javascript/jquery-latest.js"></script>
+ <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+ <script src="./../javascript/common.js"></script>
+ <script src="./../javascript/prettyprint.js"></script>
+
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-2717626-1']);
+ _gaq.push(['_setDomainName', 'apache.org']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+
+
+ </head>
+
+ <body>
+
+ <div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <a class="brand" href="./../index.html">Apache Isis</a>
+ <ul class="nav">
+ <li><a href="./../index.html">Home</a></li>
+ <li><a href="./../download.html">Download</a></li>
+ <li><a href="./../documentation.html">Documentation</a></li>
+ <li><a href="./../support.html">Support</a></li>
+ </ul>
+
+ <!-- Google CSE Search Box Begins -->
+ <div style="float: right; position: relative; ">
+ <form action="http://www.google.com/cse" id="cse-search-box" _lpchecked="1">
+ <div>
+ <input type="hidden" name="cx" value="001500763902520246267:purt3m54z98">
+ <input type="hidden" name="ie" value="UTF-8">
+ <input type="text" name="q" size="31" style="border: 1px solid rgb(126, 157, 185); padding: 2px; background-color: rgb(255, 255, 255); background-position: 0% 50%; background-repeat: no-repeat no-repeat;">
+ <input type="submit" name="sa" value="Search">
+ </div>
+ <input name="siteurl" type="hidden" value="incubator.apache.org/isis/">
+ <input name="ref" type="hidden" value="">
+ <input name="ss" type="hidden" value="677j458329j2">
+ </form>
+ </div>
+ <!-- Google CSE Search Box Ends -->
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+ <div class="markdown-content">
+
+
+<div class="page-header">
+<p><a href="./../documentation.html">Docs</a> » <a href="./../getting-started/about.html">Getting Started</a></p>
+<h1>Editor Templates
+
+</h1>
+</div>
+
+<p>The following Java editor templates (for Eclipse) provide snippets to speed up w
+riting domain objects and unit testing:</p>
+
+<ul>
+<li><code>Windows > Preferences > Java > Editor > Templates</code>
+<ul>
+<li><a href="resources/isis-templates.xml">Isis domain object snippets</a></li>
+<li><a href="resources/junit4-templates.xml">JUnit snippets</a></li>
+<li><a href="resources/jmock2-templates.xml">JMock templates</a></li>
+</ul></li>
+</ul>
+
+
+
+ </div>
+
+ <div id="edit" class="modal hide fade in" style="display: none; ">
+ <div class="modal-header">
+ <a class="close" data-dismiss="modal">x</a>
+
+ <h3>Thank you for contributing to the documention!</h3>
+ </div>
+ <div class="modal-body">
+ <h4>Any help with the documentation is greatly appreciated.</h4>
+ <p>All edits are reviewed before going live, so feel free to do much more than fix typos or links. If you see a page that could benefit from an entire rewrite, we'd be thrilled to review it. Don't be surprised if we like it so much we ask you for help with other pages :)</p>
+ <small>NOTICE: unless indicated otherwise on the pages in question, all editable content available from apache.org is presumed to be licensed under the Apache License (AL) version 2.0 and hence all submissions to apache.org treated as formal Contributions under the license terms.</small>
+ <!--[if gt IE 6]>
+ <h4>Internet Explorer Users</h4>
+ <p>If you are not an Apache committer, click the Yes link and enter a <i>anonymous</i> for the username and leave the password empty</p>
+ <![endif]-->
+
+ </div>
+ <div class="modal-footer">
+ Do you have an Apache ID?
+ <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))" class="btn">Yes</a>
+ <a href="javascript:void(location.href='https://anonymous:@cms.apache.org/redirect?uri='+escape(location.href))" class="btn">No</a>
+ </div>
+ </div>
+ <script src="./../javascript/bootstrap-modal.js"></script>
+
+ <footer>
+ <p>
+ Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ <br/>
+ Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+ </p>
+ </footer>
+
+ </div> <!-- /container -->
+
+ </body>
+</html>
Modified: websites/staging/isis/trunk/content/getting-started/examples.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/examples.html (original)
+++ websites/staging/isis/trunk/content/getting-started/examples.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -188,7 +188,7 @@
<ul>
<li>if you've built Isis from the source code, then these examples will run against your local cached Isis modules</li>
-<li>If you <strong>haven't</strong> built Isis from source code, then these examples will pull down the current snapshots on the <a href="https://repository.apache.org/index.html">Apache snapshot repo</a>.</li>
+<li>If you <strong>haven't</strong> built Isis from source code, then these examples will pull down the current snapshots from the <a href="https://repository.apache.org/index.html">ASF's Nexus repo</a>.</li>
</ul>
<p>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.</p>
@@ -226,9 +226,13 @@ cd viewer-restfulobjects
mvn antrun:run
</pre>
+<p>If you are prompted for user/password, then you can use <code>sven:pass</code>. This is one of the accounts configured for the <a href="../components/security/file/about.html">file-based security</a>; see the <code>authentication_file.passwd</code> file in <code>src/main/webapp/WEB-INF</code> directory.</p>
+
<h3>DnD/Junit/BDD (Concordion)</h3>
-<p>This example demonstrates the use of domain object testing using the <a href="../components/viewers/junit/about.html">junit viewer</a>, BDD-style testing using the <a href="../components/viewers/bdd/about.html">BDD viewer</a>, as well as using the <a href="../components/viewers/dnd/about.html">DnD viewer</a> to explore the domain model. The viewers are configured to use the <a href="../components/objectstores/inmemory/about.html">in-memory objectstore</a>, so changes are never persisted between runs.</p>
+<p>This example demonstrates the use of domain object testing using the <a href="../components/viewers/junit/about.html">junit viewer</a>, and BDD-style testing using the <a href="../components/viewers/bdd/about.html">BDD viewer</a>. It alsoconfigures the <a href="../components/viewers/dnd/about.html">DnD viewer</a> to explore the domain model.</p>
+
+<p>Each of these viewers are configured to use the <a href="../components/objectstores/inmemory/about.html">in-memory objectstore</a>, so changes are never persisted between runs. They all share the configuration defined in the DnD viewer's <code>config</code> directory.</p>
<p>To build the example:</p>
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 Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -188,6 +188,17 @@
<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>
+<p><!--</p>
+
+<h2>Third Party Icon Sets</h2>
+
+<p>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:</p>
+
+<ul>
+<li>
+--></li>
+</ul>
+
</div>
Modified: websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html
==============================================================================
--- websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html (original)
+++ websites/staging/isis/trunk/content/getting-started/quickstart-archetype.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Added: websites/staging/isis/trunk/content/getting-started/resources/IsisCheatSheet.docx
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/getting-started/resources/IsisCheatSheet.docx
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified: websites/staging/isis/trunk/content/index.html
==============================================================================
--- websites/staging/isis/trunk/content/index.html (original)
+++ websites/staging/isis/trunk/content/index.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/learning-more/about.html
==============================================================================
--- websites/staging/isis/trunk/content/learning-more/about.html (original)
+++ websites/staging/isis/trunk/content/learning-more/about.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
@@ -186,13 +186,15 @@
<ul>
<li><a href="common-use-cases.html">Common Use Cases</a></li>
-<li><a href="presentations.html">Presentations</a></li>
-<li><a href="isis-programming-model.html">Isis Programming Model</a></li>
-<li><a href="isis-reference-documentation.html">Isis Reference Documentation</a></li>
+<li><a href="presentations.html">Presentations</a>
+<!--</li>
+<li><a href="hexagonal-architecture.html">Hexagonal Architecture</a>
+--></li>
<li><a href="books.html">Books</a></li>
<li><a href="articles.html">Articles</a></li>
<li><a href="tutorials.html">Tutorials</a></li>
<li><a href="integtest.html">Integration Testing</a></li>
+<li><a href="resources/Pawson-Naked-Objects-thesis.pdf">Richard Pawson's Naked Objects thesis</a></li>
</ul>
Modified: websites/staging/isis/trunk/content/learning-more/articles.html
==============================================================================
--- websites/staging/isis/trunk/content/learning-more/articles.html (original)
+++ websites/staging/isis/trunk/content/learning-more/articles.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/learning-more/books.html
==============================================================================
--- websites/staging/isis/trunk/content/learning-more/books.html (original)
+++ websites/staging/isis/trunk/content/learning-more/books.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;
Modified: websites/staging/isis/trunk/content/learning-more/common-use-cases.html
==============================================================================
--- websites/staging/isis/trunk/content/learning-more/common-use-cases.html (original)
+++ websites/staging/isis/trunk/content/learning-more/common-use-cases.html Mon Dec 10 12:13:05 2012
@@ -61,7 +61,7 @@
border: 1px;
border-style: solid;
}
- .stub {
+ .stub,note {
position: relative;
padding: 7px 15px;
margin-bottom: 18px;