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

svn commit: r883738 [2/2] - in /websites/staging/isis/trunk: cgi-bin/ content/ content/components/objectstores/jdo/release-notes/ content/components/security/shiro/release-notes/ content/components/viewers/restfulobjects/release-notes/ content/componen...

Added: websites/staging/isis/trunk/content/core/release-notes/isis-1.3.0.html
==============================================================================
--- websites/staging/isis/trunk/content/core/release-notes/isis-1.3.0.html (added)
+++ websites/staging/isis/trunk/content/core/release-notes/isis-1.3.0.html Tue Oct 22 19:27:09 2013
@@ -0,0 +1,474 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <meta charset="utf-8">
+      <title>isis-1.3.0
</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-3.0.0/css/bootstrap.css" rel="stylesheet">
+    <link href="./../../prettify.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);
+        }
+        
+        div.XXXisis-tweak form {
+            margin-top: 6px;
+            margin-bottom: -2px;
+        }
+        
+        div.row div.col-md-12 {
+          border-top: 1px solid #eeeeee;
+        }
+        
+        
+        /* Isis specific stuff */
+
+        .container {
+          width: 940px;
+        }
+
+        .markdown-content .documentation .span-one-third p {
+          margin-bottom: 0px;
+        }
+
+        .markdown-content .documentation .group {
+          margin-top: 9px;
+        }
+
+        .documentation .group h2 {
+          border-bottom: 1px solid #DDD
+        }
+        .documentation h2 a, .documentation h3 a {
+          /* same as code style */
+          padding: 0 3px 2px;
+          font-family: Monaco, Andale Mono, Courier New, monospace;
+          font-size: 12px;
+          -webkit-border-radius: 3px;
+          -moz-border-radius: 3px;
+          border-radius: 3px;
+          padding: 1px 3px;
+        }
+        
+        .carousel-indicators li {
+          border: 1px solid rgb(192,70,1);
+        }
+
+        .carousel-indicators li.active {
+          background-color: rgb(192,70,1);
+        }
+        
+        .carousel-control .icon-prev,
+        .carousel-control .icon-next {
+          color: rgb(192,70,1);
+          font-size: 60px;
+        }
+        
+        .page-header {
+          margin-top: 0px;
+        }
+        
+    </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=isis-1.3.0
",
+                  'Share on Twitter',
+                  'width=800,height=526');
+      };
+    </script>
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="./../../images/favicon.ico">
+
+    <script src="./../../javascript/prettify.js" type="text/javascript"></script>
+    
+    <script src="//code.jquery.com/jquery.js"></script>
+    <script src="./../../javascript/prettyprint.js"></script>
+    <script src="./../../bootstrap-3.0.0/js/bootstrap.js"></script>
+
+
+    <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+    <!--
+    <DISABLEDscript src="./../../javascript/common.js"></DISABLEDscript>
+    -->
+
+    
+    
+    
+
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+
+  </head>
+
+  <body>
+
+    <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+      <div class="container">
+        <a class="navbar-brand" href="./../../index.html">Apache Isis&trade;</a>
+        <ul class="nav navbar-nav">
+          <li><a href="./../../download.html">Download</a></li>
+          <li><a href="./../../documentation.html">Documentation</a></li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Screencasts<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="./../../getting-started/screencasts.html">Screencasts</a></li>
+              <li><a href="./../../getting-started/powered-by.html">Powered by</a></li>
+              <!--
+              <li><a href="#">Online Demo</a></li>
+              -->
+            </ul>
+          </li>
+          <li><a href="./../../support.html">Support</a></li>
+
+          <FORM class="navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+            <div class="form-group">
+              <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+              <INPUT type="hidden" name="cof" value="FORID:0">
+              <INPUT class="form-control" name="q" type="text" placeholder="Search">
+            </div>
+          </FORM>
+          
+          <li class="dropdown  navbar-right">
+            <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>
+              <li>
+                <a href="./../../more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+              </li>
+            </ul>
+          </li>
+        </ul>
+
+      </div>
+    </nav>
+
+    <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>&nbsp;&raquo&nbsp;<a href="./../../core/release-notes/about.html">Release Notes</a></p>
+<h1>isis-1.3.0
+
+</h1>
+</div>
+
+<h2>        New Feature
+</h2>
+
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-420'>ISIS-420</a>] -         Application-level settings service and a user-level settings service.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-423'>ISIS-423</a>] -         Provide contract test utility for the automatic testing of 1:m and 1:1 bidirectional relationships
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-426'>ISIS-426</a>] -         Provide abstract contract test to easily verify Comparable implementations.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-427'>ISIS-427</a>] -         An application setting service (both global and user-specific), with JDO implementation.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-430'>ISIS-430</a>] -         Allow the sort order for SortedSet parented collections to be overridden with a new @SortedBy annotation.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-433'>ISIS-433</a>] -         Provide context-specific autoComplete through prefixed methods on actions parameters (cf choices method).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-434'>ISIS-434</a>] -         Provide context-specific autoComplete through prefixed methods on properties
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-440'>ISIS-440</a>] -         Contributed collections to allow decoupling
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-441'>ISIS-441</a>] -         Helper classes in the applib to implement common object contracts (toString, equals, hashCode, compareTo)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-446'>ISIS-446</a>] -         A new DeveloperUtilitiesService to download the metamodel as a CSV spreadsheet
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-450'>ISIS-450</a>] -         Provide an EventBusService (based on guava) for decoupled intra-session interaction between entities.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-452'>ISIS-452</a>] -         New @PostsPropertyChangedEvent annotation to post a PropertyChangedEvent via EventBusService
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-457'>ISIS-457</a>] -         New annotation @CssClass for class member, should render in the HTML markup for that member.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-461'>ISIS-461</a>] -         Provide the ability to run arbitrary fixtures (implementing the applib&#39;s InstallableFixture) in integration tests 
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-463'>ISIS-463</a>] -         Enhance unittestsupport and integtestsupport to enable Cucumber-JVM specs to be written (at  unit- or integration-scope, respectively)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-468'>ISIS-468</a>] -         Provide better layout management of pages in the Wicket viewer.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-469'>ISIS-469</a>] -         Provide implementations of certain layout facets that read from a &quot;Xxx.layout.properties&quot; file
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-470'>ISIS-470</a>] -         Provide the ability to rebuild the metamodel for individual classes, thus allowing dynamic layout capability...
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-475'>ISIS-475</a>] -         Dynamic layout using JSON, using an Xxx.layout.json file
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-478'>ISIS-478</a>] -         Provide conditional choices, defaults and validation between action parameters
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-484'>ISIS-484</a>] -         Contract test for ensuring that injectXxx methods are final and not overridable
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-497'>ISIS-497</a>] -         Allow service actions to be rendered as contributed collections or as contributed properties.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-518'>ISIS-518</a>] -         Support Guava&#39;s Predicate API for allMatches etc in the applib; deprecate the Filter&lt;T&gt; API.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-553'>ISIS-553</a>] -         Provide view model support, as sketched out in the Restful Objects spec
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-554'>ISIS-554</a>] -         Automatically render a &quot;Dashboard&quot; service (perhaps one annotated with @Dashboard) as an object in the Wicket viewer.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-559'>ISIS-559</a>] -         When a @Bulk action is invoked, an interaction context (available via a ThreadLocal) should provide additional contextual information.
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-51'>ISIS-51</a>] -         Standardize on just one collections API (either google-collections/guava or Apache collections)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-74'>ISIS-74</a>] -         Get rid of BoundedFacet (or keep only for information); instead replace with ChoicesFacetBecauseBounded.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-210'>ISIS-210</a>] -         Support parameter choices on contributed actions
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-425'>ISIS-425</a>] -         Factor out abstract contract test class to make it easier to write contract tests that apply to all entities.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-428'>ISIS-428</a>] -         JUnitMockery2 should automatically instantiate the @ClassUnderTest
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-436'>ISIS-436</a>] -         Extend the ApplicationSettings and UserSettings (read/write and listAll)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-444'>ISIS-444</a>] -         Autocomplete should allow minimum characters to be specified; choices should require no characters to be specified.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-453'>ISIS-453</a>] -         Extend @MemberGroups annotation so that it can provide a hint to lay out properties on either left or right hand side of the page (with respect to Wicket viewer&#39;s rendering)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-456'>ISIS-456</a>] -         ResourceServlet should set the contentType for common file types.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-458'>ISIS-458</a>] -         Allow services to be rendered in a different order than listed in isis.properties.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-462'>ISIS-462</a>] -         Improve ValueTypeContractTestAbstract to also test for value types that implement Comparable.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-465'>ISIS-465</a>] -         Provide the ability to reuse FixtureInstallerDelegate to install demo fixtures (in running application).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-474'>ISIS-474</a>] -         hide operation in the sevice menu that are not invoke-able due to user role permission mapping.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-480'>ISIS-480</a>] -         With the new multiple columns for properties, should only be a single edit form, and should also allow collections to &quot;overflow&quot; underneath property columns if need be.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-482'>ISIS-482</a>] -         Allow as &quot;choices&quot; return type any descendant of &quot;Collection&quot;
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-485'>ISIS-485</a>] -         Clearer messages for validation exceptions (specially MandatoryExceptions)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-490'>ISIS-490</a>] -         Switch from log4j to using slf4j throughout
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-495'>ISIS-495</a>] -         Remove dependences to commons-lang and commons-collection
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-500'>ISIS-500</a>] -         Make EntityIconAndTitlePanel easier to subclass; minor tidy up ComponentFactory and PageRegistryDefault.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-503'>ISIS-503</a>] -         Refactor the way that members are ordered to allow contributee actions to be ordered within regular actions 
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-504'>ISIS-504</a>] -         Metamodel validator should throw a violation if discover any properties/collections on a service
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-509'>ISIS-509</a>] -         Tidy up and rationalize Util classes in core (and all dependents)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-519'>ISIS-519</a>] -         Delete applib&#39;s src-archived/old-valueholders (and the other src-archived stuff too, the never implemented searchable annotations/interfaces).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-528'>ISIS-528</a>] -         Allow framework to deal with transient objects not instantiated by newTransientInstance.  Improve javadoc.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-536'>ISIS-536</a>] -         Provide the capability to disable concurrency checking in core through a thread-local
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-539'>ISIS-539</a>] -         Allow a reason to be specified in @Disabled annotation
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-546'>ISIS-546</a>] -         OID marshalling should allow an &#39;@&#39; symbol for the version.getUser()
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-564'>ISIS-564</a>] -         The API for the AuditingService#audit omits the id of the property being changed.  Fix this (respecting semver)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-567'>ISIS-567</a>] -         Provide the capability to disable concurrency checking through a global property (in isis.properties)
+</li>
+</ul>
+
+<h2>        Bug
+</h2>
+
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-236'>ISIS-236</a>] -         Classes that are not referenced in the DOM aren&#39;t found by the specification loader
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-435'>ISIS-435</a>] -         Problems with Enums implementing methods on values
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-442'>ISIS-442</a>] -         Fix error handling flow in IsisTransaction
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-449'>ISIS-449</a>] -         Error handling when transaction aborted incorrect
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-451'>ISIS-451</a>] -         Abstract methods (and perhaps synthetic methods) not being filtered out of metamodel
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-464'>ISIS-464</a>] -         Some trivial cleanup
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-467'>ISIS-467</a>] -         timezone difference issue in date test in org.apache.isis.objectstore.sql.HsqlTest
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-531'>ISIS-531</a>] -         Reinstate metamodel pseudo-&quot;API&quot; classes that are used by danhaywood&#39;s wicket extensions, was breaking backward compatibility
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-533'>ISIS-533</a>] -         When flushing transaction, allow for fact that flushing might cause additional persistence commands to be created, and iterate.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-545'>ISIS-545</a>] -         Test in error (Unparseable date)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-549'>ISIS-549</a>] -         RegisterEntities has two @PostConstruct methods...
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-565'>ISIS-565</a>] -         NullPointerException on OneToOneAssociation#clearValue
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-566'>ISIS-566</a>] -         Concurrency conflict on related entity that has not been edited
+</li>
+</ul>
+
+<h2>        Task
+</h2>
+
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-437'>ISIS-437</a>] -         Tidy-up tasks for Isis 1.3.0 and associated components.
+</li>
+</ul>
+
+
+
+      </div>
+
+        <div id="edit" class="modal hide fade in" style="xxxdisplay: 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 Tue Oct 22 19:27:09 2013
@@ -282,22 +282,11 @@
 <li><strong><a href="applib-guide/about.html">Programming Model and How-tos</a></strong></li>
 <li><a href="applib-guide/reference/Utility.html">Applib utility classes</a></li>
 <li><a href="core/dynamic-layouts.html">Static and dynamic layouts</a> [1.3.0-SNAPSHOT]</li>
