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 2013/02/08 16:07:36 UTC

svn commit: r849887 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/core/about.html content/core/images/ content/core/images/yuml.me-23db58a4.png content/core/publishing-service.html content/documentation.html

Author: buildbot
Date: Fri Feb  8 15:07:36 2013
New Revision: 849887

Log:
Staging update by buildbot for isis

Added:
    websites/staging/isis/trunk/content/core/images/
    websites/staging/isis/trunk/content/core/images/yuml.me-23db58a4.png   (with props)
    websites/staging/isis/trunk/content/core/publishing-service.html
Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/core/about.html
    websites/staging/isis/trunk/content/documentation.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Feb  8 15:07:36 2013
@@ -1 +1 @@
-1442801
+1444048

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Feb  8 15:07:36 2013
@@ -1 +1 @@
-1442801
+1444048

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 Fri Feb  8 15:07:36 2013
@@ -241,29 +241,46 @@
 <li><a href="release-notes/about.html">Releases</a></li>
 </ul>
 
-<h3>Applib &amp; Runtime</h3>
+<h3>Applib</h3>
 
 <ul>
-<li><a href="applib.html">Applib</a></li>
-<li><a href="metamodel.html">Core Metamodel</a></li>
-<li><a href="runtime.html">Core Runtime</a></li>
-<li><a href="webserver.html">Webserver</a></li>
+<li><a href="core/deployment-type.html">Deployment Types</a></li>
+<li><a href="core/applib.html">Applib</a></li>
 </ul>
 
-<h3>Bundled Components</h3>
+<h3>Services</h3>
 
 <ul>
-<li><a href="bytecode.html">Bytecode Enhancers</a></li>
-<li><a href="bypass-security.html">Bypass Security</a></li>
-<li><a href="inmemory-objectstore.html">In-memory Object Store</a></li>
-<li><a href="inmemory-profilestore.html">In-memory Profile Store</a></li>
+<li><a href="core/publishing-service.html">Publishing Service</a> [not yet released]</li>
 </ul>
 
 <h3>Development</h3>
 
 <ul>
-<li><a href="core/unittestsupport.html">Unit Test Support</a></li>
-<li><a href="core/integtestsupport.html">Integration Test Support</a></li>
+<li><a href="core/unittestsupport.html">Unit Test Support</a> [stub]</li>
+<li><a href="core/integtestsupport.html">Integration Test Support</a> [stub]</li>
+</ul>
+
+<h3>Programming Model</h3>
+
+<ul>
+<li><a href="core/metamodel-finetuning-the-programming-model.html">Finetuning the Programming Model</a></li>
+</ul>
+
+<h3>Runtime</h3>
+
+<ul>
+<li><a href="core/runtime.html">Core Runtime</a> [stub]</li>
+<li><a href="core/webserver.html">Webserver</a> [stub]</li>
+</ul>
+
+<h3>Bundled Components</h3>
+
+<ul>
+<li><a href="bytecode.html">Bytecode Enhancers</a> [stub]</li>
+<li><a href="bypass-security.html">Bypass Security</a> [stub]</li>
+<li><a href="inmemory-objectstore.html">In-memory Object Store</a> [stub]</li>
+<li><a href="inmemory-profilestore.html">In-memory Profile Store</a> [stub]</li>
 </ul>
 
 

