Author: buildbot
Date: Tue Nov 27 20:32:28 2012
New Revision: 839812
Log:
Staging update by buildbot for isis
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/contributors/release-process.html
websites/staging/isis/trunk/content/documentation.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Nov 27 20:32:28 2012
@@ -1 +1 @@
-1414373
+1414380
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Nov 27 20:32:28 2012
@@ -1 +1 @@
-1414373
+1414380
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 Tue
Nov 27 20:32:28 2012
@@ -241,18 +241,28 @@ mvn versions:display-dependency-updates
<p>Next, perform a quick sanity check:</p>
<ul>
-<li>builds ok</p>
+<li>builds ok</li>
+</ul>
+
+<pre>
+mvn clean install -o
+</pre>
+
+<ul>
+<li>site builds ok</li>
+</ul>
-<p><code>mvn clean install -o</code></li>
-<li>site builds ok</p>
+<pre>
+sh msdf.sh -o
+</pre>
-<p><code>sh msdf.sh -o</code></li>
+<ul>
<li>archetype is ok</p>
<ul>
<li>archetype runs ok</p>
-<p><code>-D archetypeCatalog=local</code></li>
+<p>using <code>-D archetypeCatalog=local</code></li>
<li>app generated from the archetype runs ok</li>
</ul></li>
</ul>
@@ -295,8 +305,8 @@ The move to git will need to reproduce t
<tr><td> </td><td>**/*.ucd, **/*.ucls</td><td>Soyatec UML plugin project
files</td></tr>
<tr><td>Image formats</td><td>**/*.svg</td><td>Scalable Vector
Graphics</td></tr>
<tr><td> </td><td>**/*.pdn</td><td>Paint.NET format</td></tr>
-<tr><td>Data files</td>**/*.json<td></td><td>JSON (test) data</td></tr>
-<tr><td> </td><td>**/isis.log</td>Isis' log file (byproduct of
tests)<td></td></tr>
+<tr><td>Data files</td><td>**/*.json</td><td>JSON (test) data</td></tr>
+<tr><td> </td><td>**/isis.log</td><td>Isis' log file (byproduct of
tests)</td></tr>
<tr><td> </td><td>**/rat.txt</td><td>RAT's own audit file</td></tr>
<tr><td> </td><td>**/fixture-data</td><td>SQL Object Store fixture
data</td></tr>
<tr><td> </td><td>**/test.data</td><td>SQL Object Store fixture
data</td></tr>
@@ -304,8 +314,7 @@ The move to git will need to reproduce t
<tr><td> </td><td>tmp/tests/*.xml</td><td>XML Object Store fixture
data</td></tr>
<tr><td> </td><td>tmp/ldap-conf/**</td><td>LDAP Security fixture
data</td></tr>
<tr><td> </td><td>**/src/main/resources/resources.txt</td><td>Resource
file</td></tr>
-<tr><td>Archetype support</td><td></td><td></td></tr>
-<tr><td> </td><td>**/src/main/appended-resources/,
supplemental-models.xml</td><td>(Empty) supplemental models</td></tr>
+<tr><td>Archetype support</td><td>**/src/main/appended-resources/,
supplemental-models.xml</td><td>(Empty) supplemental models</td></tr>
<tr><td>Program formats</td><td>**/*.min.js</td><td>Minified Javascript (note
that the non-Minified Javascript equivalents is checked for its
license)</td></tr>
</table>
@@ -315,7 +324,6 @@ The move to git will need to reproduce t
<tr><th>License</th><th>Description</th></tr>
<tr><td>Apache 2.0</td><td>The RAT tool searches for an older version of the
Apache license header. This additional license reconfigures RAT to use the
current form of words</td></tr>
<tr><td>MIT</td><td>JQuery (bundled with Isis) is dual licensed under
MIT</td></tr>
-<tr>Isis bundles up source code fom the still-to-be-released JMock 2.6-RC2
codebase<td></td><td></td></tr>
<tr><td>DocBook</td><td>Like many other Apache projects, Isis generates its
documentation in DocBook form. In order to speed up generation, Isis has a
local copy of the DocBook DTDs, Entities etc. Key phrases from these files are
configured so that RAT identifies these files as valid to use.</td></tr>
<tr><td>XHTML</td><td>Isis also has a dependency on the XHTML-strict
DTD</td></tr>
</table>
@@ -360,16 +368,9 @@ def fileEndings = [".java", ".htm"]
<h2>Missing License Check</h2>
-<p>Although <emphasis</p>
+<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>
-<blockquote>
- <p>Apache Isis</emphasis
- has no dependencies which have incompatible licenses, the <acronym
- POM</acronym
- s for these dependencies (in the Maven central repo) do not necessarily
contain the required license information. When the release process is run this
results in the generated <filename
- DEPENDENCIES</filename
- file and generated Maven site listing dependencies as having "unknown"
licenses.</ns:clipboard</p>
-</blockquote>
+<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>
Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Tue Nov 27 20:32:28
2012
@@ -218,7 +218,7 @@
<div class="span-one-third"></p>
<h3>Contributors</h3></li>
-<li><a href="coding-conventions.html">Coding Conventions</a></li>
+<li><a href="contributors/coding-conventions.html">Coding Conventions</a></li>
<li><a href="contributors/updating-the-cms-site.html">Updating the CMS
site</a></li>
<li><a href="contributors/release-process.html">Release process</a>
</div>