-<li><a href="getting-started/cheat-sheet.html">Programming Model Cheat Sheet</a></li>
-</ul>
-
-<h3>Resources</h3>
-
-<ul>
-<li><a href="getting-started/editor-templates.html">Editor templates</a></li>
-<li><a href="getting-started/icons.html">Icons</a></li>
-</ul>
-
-<p></div>
+<li><a href="getting-started/cheat-sheet.html">Programming Model Cheat Sheet</a>
+</div>
 <div class="col-md-4"></p>
 
-<h3>Learning More</h3>
-
-<ul>
+<h3>Learning More</h3></li>
 <li><a href="learning-more/common-use-cases.html">Common Use Cases</a></li>
 <li><a href="learning-more/presentations.html">Downloadable Presentations</a></li>
 <li><a href="learning-more/hexagonal-architecture.html">Hexagonal Architecture</a> [stub]</li>
@@ -307,32 +296,35 @@
 <li><a href="learning-more/resources/Pawson-Naked-Objects-thesis.pdf">Richard Pawson's Naked Objects thesis</a></li>
 </ul>
 
-<h3>Releases</h3>
+<h3>Resources</h3>
 
 <ul>
-<li><a href="release-matrix.html">Release Matrix</a>
+<li><a href="getting-started/editor-templates.html">Editor templates</a></li>
+<li><a href="getting-started/icons.html">Icons</a>
 </div>
 <div class="col-md-4"></p>
 
