You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/04/14 14:41:08 UTC
[09/11] isis git commit: ISIS-1362: updating website/docs for 1.12.1
ISIS-1362: updating website/docs for 1.12.1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/974c8a8b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/974c8a8b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/974c8a8b
Branch: refs/heads/master
Commit: 974c8a8bc7196ef614a7c9132858ff4d1f674fef
Parents: 565ac81
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Apr 12 08:27:56 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Apr 12 08:27:56 2016 +0100
----------------------------------------------------------------------
STATUS | 3 +++
.../src/main/asciidoc/_release-notes_1.12.1.adoc | 7 +------
.../src/main/asciidoc/doap_isis.rdf | 19 ++++++++++++++++++-
.../src/main/asciidoc/downloads.adoc | 10 +++++-----
.../guides/_cgcom_post-release-successful.adoc | 2 +-
.../guides/_rgsvc_api_BookmarkService.adoc | 6 +++---
.../src/main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../_tg_stop-scaffolding-start-coding.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 2 +-
.../src/main/asciidoc/release-notes.adoc | 4 ++--
10 files changed, 36 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index a30d988..1e40373 100644
--- a/STATUS
+++ b/STATUS
@@ -21,6 +21,9 @@ Description
TLP releases:
+ * isis-1.12.1 : 12 Apr 2016
+ * simpleapp-archetype-1.12.1 : 12 Apr 2016
+
* isis-1.12.0 : 29 Mar 2016
* simpleapp-archetype-1.12.0 : 29 Mar 2016
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
index 221eb68..553922c 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
@@ -6,12 +6,7 @@
:toc: right
-Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0.
-
-[WARNING]
-====
-This release is currently being voted on and has not yet been released to Maven central repo.
-====
+Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0. The primary issue it addresses are spurious concurrency exceptions that can be thrown when editing an object. It also addresses a subtle issue where the new support in JAXB view models for auto-edit can cause some dirty objects not to be updated.
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/doap_isis.rdf
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/doap_isis.rdf b/adocs/documentation/src/main/asciidoc/doap_isis.rdf
index c10112b..472b8e0 100644
--- a/adocs/documentation/src/main/asciidoc/doap_isis.rdf
+++ b/adocs/documentation/src/main/asciidoc/doap_isis.rdf
@@ -36,6 +36,23 @@
<category rdf:resource="http://projects.apache.org/category/web-framework" />
+ <!-- 2016-04-12 releases -->
+ <release>
+ <Version>
+ <name>isis</name>
+ <created>2016-04-12</created>
+ <revision>1.12.1</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>simpleapp-archetype</name>
+ <created>2016-04-12</created>
+ <revision>1.12.1</revision>
+ </Version>
+ </release>
+
+
<!-- 2016-03-29 releases -->
<release>
<Version>
@@ -51,7 +68,7 @@
<revision>1.12.0</revision>
</Version>
</release>
-
+
<!-- 2016-01-17 releases -->
<release>
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/downloads.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/downloads.adoc b/adocs/documentation/src/main/asciidoc/downloads.adoc
index 00778a9..009152d 100644
--- a/adocs/documentation/src/main/asciidoc/downloads.adoc
+++ b/adocs/documentation/src/main/asciidoc/downloads.adoc
@@ -25,12 +25,12 @@ If you want to build Apache Isis from formally released source tarballs, you can
Core:
-* https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.12.0-source-release.zip[isis-1.12.0] (http://www.apache.org/dist/isis/isis-core/isis-1.12.0-source-release.zip.asc[asc], http://www.apache.org/dist/isis/isis-core/isis-1.12.0-source-release.zip.md5[md5])
+* https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.12.1-source-release.zip[isis-1.12.1] (http://www.apache.org/dist/isis/isis-core/isis-1.12.1-source-release.zip.asc[asc], http://www.apache.org/dist/isis/isis-core/isis-1.12.1-source-release.zip.md5[md5])
Archetypes:
-* https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.0-source-release.zip[simpleapp-archetype-1.12.0] (http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.0-source-release.zip.asc[asc], http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.0-source-release.zip.md5[md5])
+* https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.1-source-release.zip[simpleapp-archetype-1.12.1] (http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.1-source-release.zip.asc[asc], http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.12.1-source-release.zip.md5[md5])
@@ -45,7 +45,7 @@ Then verify the signatures using a command such as:
[source,bash]
----
pgpk -a KEYS
-pgpv isis-1.12.0-source-release.zip.asc
+pgpv isis-1.12.1-source-release.zip.asc
----
or
@@ -53,7 +53,7 @@ or
[source,bash]
----
pgp -ka KEYS
-pgp isis-1.12.0-source-release.zip.asc
+pgp isis-1.12.1-source-release.zip.asc
----
@@ -62,7 +62,7 @@ or
[source,bash]
----
gpg –import KEYS
-gpg –verify isis-1.12.0-source-release.zip.asc
+gpg –verify isis-1.12.1-source-release.zip.asc
----
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/guides/_cgcom_post-release-successful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_post-release-successful.adoc
index 93b674a..f9a54af 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_post-release-successful.adoc
@@ -159,7 +159,7 @@ popd
[source,bash]
----
-sh upd.sh 1.12.0 1.13.0
+sh upd.sh 1.12.1 1.13.0
----
The script downloads the artifacts from the Nexus release repository, adds the artifacts to subversion and deletes the previous version.
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_BookmarkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_BookmarkService.adoc
index a7103d5..3cf4f9a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_BookmarkService.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-The `BookmarkService2` API (the ``BookmarkService2`` subinterface to ``BookmarkService`` was introduced in ``1.12.1-SNAPSHOT``) provides the ability to obtain a serializable ``o.a.i.applib.bookmarks.Bookmark`` for any (persisted) domain object, and to lookup domain objects given a ``Bookmark``. This can then in turn be converted to and from a string.
+The `BookmarkService2` API provides the ability to obtain a serializable ``o.a.i.applib.bookmarks.Bookmark`` for any (persisted) domain object, and to lookup domain objects given a ``Bookmark``. This can then in turn be converted to and from a string.
For example, a `Customer` object with:
@@ -33,7 +33,7 @@ One downside of using ``Bookmark``s is that there is no way for the JDO/DataNucl
== API & Implementation
-The API defined by `BookmarkService2` (`1.12.1-SNAPSHOT`) is:
+The API defined by `BookmarkService2` is:
[source,java]
----
@@ -54,7 +54,7 @@ public interface BookmarkService2 {
Bookmark bookmarkFor(Class<?> cls, String identifier);
}
----
-<1> (`1.12.1-SNAPSHOT`) - if the object has already been loaded from the database, then whether to reset its fields. The default it to `RESET`.
+<1> if the object has already been loaded from the database, then whether to reset its fields. The default it to `RESET`.
<2> same as `lookup(Bookmark bookmark)`, but downcasts to the specified type.
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
index 61f6b5a..65d6e15 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
@@ -62,7 +62,7 @@ Run the simpleapp archetype to build an empty Isis application:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.0 \
+ -D archetypeVersion=1.12.1 \
-D groupId=com.mycompany \
-D artifactId=petclinic \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
index 3e7ca3e..c000423 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
@@ -30,7 +30,7 @@ Run the simpleapp archetype to build an empty Isis application:
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.0 \
+ -D archetypeVersion=1.12.1 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index b149ee9..309f90d 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -694,7 +694,7 @@ And I must say this: "Great Support from the development team"</p>
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.0 \
+ -D archetypeVersion=1.12.1 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis/blob/974c8a8b/adocs/documentation/src/main/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes.adoc
index 3c41983..bb6ef2d 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes.adoc
@@ -26,8 +26,8 @@ This table summarises all releases of Apache Isis to date.
| (currently being voted on)
| Bug-fix release
| 0
-| 1
-| 3
+| 0
+| 4
| xref:r1.12.0[1.12.0]
| 29-mar-2016