Author: buildbot
Date: Thu Jul 24 06:29:24 2014
New Revision: 917265
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/components/objectstores/jdo/release-notes/about.html
websites/staging/isis/trunk/content/components/security/shiro/release-notes/about.html
websites/staging/isis/trunk/content/components/viewers/restfulobjects/release-notes/about.html
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
websites/staging/isis/trunk/content/contributors/resources/release.sh
websites/staging/isis/trunk/content/contributors/resources/upd.sh
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html
websites/staging/isis/trunk/content/intro/getting-started/simpleapp-archetype.html
websites/staging/isis/trunk/content/intro/getting-started/todoapp-archetype.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 24 06:29:24 2014
@@ -1 +1 @@
-1612308
+1613008
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 24 06:29:24 2014
@@ -1 +1 @@
-1612308
+1613008
Modified:
websites/staging/isis/trunk/content/components/objectstores/jdo/release-notes/about.html
==============================================================================
---
websites/staging/isis/trunk/content/components/objectstores/jdo/release-notes/about.html
(original)
+++
websites/staging/isis/trunk/content/components/objectstores/jdo/release-notes/about.html
Thu Jul 24 06:29:24 2014
@@ -403,6 +403,8 @@
</h1>
</div>
+<p>As of 1.6.0, the JDO/DataNucleus Object Store is part of Isis Core.</p>
+
<ul>
<li><a
href="isis-objectstore-jdo-1.5.0.html">isis-objectstore-jdo-1.5.0</a></li>
<li><a
href="isis-objectstore-jdo-1.4.1.html">isis-objectstore-jdo-1.4.1</a></li>
Modified:
websites/staging/isis/trunk/content/components/security/shiro/release-notes/about.html
==============================================================================
---
websites/staging/isis/trunk/content/components/security/shiro/release-notes/about.html
(original)
+++
websites/staging/isis/trunk/content/components/security/shiro/release-notes/about.html
Thu Jul 24 06:29:24 2014
@@ -403,6 +403,8 @@
</h1>
</div>
+<p>As of 1.6.0, the Shiro Security implementation is part of Isis Core.</p>
+
<ul>
<li><a href="isis-security-shiro-1.5.0.html">isis-security-shiro-1.5.0</a></li>
<li><a href="isis-security-shiro-1.4.0.html">isis-security-shiro-1.4.0</a></li>
Modified:
websites/staging/isis/trunk/content/components/viewers/restfulobjects/release-notes/about.html
==============================================================================
---
websites/staging/isis/trunk/content/components/viewers/restfulobjects/release-notes/about.html
(original)
+++
websites/staging/isis/trunk/content/components/viewers/restfulobjects/release-notes/about.html
Thu Jul 24 06:29:24 2014
@@ -403,6 +403,8 @@
</h1>
</div>
+<p>As of 1.6.0, the Restful Objects viewer is part of Isis Core.</p>
+
<ul>
<li><a
href="isis-viewer-restfulobjects-2.3.0.html">isis-viewer-restfulobjects-2.3.0</a>
(for isis-core-1.5.0)</li>
<li><a
href="isis-viewer-restfulobjects-2.2.0.html">isis-viewer-restfulobjects-2.2.0</a>
(for isis-core-1.4.0)</li>
Modified:
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
==============================================================================
---
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
(original)
+++
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
Thu Jul 24 06:29:24 2014
@@ -415,6 +415,7 @@ export ISISTMP=/c/tmp # or as required
export ISISART=simpleapp-archetype
export ISISDEV=1.7.0-SNAPSHOT
export ISISREL=1.6.0
+export ISISPAR=1.6.0
export ISISRC=RC1
export ISISCPT=$(echo $ISISART | cut -d- -f2)
@@ -431,6 +432,7 @@ export ISISTMP=/c/tmp # or as required
export ISISART=todoapp-archetype
export ISISDEV=1.7.0-SNAPSHOT
export ISISREL=1.6.0
+export ISISPAR=1.6.0
export ISISRC=RC1
export ISISCPT=$(echo $ISISART | cut -d- -f2)
@@ -439,6 +441,8 @@ export ISISCPN=$(echo $ISISART | cut -d-
env | grep ISIS | sort
</code></pre>
+<p>nb: <code>$ISISPAR</code> is the version of the Isis core that will act as
the archetype's parent. Usually this is the same as <code>$ISISREL</code>.</p>
+
<h3>Check the example app</h3>
<p>Switch to the directory containing the example application.</p>
@@ -490,7 +494,10 @@ mvn jetty:run
<p>Check the about page and confirm built against non-SNAPSHOT versions of the
Isis jars.</p>
-<h3>Create the archetype</h3>
+<h3>Create the archetype (manual)</h3>
+
+<p>The archetype can be created either by hand or using a script. The steps
below
+are the manual approach; the scripted approach is shown after.</p>
<p>Before we generate the archetype, we clear out all non source code
artifacts.</p>
@@ -527,14 +534,14 @@ mvn jetty:run
<p>and then update the generated files:</p>
-<pre><code>groovy ../../../scripts/updateGeneratedArchetypeSources.groovy -n
$ISISCPN -v 1.2.3
+<pre><code>groovy ../../../scripts/updateGeneratedArchetypeSources.groovy -n
$ISISCPN -v $ISISPAR
</code></pre>
<p>where:</p>
<ul>
-<li>$ISISCPN is the component name set earlier (<code>simpleapp</code> or
<code>todoapp</code>)</li>
-<li>1.2.3 is the version of isis core that is to be the parent of the
generated archetype,
+<li><code>$ISISCPN</code> is the component name set earlier
(<code>simpleapp</code> or <code>todoapp</code>)</li>
+<li><code>$ISISPAR</code> is the version of isis core that is to be the parent
of the generated archetype,
<ul>
<li>this will usually be the same as <code>$ISISREL</code> unless a
patch/interim release of the archetype.</li>
</ul></li>
@@ -628,6 +635,34 @@ git add ../../archetype/$ISISCPN
<pre><code>git commit -am "ISIS-nnn: updating $ISISCPN archetype"
</code></pre>
+<h3>Create the archetype (scripted)</h3>
+
+<p><div class="note">
+Using the script does not generate an app from the archetype to test it works,
+and also - to allow review - stages files into git but omits the final commit.
+</div></p>
+
+<p>First, make sure all environment variables are set, using:</p>
+
+<pre><code>env | grep ISIS | sort
+</code></pre>
+
+<p>The script will also double check that all required
+If recreating the <strong>simpleapp</strong> archetype:</p>
+
+<pre><code>cd example/archetype/simpleapp
+</code></pre>
+
+<p>If recreating the <strong>todoapp</strong> archetype:</p>
+
+<pre><code>cd example/archetype/todoapp
+</code></pre>
+
+<p>Then, run the script:</p>
+
+<pre><code>sh ../../../recreate-archetype.sh
+</code></pre>
+
<h3>Releasing the Archetype</h3>
<p>The procedure for releasing the archetype is the same as for any other
releasable module.</p>
Modified: websites/staging/isis/trunk/content/contributors/resources/release.sh
==============================================================================
--- websites/staging/isis/trunk/content/contributors/resources/release.sh
(original)
+++ websites/staging/isis/trunk/content/contributors/resources/release.sh Thu
Jul 24 06:29:24 2014
@@ -15,8 +15,8 @@ fi
# release candidate
# export ISISART=isis
-# export ISISREL=1.4.0
-# export ISISDEV=1.5.0-SNAPSHOT
+# export ISISREL=1.6.0
+# export ISISDEV=1.7.0-SNAPSHOT
# export ISISRC=RC1
read -p "ISISART? ($ISISART): " xISISART
Modified: websites/staging/isis/trunk/content/contributors/resources/upd.sh
==============================================================================
--- websites/staging/isis/trunk/content/contributors/resources/upd.sh (original)
+++ websites/staging/isis/trunk/content/contributors/resources/upd.sh Thu Jul
24 06:29:24 2014
@@ -12,14 +12,10 @@
#
#################################################################
-isis_core="1.4.0 1.5.0"
-objectstore_jdo="1.4.1 1.5.0"
-security_shiro="1.4.0 1.5.0"
-security_file="1.4.0 1.4.0"
-viewer_restfulobjects="2.2.0 2.3.0"
-viewer_wicket="1.4.1 1.5.0"
-archetype_todoapp="1.4.1 1.5.0"
-archetype_simple="1.4.1 1.5.0"
+isis_core="1.5.0 1.6.0"
+viewer_wicket="1.5.0 1.6.0"
+archetype_todoapp="1.5.0 1.6.0"
+archetype_simpleapp="1.5.0 1.6.0"
@@ -65,133 +61,6 @@ fi
-#################################################################
-#
-# objectstore_jdo
-#
-#################################################################
-old_ver=`echo $objectstore_jdo | awk '{print $1}'`
-new_ver=`echo $objectstore_jdo | awk '{print $2}'`
-
-if [ "$old_ver" != "$new_ver" ]; then
-
- type="objectstore"
- localname="jdo"
-
- fullname="isis-$type-$localname"
- pushd component/$type/$localname
-
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$asc
- svn add $fullname-$new_ver-$asc
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
- svn add $fullname-$new_ver-$md5
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$zip
- svn add $fullname-$new_ver-$zip
-
- svn delete $fullname-$old_ver-$asc
- svn delete $fullname-$old_ver-$md5
- svn delete $fullname-$old_ver-$zip
-
- popd
-fi
-
-
-
-#################################################################
-#
-# security_file
-#
-#################################################################
-old_ver=`echo $security_file | awk '{print $1}'`
-new_ver=`echo $security_file | awk '{print $2}'`
-
-if [ "$old_ver" != "$new_ver" ]; then
-
- type="security"
- localname="file"
-
- fullname="isis-$type-$localname"
- pushd component/$type/$localname
-
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$asc
- svn add $fullname-$new_ver-$asc
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
- svn add $fullname-$new_ver-$md5
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$zip
- svn add $fullname-$new_ver-$zip
-
- svn delete $fullname-$old_ver-$asc
- svn delete $fullname-$old_ver-$md5
- svn delete $fullname-$old_ver-$zip
-
- popd
-fi
-
-
-
-#################################################################
-#
-# security_shiro
-#
-#################################################################
-old_ver=`echo $security_shiro | awk '{print $1}'`
-new_ver=`echo $security_shiro | awk '{print $2}'`
-
-if [ "$old_ver" != "$new_ver" ]; then
-
- type="security"
- localname="shiro"
-
- fullname="isis-$type-$localname"
- pushd component/$type/$localname
-
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$asc
- svn add $fullname-$new_ver-$asc
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
- svn add $fullname-$new_ver-$md5
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$zip
- svn add $fullname-$new_ver-$zip
-
- svn delete $fullname-$old_ver-$asc
- svn delete $fullname-$old_ver-$md5
- svn delete $fullname-$old_ver-$zip
-
- popd
-fi
-
-
-
-#################################################################
-#
-# viewer_restfulobjects
-#
-#################################################################
-old_ver=`echo $viewer_restfulobjects | awk '{print $1}'`
-new_ver=`echo $viewer_restfulobjects | awk '{print $2}'`
-
-if [ "$old_ver" != "$new_ver" ]; then
-
- type="viewer"
- localname="restfulobjects"
-
- fullname="isis-$type-$localname"
- pushd component/$type/$localname
-
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$asc
- svn add $fullname-$new_ver-$asc
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
- svn add $fullname-$new_ver-$md5
- curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$zip
- svn add $fullname-$new_ver-$zip
-
- svn delete $fullname-$old_ver-$asc
- svn delete $fullname-$old_ver-$md5
- svn delete $fullname-$old_ver-$zip
-
- popd
-fi
-
-
#################################################################
#
@@ -236,7 +105,7 @@ new_ver=`echo $archetype_todoapp | awk '
if [ "$old_ver" != "$new_ver" ]; then
type="archetype"
- fullname="quickstart_wicket_restful_jdo-archetype"
+ fullname="todoapp-archetype"
pushd $type/$fullname
curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
@@ -256,16 +125,16 @@ fi
#################################################################
#
-# archetype_simple
+# archetype_simpleapp
#
#################################################################
-old_ver=`echo $archetype_simple | awk '{print $1}'`
-new_ver=`echo $archetype_simple | awk '{print $2}'`
+old_ver=`echo $archetype_simpleapp | awk '{print $1}'`
+new_ver=`echo $archetype_simpleapp | awk '{print $2}'`
if [ "$old_ver" != "$new_ver" ]; then
type="archetype"
- fullname="simple_wicket_restful_jdo-archetype"
+ fullname="simpleapp-archetype"
pushd $type/$fullname
curl -O $repo_root/$type/$fullname/$new_ver/$fullname-$new_ver-$md5
Modified:
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html
==============================================================================
---
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html
(original)
+++
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html
Thu Jul 24 06:29:24 2014
@@ -505,13 +505,13 @@ https://repository.apache.org/content/re
<pre><code>mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=simple_wicket_restful_jdo-archetype \
+ -D archetypeArtifactId=simpleapp-archetype \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
-B \
-o \
- -D archetypeVersion=1.5.0
+ -D archetypeVersion=1.6.0
cd myapp
@@ -526,7 +526,7 @@ rm -rf myapp
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=quickstart_wicket_restful_jdo-archetype \
+ -D archetypeArtifactId=todoapp-archetype \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
Modified:
websites/staging/isis/trunk/content/intro/getting-started/simpleapp-archetype.html
==============================================================================
---
websites/staging/isis/trunk/content/intro/getting-started/simpleapp-archetype.html
(original)
+++
websites/staging/isis/trunk/content/intro/getting-started/simpleapp-archetype.html
Thu Jul 24 06:29:24 2014
@@ -415,8 +415,8 @@
<pre><code>mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=simple_wicket_restful_jdo-archetype \
- -D archetypeVersion=1.5.0 \
+ -D archetypeArtifactId=simpleapp-archetype \
+ -D archetypeVersion=1.6.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
Modified:
websites/staging/isis/trunk/content/intro/getting-started/todoapp-archetype.html
==============================================================================
---
websites/staging/isis/trunk/content/intro/getting-started/todoapp-archetype.html
(original)
+++
websites/staging/isis/trunk/content/intro/getting-started/todoapp-archetype.html
Thu Jul 24 06:29:24 2014
@@ -435,8 +435,8 @@
<pre><code>mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=quickstart_wicket_restful_jdo-archetype \
- -D archetypeVersion=1.5.0 \
+ -D archetypeArtifactId=todoapp-archetype \
+ -D archetypeVersion=1.6.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
