Author: danhaywood
Date: Thu Jul 24 06:29:12 2014
New Revision: 1613008
URL: http://svn.apache.org/r1613008
Log:
updating docs for archetype
Modified:
isis/site/trunk/content/components/objectstores/jdo/release-notes/about.md
isis/site/trunk/content/components/security/shiro/release-notes/about.md
isis/site/trunk/content/components/viewers/restfulobjects/release-notes/about.md
isis/site/trunk/content/contributors/recreating-an-archetype.md
isis/site/trunk/content/contributors/resources/release.sh
isis/site/trunk/content/contributors/resources/upd.sh
isis/site/trunk/content/contributors/verifying-releases-script.md
isis/site/trunk/content/intro/getting-started/simpleapp-archetype.md
isis/site/trunk/content/intro/getting-started/todoapp-archetype.md
Modified:
isis/site/trunk/content/components/objectstores/jdo/release-notes/about.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/release-notes/about.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/release-notes/about.md
(original)
+++ isis/site/trunk/content/components/objectstores/jdo/release-notes/about.md
Thu Jul 24 06:29:12 2014
@@ -1,5 +1,7 @@
Title: Release Notes
+As of 1.6.0, the JDO/DataNucleus Object Store is part of Isis Core.
+
- [isis-objectstore-jdo-1.5.0](isis-objectstore-jdo-1.5.0.html)
- [isis-objectstore-jdo-1.4.1](isis-objectstore-jdo-1.4.1.html)
- [isis-objectstore-jdo-1.4.0](isis-objectstore-jdo-1.4.0.html)
Modified:
isis/site/trunk/content/components/security/shiro/release-notes/about.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/security/shiro/release-notes/about.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/components/security/shiro/release-notes/about.md
(original)
+++ isis/site/trunk/content/components/security/shiro/release-notes/about.md
Thu Jul 24 06:29:12 2014
@@ -1,5 +1,7 @@
Title: Release Notes
+As of 1.6.0, the Shiro Security implementation is part of Isis Core.
+
* [isis-security-shiro-1.5.0](isis-security-shiro-1.5.0.html)
* [isis-security-shiro-1.4.0](isis-security-shiro-1.4.0.html)
* [isis-security-shiro-1.3.0](isis-security-shiro-1.3.0.html)
Modified:
isis/site/trunk/content/components/viewers/restfulobjects/release-notes/about.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/components/viewers/restfulobjects/release-notes/about.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
---
isis/site/trunk/content/components/viewers/restfulobjects/release-notes/about.md
(original)
+++
isis/site/trunk/content/components/viewers/restfulobjects/release-notes/about.md
Thu Jul 24 06:29:12 2014
@@ -1,5 +1,7 @@
Title: Release Notes
+As of 1.6.0, the Restful Objects viewer is part of Isis Core.
+
- [isis-viewer-restfulobjects-2.3.0](isis-viewer-restfulobjects-2.3.0.html)
(for isis-core-1.5.0)
- [isis-viewer-restfulobjects-2.2.0](isis-viewer-restfulobjects-2.2.0.html)
(for isis-core-1.4.0)
- [isis-viewer-restfulobjects-2.1.0](isis-viewer-restfulobjects-2.1.0.html)
(for isis-core-1.3.0)
Modified: isis/site/trunk/content/contributors/recreating-an-archetype.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/recreating-an-archetype.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/recreating-an-archetype.md (original)
+++ isis/site/trunk/content/contributors/recreating-an-archetype.md Thu Jul 24
06:29:12 2014
@@ -12,6 +12,7 @@ If recreating the **simpleapp** archetyp
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)
@@ -27,6 +28,7 @@ If recreating the **todoapp** archetype:
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)
@@ -34,6 +36,8 @@ If recreating the **todoapp** archetype:
env | grep ISIS | sort
+nb: `$ISISPAR` is the version of the Isis core that will act as the
archetype's parent. Usually this is the same as `$ISISREL`.
+
### Check the example app
Switch to the directory containing the example application.
@@ -81,7 +85,10 @@ If recreating the **todoapp** archetype,
Check the about page and confirm built against non-SNAPSHOT versions of the
Isis jars.
-### Create the archetype
+### Create the archetype (manual)
+
+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.
Before we generate the archetype, we clear out all non source code artifacts.
@@ -113,12 +120,12 @@ Now we can create the archetype.
and then update the generated files:
- groovy ../../../scripts/updateGeneratedArchetypeSources.groovy -n $ISISCPN
-v 1.2.3
+ groovy ../../../scripts/updateGeneratedArchetypeSources.groovy -n $ISISCPN
-v $ISISPAR
where:
-- $ISISCPN is the component name set earlier (`simpleapp` or `todoapp`)
-- 1.2.3 is the version of isis core that is to be the parent of the generated
archetype,
+- `$ISISCPN` is the component name set earlier (`simpleapp` or `todoapp`)
+- `$ISISPAR` is the version of isis core that is to be the parent of the
generated archetype,
- this will usually be the same as `$ISISREL` unless a patch/interim
release of the archetype.
### Test the archetype
@@ -198,6 +205,30 @@ Finally, commit the changes:
git commit -am "ISIS-nnn: updating $ISISCPN archetype"
+
+### Create the archetype (scripted)
+
+{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.
+}
+
+First, make sure all environment variables are set, using:
+
+ env | grep ISIS | sort
+
+The script will also double check that all required
+If recreating the **simpleapp** archetype:
+
+ cd example/archetype/simpleapp
+
+If recreating the **todoapp** archetype:
+
+ cd example/archetype/todoapp
+
+Then, run the script:
+
+ sh ../../../recreate-archetype.sh
### Releasing the Archetype
Modified: isis/site/trunk/content/contributors/resources/release.sh
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/resources/release.sh?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/resources/release.sh (original)
+++ isis/site/trunk/content/contributors/resources/release.sh Thu Jul 24
06:29:12 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: isis/site/trunk/content/contributors/resources/upd.sh
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/resources/upd.sh?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/resources/upd.sh (original)
+++ isis/site/trunk/content/contributors/resources/upd.sh Thu Jul 24 06:29:12
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: isis/site/trunk/content/contributors/verifying-releases-script.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/verifying-releases-script.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/verifying-releases-script.md (original)
+++ isis/site/trunk/content/contributors/verifying-releases-script.md Thu Jul
24 06:29:12 2014
@@ -96,13 +96,13 @@ Assuming that everything builds ok, then
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
@@ -116,7 +116,7 @@ and (adjust version as necessary):
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: isis/site/trunk/content/intro/getting-started/simpleapp-archetype.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/getting-started/simpleapp-archetype.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/intro/getting-started/simpleapp-archetype.md
(original)
+++ isis/site/trunk/content/intro/getting-started/simpleapp-archetype.md Thu
Jul 24 06:29:12 2014
@@ -12,8 +12,8 @@ Then run the following command:
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: isis/site/trunk/content/intro/getting-started/todoapp-archetype.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/intro/getting-started/todoapp-archetype.md?rev=1613008&r1=1613007&r2=1613008&view=diff
==============================================================================
--- isis/site/trunk/content/intro/getting-started/todoapp-archetype.md
(original)
+++ isis/site/trunk/content/intro/getting-started/todoapp-archetype.md Thu Jul
24 06:29:12 2014
@@ -32,8 +32,8 @@ Then run the following command:
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 \