-<h3>Contributors</h3>
-
-<ul>
+<h3>Contributors</h3></li>
 <li><a href="contributors/contributing.html">Contributing</a></li>
 <li><a href="contributors/development-environment.html">Development Environment</a></li>
 <li><a href="contributors/building-isis.html">Building Isis</a></li>
 <li><a href="contributors/git-policy.html">Git Policy</a></li>
 <li><a href="contributors/git-cookbook.html">Git Cookbook</a></li>
 <li><a href="contributors/versioning-policy.html">Versioning Policy</a></li>
-</ul></li>
 </ul>
 
-<p>Guidance for committers is at the bottom of this page.
+<p>Guidance for committers is at the bottom of this page.</p>
+
+<h3>Releases</h3>
+
+<ul>
+<li><a href="release-matrix.html">Release Matrix</a>
 </div>
 </div>
 <div class="row">
-<div class="col-md-12"></p>
-
-<h2>Core <a href="core/release-notes/about.html">1.2.0</a></div></h2>
+<div class="col-md-12">
+<h2>Core <a href="core/release-notes/about.html">1.2.0</a></div></h2></li>
+</ul>
 
 <p><div class="col-md-4"></p>
 

Modified: websites/staging/isis/trunk/content/release-matrix.html
==============================================================================
--- websites/staging/isis/trunk/content/release-matrix.html (original)
+++ websites/staging/isis/trunk/content/release-matrix.html Tue Oct 22 19:27:09 2013
@@ -333,17 +333,6 @@
 <tr>
     <th class="heading">Security</th>
     <th class="heading"><a href="components/security/file/about.html">File</a></th>
-    <th class="heading">1.3.0(*)</th>
-    <td>1.3.0</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
-</tr>
-<tr>
-    <th class="heading">&nbsp;</th>
-    <th class="heading">&nbsp;</th>
     <th class="heading">1.0.1</th>
     <td>1.2.0</td>
     <td>-</td>