Added: websites/staging/isis/trunk/content/core/images/yuml.me-23db58a4.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/core/images/yuml.me-23db58a4.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/isis/trunk/content/core/publishing-service.html
==============================================================================
--- websites/staging/isis/trunk/content/core/publishing-service.html (added)
+++ websites/staging/isis/trunk/content/core/publishing-service.html Fri Feb  8 15:07:36 2013
@@ -0,0 +1,511 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <meta charset="utf-8">
+      <title>Publishing Service [not yet released]
</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;
+        }
+        .release-matrix .heading {
+            background-color: #eeeeee;
+        }
+        .release-matrix .new {
+            color: #dd0000;
+            font-weight: bolder;
+        }
+        .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=Publishing Service [not yet released]
",
+                  '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 src="./../javascript/bootstrap-alert.js"></script>
+    <script src="./../javascript/bootstrap-dropdown.js"></script>
+    <script src="./../javascript/bootstrap-tooltip.js"></script>
+    <script src="./../javascript/bootstrap-alerts.js"></script>
+    <script src="./../javascript/bootstrap-modal.js"></script>
+    <script src="./../javascript/bootstrap-transition.js"></script>
+    <script src="./../javascript/bootstrap-button.js"></script>
+    <script src="./../javascript/bootstrap-popover.js"></script>
+    <script src="./../javascript/bootstrap-twipsy.js"></script>
+    <script src="./../javascript/bootstrap-buttons.js"></script>
+    <script src="./../javascript/bootstrap-scrollspy.js"></script>
+    <script src="./../javascript/bootstrap-typeahead.js"></script>
+    <script src="./../javascript/bootstrap-carousel.js"></script>
+    <script src="./../javascript/bootstrap-tab.js"></script>
+    <script src="./../javascript/bootstrap-collapse.js"></script>
+    <script src="./../javascript/bootstrap-tabs.js"></script>
+
+    
+    
+    
+
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+
+    <!-- GAQ stuff removed here -->
+
+
+  </head>
+
+  <body>
+
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="./../index.html">Apache Isis&trade;</a>
+          <ul class="nav">
+            <li><a href="./../index.html">Home</a></li>
+            <li><a href="./../download.html">Download</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Screenshots<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="./../getting-started/screenshots.html">Screenshots</a></li>
+                <li><a href="./../getting-started/screencasts.html">Screencasts</a></li>
+                <!--
+                <li><a href="#">Online Demo</a></li>
+                -->
+              </ul>
+            </li>
+            <li><a href="./../documentation.html">Docs</a></li>
+            <li><a href="./../support.html">Support</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a href="http://www.apache.org/">Apache Homepage <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/licenses/">Licenses <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/security/">Security <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
+                </li>
+              </ul>
+            </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>&nbsp;&raquo&nbsp;<a href="./../core/about.html">Core</a></p>
+<h1>Publishing Service [not yet released]
+
+</h1>
+</div>
+
+<p>The Publishing Service enables Isis to publish both changes to domain objects, and also action invocations to third parties.  A typical use case is to publish onto a pub/sub bus such as <a href="http://servicemix.apache.org/">ServiceMix</a> or <a href="http://activemq.apache.org/">ActiveMQ</a> to keep other systems up to date.</p>
+
+<p>Publishing requires at minimum two things:</p>
+
+<ul>
+<li>domain classes annotated with <code>PublishedAction</code> or <code>PublishedObject</code></p>
+
+<p>The former causes any invocations of an action to be published, the latter causes any changes to the object to be published.  You can annotate with either or both.  </li>
+<li>an implementation of the <code>org.apache.isis.applib.services.publish.PublishingService</code> interface must be registered as a domain services</p>
+
+<p>This is done in the usual way, under the <code>isis.properties</code> config file</li>
+</ul>
+
+<p>Over and above this, the service does provide considerable flexibility for fine-tuning the serialized form and the contents (payload) of the event.</p>
+
+<h3>Annotating the Domain Model</h3>
+
+<p>To indicate that an action should be published, use the <code>PublishedAction</code> annotation.  For example:</p>
+
+<pre>
+public class ToDoItem {
+    ...
+    @PublishedAction
+    public void completed() { ... }
+    ...
+</div>
+</pre>
+
+<p>Similarly, to indicate that any changes to an object should be published, use the <code>PublishedObject</code> annotation:</p>
+
+<pre>
+@PublishedObject
+public class ToDoItem {
+    ...
+</div>
+</pre>
+
+<p>Either or both of these annotations can be used.</p>
+
+<p>As described further down in this article, it is possible to fine-tune the payload.  However, simply using the above annotations will suffice in many cases.</p>
+
+<h3>Configuring the <code>PublishingService</code></h3>
+
+<p>The <code>PublishingService</code> interface is:</p>
+
+<pre>
+package org.apache.isis.applib.services.publish;
+
+public interface PublishingService {
+
+    @Hidden
+    public void publish(EventMetadata metadata, EventPayload payload);
+
+    void setEventSerializer(EventSerializer eventSerializer);
+</div>
+</pre>
+
+<p>Typically implementations will use the injected <code>EventSerializer</code> to convert the metadata and payload into a form to be published:</p>
+
+<pre>
+package org.apache.isis.applib.services.publish;
+
+public interface EventSerializer {
+    public Object serialize(EventMetadata metadata, EventPayload payload);
+</div>
+</pre>
+
+<p>The serialized form returned by <code>EventSerializer</code> will typically be something like JSON, XML or a string.  The signature of <code>serialize(...)</code> returns an object 
+Although not necessary to implement <code>EventSerializer</code>, typically one should also for maximum flexibility, but its important to make sure that the <code>PublishingService</code> is able to handle the serialized form.  Strings are a good
+lowest common denominator, but in some cases are type-safe equivalent, such as a
+<code>org.w3c.dom.Document</code> or an <code>org.json.JSONObject</code> might be returned instead.</p>
+
+<h3>Default Implementations</h3>
+
+<p>A default implementation of <code>EventSerializer</code> will be supplied to the <code>PublishingService</code> if none has been specified as a domain service.  This default implementation simply concatenates the metadata and payload together into a single string:</p>
+
+<pre>
+public interface EventSerializer {
+    ...
+    public static class Simple implements EventSerializer {
+
+        @Programmatic
+        @Override
+        public Object serialize(EventMetadata metadata, EventPayload payload) {
+            return "PUBLISHED: \n    metadata: " + 
+                      metadata.getGuid() + ":" + 
+                      metadata.getUser() + ":" + 
+                      metadata.getTimestamp() + 
+                   ":    payload:s\n" + 
+                      payload.toString();
+        }
+    }
+    ...
+</div>
+</pre>
+
+<p>A simple implementation of <code>PublishingService</code> (which must be configured as a domain service) is also available; this simply writes to stderr is also provided:</p>
+
+<pre>
+public interface PublishingService {
+    ...
+    public static class Stderr implements PublishingService {
+    private EventSerializer eventSerializer = new EventSerializer.Simple();
+        @Hidden
+        @Override
+        public void publish(EventMetadata metadata, EventPayload payload) {
+            Object serializedEvent = eventSerializer.serialize(
+                metadata, payload);
+            System.err.println(serializedEvent);
+        }
+
+        @Override
+        public void setEventSerializer(EventSerializer eventSerializer) {
+            this.eventSerializer = eventSerializer;
+        }
+    }
+    ...
+</div>
+</pre>
+
+<p>Thus, to configure a very simple form of publishing, add the following to <code>isis.properties</code>:</p>
+
+<pre>
+isis.services=<i>...other services...</i>,\
+        org.apache.isis.applib.services.publish.PublishingService$StdErr
+</pre>
+
+<h3>Restful Objects (JSON) Serializer</h3>
+
+<p>An alternative serializer is provided by the <code>isis-viewer-restfulobjects-rendering</code> module.  This converts the provided <code>EventPayload</code> into the form specified by the <a href="http://restfulobjects.org">Restful Objects spec</a>.</p>
+
+<p>To configure this serializer, add the following to <code>isis.properties</code>:</p>
+
+<pre>
+isis.services=<i>...other services...</i>,\
+       org.apache.isis.viewer.restfulobjects.rendering.eventserializer.RestfulObjectsSpecEventSerializer
+</pre>
+
+<p>TODO: need to specify the base url via config.</p>
+
+<h3>Fine-tuning the payload</h3>
+
+<p>The <code>EventPayload</code> that is serialized identifies the object(s) being interacted with or changed, and in the case of the action invocation provides details of the action arguments and result (if any) of that action.  However, the payload does not include the new state of these objects.  It is therefore the responsibility of the subscriber to call back to Isis to determine any information that has not been published.</p>
+
+<p>Doing this is comparatively straightforward if using the Restful Object serializer and Restful Objects viewer; the JSON provided includes hrefs to the objects.</p>
+
+<p>In some circumstances, however, it may make more sense to eagerly "push" information about the change to the subscriber by including that state within the payload.  </p>
+
+<p>To accomplish this, an implementation of a "<code>PayloadFactory</code>" must be specified in the annotation.  For actions, implement <code>@PublishedAction.PayloadFactory</code>:</p>
+
+<pre>
+public @interface PublishedAction {
+
+    public interface PayloadFactory {
+        @Programmatic
+        public EventPayload payloadFor(
+            Identifier actionIdentifier, 
+            Object target, List&lt;Object&gt; arguments, Object result);
+    }
+    Class&lt;? extends PayloadFactory&gt; value()  default PayloadFactory.class;
+</div>
+</pre>
+
+<p>For objects, the interface to implement is <code>@PublishedObject.PayloadFactory</code>:</p>
+
+<pre>
+public @interface PublishedObject {
+
+    public interface PayloadFactory {
+        @Programmatic
+        public EventPayload payloadFor(Object changed);
+    }
+    Class&lt;? extends PayloadFactory&gt; value()  default PayloadFactory.class;
+</div>
+</pre>
+
+<p>For example, the following will eagerly include the <code>ToDoItem</code>'s <code>description</code> property whenever it is changed:</p>
+
+<pre>
+@PublishedObject(ToDoItemPayloadFactory.class)
+public class ToDoItem {
+    ...
+</div>
+</pre>
+
+<p>where <code>ToDoItemPayloadFactory</code> is defined as:</p>
+
+<pre>
+public class ToDoItemChangedPayloadFactory implements PayloadFactory {
+
+    public static class ToDoItemPayload 
+            extends EventPayloadForChangedObject<ToDoItem> {
+
+        public ToDoItemPayload(ToDoItem changed) {
+            super(changed);
+        }
+
+        public String getDescription() {
+            return getChanged().getDescription();
+        }
+    }
+    @Override
+    public EventPayload payloadFor(Object changedObject) {
+        return new ToDoItemPayload((ToDoItem) changedObject);
+    }
+
+</div>
+</pre>
+
+<h3>Class Diagram</h3>
+
+<p>The following class diagram shows how the above components fit together:</p>
+
+<p><img src="images/yuml.me-23db58a4.png" alt="" /></p>
+
+<p>The diagram was generated at <a href="http://yuml.me/edit/23db58a4">yuml.me</a> using the following description:</p>
+
+<pre>
+[PublishingService]++-serializesUsing>[EventSerializer]
+[PublishingService]++-defaultOpf>[PublishedObject.PayloadFactory]
+[PublishingService]++-defaultApf>[PublishedAction.PayloadFactory]
+[EventPayload]^-[EventPayloadForChangedObject]
+[EventPayload]^-[EventPayloadForActionInvocation]
+[PublishedObject]annotatedWith-.->[PublishedObject.PayloadFactory]
+[PublishedAction]annotatedWith-.->[PublishedAction.PayloadFactory]
+[PublishedObject.PayloadFactory]creates-.->[EventPayloadForChangedObject]
+[PublishedAction.PayloadFactory]creates-.->[EventPayloadForActionInvocation]
+[EventMetadata]
+[EventSerializer]-serializes>[EventMetadata]
+[EventSerializer]-serializes>[EventPayload]
+</pre>
+
+
+
+      </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 &copy; 2012~2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        <br/>
+        Apache Isis, Isis, Apache, the Apache feather logo, and the Apache Isis project logo are trademarks of The Apache Software Foundation.
+        </p>
+      </footer>
+
+    </div> <!-- /container -->
+
+  </body>
+</html>

Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Fri Feb  8 15:07:36 2013
@@ -305,34 +305,50 @@
 <p><div class="row-even">
 <div class="span-one-third"></p>
 
-<h3>Applib &amp; Runtime</h3>
+<h3>Applib</h3>
 
 <ul>
 <li><a href="core/deployment-type.html">Deployment Types</a></li>
 <li><a href="core/applib.html">Applib</a></li>
-<li><a href="core/metamodel-finetuning-the-programming-model.html">Finetuning the Programming Model</a></li>
-<li><a href="core/runtime.html">Core Runtime</a> [stub]</li>
-<li><a href="core/webserver.html">Webserver</a> [stub]
+</ul>
+
+<h3>Services</h3>
+
+<ul>
+<li><a href="core/publishing-service.html">Publishing Service</a> [not yet released]
 </div>
 <div class="span-one-third"></li>
 </ul>
 
-<h3>Bundled Components</h3>
+<h3>Dev Support</h3>
 
 <ul>
-<li><a href="core/bytecode.html">Bytecode Enhancers</a> [stub]</li>
-<li><a href="core/bypass-security.html">Bypass Security</a> [stub]</li>
-<li><a href="core/inmemory-objectstore.html">In-memory Object Store</a> [stub]</li>
-<li><a href="core/inmemory-profilestore.html">In-memory Profile Store</a> [stub]
+<li><a href="core/unittestsupport.html">Unit Test Support</a> [stub]</li>
+<li><a href="core/integtestsupport.html">Integration Test Support</a> [stub]</li>
+</ul>
+
+<h3>Programming Model</h3>
+
+<ul>
+<li><a href="core/metamodel-finetuning-the-programming-model.html">Finetuning the Programming Model</a>
 </div>
 <div class="span-one-third"></li>
 </ul>
 
-<h3>Development</h3>
+<h3>Runtime</h3>
 
 <ul>
-<li><a href="core/unittestsupport.html">Unit Test Support</a> [stub]</li>
-<li><a href="core/integtestsupport.html">Integration Test Support</a> [stub]
+<li><a href="core/runtime.html">Core Runtime</a> [stub]</li>
+<li><a href="core/webserver.html">Webserver</a> [stub]</li>
+</ul>
+
+<h3>Bundled Components</h3>
+
+<ul>
+<li><a href="core/bytecode.html">Bytecode Enhancers</a> [stub]</li>
+<li><a href="core/bypass-security.html">Bypass Security</a> [stub]</li>
+<li><a href="core/inmemory-objectstore.html">In-memory Object Store</a> [stub]</li>
+<li><a href="core/inmemory-profilestore.html">In-memory Profile Store</a> [stub]
 </div>
 </div>
 </div>