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:00 UTC
[01/11] isis git commit: [maven-release-plugin] prepare release
isis-1.12.1
Repository: isis
Updated Branches:
refs/heads/master 474cb71a2 -> a752ed0f6
[maven-release-plugin] prepare release isis-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/9317692a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9317692a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9317692a
Branch: refs/heads/master
Commit: 9317692a8c72361ca252873f2192fc2cb3267093
Parents: a19f7c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:51:22 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:51:22 2016 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 66 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +--
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
21 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 1a6796c..147b516 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index c3715b1..47ef4e4 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index d33ff05..303254d 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3fd9501..9c8046d 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index d0955db..b657433 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6770b0d..2fe7dd0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<packaging>pom</packaging>
@@ -185,7 +185,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>HEAD</tag>
+ <tag>isis-1.12.1</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1072,13 +1072,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,14 +1087,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1103,14 +1103,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1119,7 +1119,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1128,14 +1128,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1144,40 +1144,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1185,36 +1185,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1223,12 +1223,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
@@ -1236,41 +1236,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1280,7 +1280,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index b44b60f..ac93ef0 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index a05eac2..c89dd77 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 33e51d2..b607ef2 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<name>Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index c1e4a8c..f6b9239 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 492e446..ed9857e 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 6e92da7..c4978c3 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index b507df4..f7c60d7 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index d8b9575..1b40482 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index b7048f2..3b7142c 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 5c60b1a..07327dd 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 97e44fc..d5baf4e 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index cabf352..8238fb3 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 1b0cc52..0df770e 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 999a90a..5f1f0ea 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/9317692a/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 6a09e9e..0fe6b19 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[06/11] isis git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/86cb6829
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/86cb6829
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/86cb6829
Branch: refs/heads/master
Commit: 86cb6829c9c6197d9ef0ac8d3e2c0b1efa687f8d
Parents: 8a05cdc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:14:52 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:14:52 2016 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/86cb6829/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index e8a3910..e1a5a39 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -47,8 +47,4 @@
<version>1.12.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
-
- <scm>
- <tag>simpleapp-archetype-1.12.1</tag>
- </scm>
</project>
[09/11] isis git commit: ISIS-1362: updating website/docs for 1.12.1
Posted by da...@apache.org.
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
[07/11] isis git commit: ISIS-1362: bumping simpleapp's pom.xml to
isis 1.13.0-SNAPSHOT
Posted by da...@apache.org.
ISIS-1362: bumping simpleapp's pom.xml to isis 1.13.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9846e436
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9846e436
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9846e436
Branch: refs/heads/master
Commit: 9846e436508f2ca0b04b3d8638422322ff4eee27
Parents: 86cb682
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:31:01 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:31:01 2016 +0100
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9846e436/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index fec202c..d3c1e53 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.12.1</isis.version>
+ <isis.version>1.13.0-SNAPSHOT</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[02/11] isis git commit: [maven-release-plugin] prepare for next
development iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cae8df38
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cae8df38
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cae8df38
Branch: refs/heads/master
Commit: cae8df389b611cb9b7f24df112cb73ffb6ff6ba0
Parents: 9317692
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 8 18:51:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Apr 8 18:51:25 2016 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 66 +++++++++++------------
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +--
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
21 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 147b516..1a6796c 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 47ef4e4..c3715b1 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 303254d..d33ff05 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 9c8046d..3fd9501 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index b657433..d0955db 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2fe7dd0..6770b0d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -185,7 +185,7 @@
<connection>scm:git:http://git.apache.org/isis.git/core</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/isis.git/trunk/framework/</developerConnection>
<url>git://git.apache.org/isis.git/core</url>
- <tag>isis-1.12.1</tag>
+ <tag>HEAD</tag>
</scm>
<url>http://isis.apache.org</url>
@@ -1072,13 +1072,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1087,14 +1087,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1103,14 +1103,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1119,7 +1119,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1128,14 +1128,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1144,40 +1144,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1185,36 +1185,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1223,12 +1223,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
@@ -1236,41 +1236,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1280,7 +1280,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index ac93ef0..b44b60f 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index c89dd77..a05eac2 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index b607ef2..33e51d2 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index f6b9239..c1e4a8c 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index ed9857e..492e446 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index c4978c3..6e92da7 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index f7c60d7..b507df4 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 1b40482..d8b9575 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 3b7142c..b7048f2 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 07327dd..5c60b1a 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index d5baf4e..97e44fc 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<name>Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 8238fb3..cabf352 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 0df770e..1b0cc52 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 5f1f0ea..999a90a 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/cae8df38/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 0fe6b19..6a09e9e 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.1</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
[05/11] isis git commit: [maven-release-plugin] prepare release
simpleapp-archetype-1.12.1
Posted by da...@apache.org.
[maven-release-plugin] prepare release simpleapp-archetype-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/8a05cdc1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8a05cdc1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8a05cdc1
Branch: refs/heads/master
Commit: 8a05cdc13cfb0160a0e30dc90697398bdc2bd754
Parents: 3adbf2c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:14:47 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:14:47 2016 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8a05cdc1/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 89551e5..e8a3910 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.13.0-SNAPSHOT</version>
+ <version>1.12.1</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -47,4 +47,8 @@
<version>1.12.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
+
+ <scm>
+ <tag>simpleapp-archetype-1.12.1</tag>
+ </scm>
</project>
[04/11] isis git commit: ISIS-1362: updating simpleapp to use isis
v1.12.1
Posted by da...@apache.org.
ISIS-1362: updating simpleapp to use isis v1.12.1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3adbf2c7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3adbf2c7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3adbf2c7
Branch: refs/heads/master
Commit: 3adbf2c70aefbf197e9788bc2ad6a8f5d10a6ef9
Parents: dd6274c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:11:12 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:11:12 2016 +0100
----------------------------------------------------------------------
example/application/simpleapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3adbf2c7/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index d3c1e53..fec202c 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.13.0-SNAPSHOT</isis.version>
+ <isis.version>1.12.1</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[11/11] isis git commit: ISIS-1335: adding new powered-by page
Posted by da...@apache.org.
ISIS-1335: adding new powered-by page
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a752ed0f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a752ed0f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a752ed0f
Branch: refs/heads/master
Commit: a752ed0f6ba4fa6bf03a7e2661945517191ffcfb
Parents: 5306e05
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 14 13:00:14 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 14 13:00:14 2016 +0100
----------------------------------------------------------------------
.../main/asciidoc/_powered-by_contactapp.adoc | 37 ++++++++++++++++++++
.../src/main/asciidoc/_powered-by_estatio.adoc | 4 +--
.../src/main/asciidoc/powered-by.adoc | 3 +-
3 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a752ed0f/adocs/documentation/src/main/asciidoc/_powered-by_contactapp.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_powered-by_contactapp.adoc b/adocs/documentation/src/main/asciidoc/_powered-by_contactapp.adoc
new file mode 100644
index 0000000..5a70e7f
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/_powered-by_contactapp.adoc
@@ -0,0 +1,37 @@
+[[_powered-by_contactapp]]
+= Contact App
+:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or agreed to in writing, software distributed under the license is distributed on an "as is" basis, without warranties or conditions of any kind, either express or implied. see the license for the specific language governing permissions and limitations under the license.
+:_basedir: ./
+:_imagesdir: images/
+:toc: right
+
+
+The _Contact App_ is a contact management application (like xref:powered-by.adoc#_powered-by_estatio[Estatio]) developed for and deployed at link:http://eurocommercial.com[Eurocommercial].
+
+This app originated out of our users' need to quickly look up different employees of Eurocommercial's.
+At the same time the app managers would need to be able to easily edit or add to the existing contact information.
+We decided to create different Contact Groups consisting of multiple Contacts, each with their role within the group.
+
+image:http://i.imgur.com/j0x7bw8.png[width="97%"]
+
+== Apache Isis with Ionic
+
+Because of the requirements of the app - quick and portable access - we decided to create a mobile app for it
+using the link:http://ionicframework.com/[Ionic Framework]. For the backend we decided to use link:http://isis.apache.org[Apache Isis]
+since this allowed us to rapidly develop the required backend application and surface a REST API to which the
+mobile application could connect. We found that it worked together quite well, and with part of the team
+behind http://github.com/estatio/estatio[Estatio] we were able to create an app that is clear to use and manage.
+
+image:http://i.imgur.com/ETKG6Xe.png[width="32%"]
+image:http://i.imgur.com/zMX6OYq.png[width="32%"]
+image:http://i.imgur.com/qhXhKiu.png[width="32%"]
+
+As our first Apache Isis app making use of mobile technologies it opens the doors for more to follow.
+Ionic has proven easy to learn and build apps with, and has a helpful community. Meanwhile we've used
+Apache Isis' support for link://http://isis.apache.org/guides/ugbtb.html#_ugbtb_view-models_jaxb[JAXB view models]
+and in particular the http://isis.apache.org/guides/ugvro.html#_ugvro_simplified-representations_apache-isis-profile[simplified REST representations] introduced in v1.12.0. The result is code that is easy to follow and enhance.
+
+We expect that the scope of _Contact App_ will expand and new features added, these will (almost certainly) remain open source.
+Meanwhile we're now set up nicely to build further mobile apps using this technology stack.
+
+_Case study provided by Rosco Kalis, for link:[http://incode.org[Incode]_
http://git-wip-us.apache.org/repos/asf/isis/blob/a752ed0f/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc b/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc
index 0b4f63e..8de3cae 100644
--- a/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc
+++ b/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc
@@ -7,7 +7,7 @@
-Estatio is an estate management application being developed for and deployed at link:http://www.eurocommercialproperties.com/[Eurocommercial Properties].
+Estatio is an estate management application developed for and deployed at link:http://www.eurocommercialproperties.com/[Eurocommercial].
Eurocommercial Properties is a Dutch-listed company that owns and operates over 50 shopping centres across Italy, France and Sweden, with income from property of approx. EUR150m per year. Previously the company had used one of the leading software packages for its invoicing;
however this had proven on the one hand lacking in key features/functionality for some locales, while
@@ -37,5 +37,5 @@ The Apache Isis committers are extremely grateful for Eurocommercial's investmen
And to learn a little more about the Estatio domain model itself, take a look at both the source code (of course) and also at https://github.com/estatio/estatio/blob/master/adocs/documentation/src/main/asciidoc/auditability.adoc[this documentation], developed to allow Eurocommercial's accountants to understand and audit the application.
-_Case study provided by Jeroen van der Wal, http://incode.org_
+_Case study provided by Jeroen van der Wal, link:[http://incode.org[Incode]_
http://git-wip-us.apache.org/repos/asf/isis/blob/a752ed0f/adocs/documentation/src/main/asciidoc/powered-by.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/powered-by.adoc b/adocs/documentation/src/main/asciidoc/powered-by.adoc
index 9454d7b..74b1298 100644
--- a/adocs/documentation/src/main/asciidoc/powered-by.adoc
+++ b/adocs/documentation/src/main/asciidoc/powered-by.adoc
@@ -17,14 +17,15 @@ This page catalogues a few notable applications that are powered by Apache Isis
* xref:powered-by.adoc#_powered-by_estatio[Estatio]
* xref:powered-by.adoc#_powered-by_gesconsultor-grc[GESCONSULTOR GRC]
+* xref:powered-by.adoc#_powered-by_contactapp[ContactApp]
* xref:powered-by.adoc#_powered-by_commapp[CommApp]
* xref:powered-by.adoc#_powered-by_transport-planner[TransportPlanner]
If you have written an app in Apache Isis that you'd like to share, please mention it on the link:./support.html[mailing list].
-
include::_powered-by_estatio.adoc[leveloffset=+1]
include::_powered-by_gesconsultor-grc.adoc[leveloffset=+1]
+include::_powered-by_contactapp.adoc[leveloffset=+1]
include::_powered-by_commapp.adoc[leveloffset=+1]
include::_powered-by_transport-planner.adoc[leveloffset=+1]
[08/11] isis git commit: ISIS-1369: adding in tests (taken from
isis-module-security).
Posted by da...@apache.org.
ISIS-1369: adding in tests (taken from isis-module-security).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/565ac811
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/565ac811
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/565ac811
Branch: refs/heads/master
Commit: 565ac811905b8e872649d12a7f017061100a94f7
Parents: 474cb71
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 11 19:01:13 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 11 19:01:13 2016 +0100
----------------------------------------------------------------------
.../appfeat/ApplicationMemberTypeTest.java | 36 ++
.../appfeat/ApplicationFeatureIdTest.java | 604 +++++++++++++++++++
...ApplicationFeatureRepositoryDefaultTest.java | 300 +++++++++
.../appfeat/ApplicationFeatureTest.java | 170 ++++++
.../appfeat/ApplicationFeatureTypeTest.java | 191 ++++++
5 files changed, 1301 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/565ac811/core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
new file mode 100644
index 0000000..e6c53dd
--- /dev/null
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.applib.services.appfeat;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ApplicationMemberTypeTest {
+
+ public static class ToString extends ApplicationMemberTypeTest {
+
+ @Test
+ public void happyCase() throws Exception {
+ assertThat(ApplicationMemberType.PROPERTY.toString(), is("PROPERTY"));
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/565ac811/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
new file mode 100644
index 0000000..53127c7
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -0,0 +1,604 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.services.appfeat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.TreeSet;
+
+import com.google.common.base.Function;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.emptyCollectionOf;
+import static org.junit.Assert.assertThat;
+
+public class ApplicationFeatureIdTest {
+
+ @Rule
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ public static class Title extends ApplicationFeatureIdTest {
+
+ @Test
+ public void happyCase() throws Exception {
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar#foo");
+
+ assertThat(applicationFeatureId.title(), is("com.mycompany.Bar#foo"));
+ }
+ }
+
+ public static class NewPackage extends ApplicationFeatureIdTest {
+
+ @Test
+ public void testNewPackage() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com.mycompany");
+ // then
+ assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.PACKAGE));
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is(nullValue()));
+ assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
+ }
+ }
+
+ public static class NewClass extends ApplicationFeatureIdTest {
+
+ @Test
+ public void testNewClass() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+ // then
+ assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.CLASS));
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
+ }
+ }
+
+ public static class NewMember extends ApplicationFeatureIdTest {
+
+ @Test
+ public void using_fullyQualifiedClassName_and_MemberName() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+ // then
+ assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.MEMBER));
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getMemberName(), is("foo"));
+ }
+
+ @Test
+ public void using_fullyQualifiedName() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar#foo");
+ // then
+ assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.MEMBER));
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getMemberName(), is("foo"));
+ }
+
+ }
+
+ public static class Constructor_AFT_String extends ApplicationFeatureIdTest {
+
+ @Test
+ public void whenPackage() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.PACKAGE, "com.mycompany");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newPackage("com.mycompany")));
+ }
+
+ @Test
+ public void whenClass() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.CLASS, "com.mycompany.Bar");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newClass("com.mycompany.Bar")));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.MEMBER, "com.mycompany.Bar#foo");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newMember("com.mycompany.Bar","foo")));
+ }
+ }
+
+ public static class NewFeature_AFT_String extends ApplicationFeatureIdTest {
+
+ @Test
+ public void whenPackage() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature(ApplicationFeatureType.PACKAGE, "com.mycompany");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newPackage("com.mycompany")));
+ }
+
+ @Test
+ public void whenClass() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature(ApplicationFeatureType.CLASS, "com.mycompany.Bar");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newClass("com.mycompany.Bar")));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature(ApplicationFeatureType.MEMBER, "com.mycompany.Bar#foo");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newMember("com.mycompany.Bar","foo")));
+ }
+ }
+
+ public static class NewFeature_String_String_String extends ApplicationFeatureIdTest {
+
+ @Test
+ public void whenPackage() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature("com.mycompany", null, null);
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newPackage("com.mycompany")));
+ }
+
+ @Test
+ public void whenClass() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature("com.mycompany", "Bar", null);
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newClass("com.mycompany.Bar")));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+ // when
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newFeature("com.mycompany", "Bar", "foo");
+ // then
+ assertThat(applicationFeatureId, is(ApplicationFeatureId.newMember("com.mycompany.Bar","foo")));
+ }
+ }
+
+ public static class GetParentIds extends ApplicationFeatureIdTest {
+
+ @Test
+ public void whenPackageWithNoParent() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com");
+
+ // when
+ final List<ApplicationFeatureId> parentIds = applicationFeatureId.getParentIds();
+
+ // then
+ assertThat(parentIds, emptyCollectionOf(ApplicationFeatureId.class));
+ }
+
+ @Test
+ public void whenPackageWithHasParent() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com.mycompany");
+
+ // when
+ final List<ApplicationFeatureId> parentIds = applicationFeatureId.getParentIds();
+
+ // then
+ assertThat(parentIds, contains(ApplicationFeatureId.newPackage("com")));
+ }
+
+ @Test
+ public void whenPackageWithHasParents() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com.mycompany.bish.bosh");
+
+ // when
+ final List<ApplicationFeatureId> parentIds = applicationFeatureId.getParentIds();
+
+ // then
+ assertThat(parentIds, contains(
+ ApplicationFeatureId.newPackage("com.mycompany.bish"),
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newPackage("com")
+ ));
+ }
+
+ @Test
+ public void whenClassWithParents() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ // when
+ final List<ApplicationFeatureId> parentIds = applicationFeatureId.getParentIds();
+
+ // then
+ assertThat(parentIds, contains(
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newPackage("com")
+ ));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+
+ // when
+ final List<ApplicationFeatureId> parentIds = applicationFeatureId.getParentIds();
+
+ // then
+ assertThat(parentIds, contains(
+ ApplicationFeatureId.newClass("com.mycompany.Bar"),
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newPackage("com")
+ ));
+ }
+
+ }
+
+ public static class GetParentPackageId extends ApplicationFeatureIdTest {
+
+ @Test
+ public void givenPackageWhenParentIsNotRoot() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com.mycompany");
+ // when
+ final ApplicationFeatureId parentPackageId = applicationFeatureId.getParentPackageId();
+ // then
+ assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
+ assertThat(parentPackageId.getPackageName(), is("com"));
+ assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getMemberName(), is(nullValue()));
+ }
+
+ @Test
+ public void givenPackageWhenParentIsRoot() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com");
+ // when
+ final ApplicationFeatureId parentPackageId = applicationFeatureId.getParentPackageId();
+ // then
+ assertThat(parentPackageId, is(nullValue()));
+ }
+
+ @Test
+ public void givenRootPackage() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("");
+ // when
+ final ApplicationFeatureId parentPackageId = applicationFeatureId.getParentPackageId();
+ // then
+ assertThat(parentPackageId, is(nullValue()));
+ }
+
+ @Test
+ public void givenClass() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ // when
+ final ApplicationFeatureId parentPackageId = applicationFeatureId.getParentPackageId();
+
+ // then
+ assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
+ assertThat(parentPackageId.getPackageName(), is("com.mycompany"));
+ assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getMemberName(), is(nullValue()));
+ }
+
+ @Test
+ public void givenClassInRootPackage() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newClass("Bar");
+
+ // when
+ final ApplicationFeatureId parentPackageId = applicationFeatureId.getParentPackageId();
+
+ // then
+ assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
+ assertThat(parentPackageId.getPackageName(), is(""));
+ assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getMemberName(), is(nullValue()));
+ }
+
+ @Test
+ public void givenMember() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+
+ // then
+ expectedException.expect(IllegalStateException.class);
+
+ // when
+ applicationFeatureId.getParentPackageId();
+ }
+
+ }
+
+ public static class GetParentClass extends ApplicationFeatureIdTest {
+
+ @Test
+ public void givenMember() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+
+ // when
+ final ApplicationFeatureId parentClassId = applicationFeatureId.getParentClassId();
+
+ // then
+ assertThat(parentClassId.getType(), is(ApplicationFeatureType.CLASS));
+ assertThat(parentClassId.getPackageName(), is("com.mycompany"));
+ assertThat(parentClassId.getClassName(), is("Bar"));
+ assertThat(parentClassId.getMemberName(), is(nullValue()));
+ }
+
+ @Test
+ public void givenPackage() throws Exception {
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newPackage("com");
+
+ // then
+ expectedException.expect(IllegalStateException.class);
+
+ // when
+ applicationFeatureId.getParentClassId();
+ }
+
+ @Test
+ public void givenClass() throws Exception {
+
+ // given
+ final ApplicationFeatureId applicationFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ // then
+ expectedException.expect(IllegalStateException.class);
+
+ // when
+ applicationFeatureId.getParentClassId();
+ }
+ }
+
+ public static abstract class ValueTypeContractTest extends ValueTypeContractTestAbstract<ApplicationFeatureId> {
+
+ public static class PackageFeatures extends ValueTypeContractTest {
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithSameValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newPackage("com.mycompany"));
+ }
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithDifferentValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newPackage("com.mycompany2"),
+ ApplicationFeatureId.newClass("com.mycompany.Foo"),
+ ApplicationFeatureId.newMember("com.mycompany.Foo#bar"));
+ }
+ }
+
+ public static class ClassFeatures extends ValueTypeContractTest {
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithSameValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newClass("com.mycompany.Foo"),
+ ApplicationFeatureId.newClass("com.mycompany.Foo"));
+ }
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithDifferentValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newClass("com.mycompany.Foo2"),
+ ApplicationFeatureId.newMember("com.mycompany.Foo#bar"));
+ }
+ }
+
+ public static class MemberFeatures extends ValueTypeContractTest {
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithSameValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newMember("com.mycompany.Foo#bar"),
+ ApplicationFeatureId.newMember("com.mycompany.Foo#bar"));
+ }
+
+ @Override
+ protected List<ApplicationFeatureId> getObjectsWithDifferentValue() {
+ return Arrays.asList(
+ ApplicationFeatureId.newPackage("com.mycompany"),
+ ApplicationFeatureId.newClass("com.mycompany.Foo"),
+ ApplicationFeatureId.newMember("com.mycompany.Foo#bar2"));
+ }
+ }
+
+ }
+
+
+ public static class FunctionsTest extends ApplicationFeatureIdTest {
+
+ public static class GET_CLASS_NAME extends FunctionsTest {
+
+ private Function<ApplicationFeatureId, String> func = ApplicationFeatureId.Functions.GET_CLASS_NAME;
+
+ @Test
+ public void whenNull() throws Exception {
+ expectedException.expect(NullPointerException.class);
+ func.apply(null);
+ }
+
+ @Test
+ public void whenPackage() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newPackage("com.mycompany")), is(nullValue()));
+ }
+
+ @Test
+ public void whenClass() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newClass("com.mycompany.Bar")), is("Bar"));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newMember("com.mycompany.Bar#foo")), is("Bar"));
+ }
+
+ }
+
+ public static class GET_MEMBER_NAME extends FunctionsTest {
+
+ private Function<ApplicationFeatureId, String> func = ApplicationFeatureId.Functions.GET_MEMBER_NAME;
+
+ @Test
+ public void whenNull() throws Exception {
+ expectedException.expect(NullPointerException.class);
+ func.apply(null);
+ }
+
+ @Test
+ public void whenPackage() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newPackage("com.mycompany")), is(nullValue()));
+ }
+
+ @Test
+ public void whenClass() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newClass("com.mycompany.Bar")), is(nullValue()));
+ }
+
+ @Test
+ public void whenMember() throws Exception {
+ assertThat(func.apply(ApplicationFeatureId.newMember("com.mycompany.Bar#foo")), is("foo"));
+ }
+
+ }
+
+ }
+
+ public static class PredicatesTest extends ApplicationFeatureIdTest {
+
+ public static class IsClassContaining extends PredicatesTest {
+
+ private ApplicationMemberType memberType;
+
+ @Mock
+ private ApplicationFeatureRepositoryDefault mockApplicationFeatureRepository;
+ @Mock
+ private ApplicationFeature mockApplicationFeature;
+
+ @Test
+ public void whenNull() throws Exception {
+ expectedException.expect(NullPointerException.class);
+
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(null);
+ }
+
+ @Test
+ public void whenNotClass() throws Exception {
+ assertThat(
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(ApplicationFeatureId.newPackage("com.mycompany")),
+ is(false));
+ assertThat(
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(ApplicationFeatureId.newMember("com.mycompany.Bar#foo")),
+ is(false));
+ }
+
+ @Test
+ public void whenClassButFeatureNotFound() throws Exception {
+ final ApplicationFeatureId classFeature = ApplicationFeatureId.newClass("com.mycompany.Bar");
+ context.checking(new Expectations() {{
+ allowing(mockApplicationFeatureRepository).findFeature(classFeature);
+ will(returnValue(null));
+ }});
+
+ assertThat(
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(classFeature),
+ is(false));
+ }
+ @Test
+ public void whenClassAndFeatureNotFoundButHasNoMembersOfType() throws Exception {
+ final ApplicationFeatureId classFeature = ApplicationFeatureId.newClass("com.mycompany.Bar");
+ context.checking(new Expectations() {{
+ oneOf(mockApplicationFeatureRepository).findFeature(classFeature);
+ will(returnValue(mockApplicationFeature));
+
+ allowing(mockApplicationFeature).membersOf(ApplicationMemberType.ACTION);
+ will(returnValue(new TreeSet<>()));
+ }});
+
+ assertThat(
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(classFeature),
+ is(false));
+ }
+ @Test
+ public void whenClassAndFeatureNotFoundAndHasMembersOfType() throws Exception {
+ final ApplicationFeatureId classFeature = ApplicationFeatureId.newClass("com.mycompany.Bar");
+ context.checking(new Expectations() {{
+ oneOf(mockApplicationFeatureRepository).findFeature(classFeature);
+ will(returnValue(mockApplicationFeature));
+
+ allowing(mockApplicationFeature).membersOf(ApplicationMemberType.ACTION);
+ will(returnValue(new TreeSet<ApplicationFeatureId>() {{
+ add(ApplicationFeatureId.newMember("com.mycompany.Bar#foo"));
+ }}));
+ }});
+
+ assertThat(
+ ApplicationFeatureId.Predicates.
+ isClassContaining(ApplicationMemberType.ACTION, mockApplicationFeatureRepository).
+ apply(classFeature),
+ is(true));
+ }
+ }
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/565ac811/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
new file mode 100644
index 0000000..5217299
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -0,0 +1,300 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.services.appfeat;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import org.hamcrest.Matchers;
+import org.jmock.Expectations;
+import org.jmock.Sequence;
+import org.jmock.auto.Mock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.applib.annotation.ActionSemantics;
+import org.apache.isis.applib.annotation.When;
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.facets.properties.typicallen.annotation.TypicalLengthFacetOnPropertyAnnotation;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.Contributed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+
+public class ApplicationFeatureRepositoryDefaultTest {
+
+ @Rule
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+
+ @Mock
+ ObjectSpecification mockSpec;
+ @Mock
+ OneToOneAssociation mockProp;
+ @Mock
+ OneToManyAssociation mockColl;
+ @Mock
+ ObjectAction mockAct;
+ ObjectAction mockActThatIsHidden;
+
+ @Mock
+ DomainObjectContainer mockContainer;
+
+ @Mock
+ ServicesInjector mockServicesInjector;
+
+ ApplicationFeatureRepositoryDefault applicationFeatureRepository;
+
+ @Before
+ public void setUp() throws Exception {
+ applicationFeatureRepository = new ApplicationFeatureRepositoryDefault();
+ applicationFeatureRepository.container = mockContainer;
+ applicationFeatureRepository.setServicesInjector(mockServicesInjector);
+ applicationFeatureRepository.applicationFeatureFactory = new ApplicationFeatureFactory();
+
+
+ mockActThatIsHidden = context.mock(ObjectAction.class, "mockActThatIsHidden");
+ }
+
+ public static class Load extends ApplicationFeatureRepositoryDefaultTest {
+
+ public static class Bar {}
+
+ @Ignore // considering deleting this test, it's too long and too fragile. integ tests ought to suffice.
+ @Test
+ public void happyCase() throws Exception {
+
+ final List<ObjectAssociation> properties = Lists.<ObjectAssociation>newArrayList(mockProp);
+ final List<ObjectAssociation> collections = Lists.<ObjectAssociation>newArrayList(mockColl);
+ final List<ObjectAction> actions = Lists.newArrayList(mockAct, mockActThatIsHidden);
+
+ context.checking(new Expectations() {{
+ allowing(mockSpec).isAbstract();
+ will(returnValue(false));
+
+ allowing(mockSpec).getFullIdentifier();
+ will(returnValue(Bar.class.getName()));
+
+ allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Filters.PROPERTIES));
+ will(returnValue(properties));
+
+ allowing(mockSpec).getAssociations(with(Contributed.INCLUDED), with(ObjectAssociation.Filters.COLLECTIONS));
+ will(returnValue(collections));
+
+ allowing(mockSpec).getFacet(HiddenFacet.class);
+ will(returnValue(new HiddenFacetAbstract(When.ALWAYS, Where.EVERYWHERE, mockSpec) {
+ @Override
+ protected String hiddenReason(final ObjectAdapter target, final Where whereContext) {
+ return null;
+ }
+ }));
+
+ allowing(mockSpec).getCorrespondingClass();
+ will(returnValue(Bar.class));
+
+ allowing(mockSpec).getObjectActions(with(Contributed.INCLUDED));
+ will(returnValue(actions));
+
+ allowing(mockProp).getId();
+ will(returnValue("someProperty"));
+
+ allowing(mockProp).getFacet(MaxLengthFacet.class);
+ will(returnValue(new MaxLengthFacetAbstract(30, mockProp){}));
+
+ allowing(mockProp).getFacet(TypicalLengthFacet.class);
+ will(returnValue(new TypicalLengthFacetOnPropertyAnnotation(15, mockProp)));
+
+ allowing(mockProp).isAlwaysHidden();
+ will(returnValue(false));
+
+ allowing(mockColl).getId();
+ will(returnValue("someCollection"));
+
+ allowing(mockColl).isAlwaysHidden();
+ will(returnValue(false));
+
+ allowing(mockAct).getId();
+ will(returnValue("someAction"));
+
+ allowing(mockAct).isAlwaysHidden();
+ will(returnValue(false));
+
+ allowing(mockAct).getSemantics();
+ will(returnValue(ActionSemantics.Of.SAFE));
+
+ allowing(mockActThatIsHidden).getId();
+ will(returnValue("someActionThatIsHidden"));
+
+ allowing(mockActThatIsHidden).isAlwaysHidden();
+ will(returnValue(true));
+
+ allowing(mockActThatIsHidden).getSemantics();
+ will(returnValue(ActionSemantics.Of.SAFE));
+
+ allowing(mockServicesInjector).getRegisteredServices();
+ will(returnValue(Lists.newArrayList()));
+ }});
+
+ // then
+ final Sequence sequence = context.sequence("loadSequence");
+ context.checking(new Expectations() {{
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newClass(Bar.class.getName()))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newMember(Bar.class.getName(), "someProperty"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newMember(Bar.class.getName(), "someCollection"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newMember(Bar.class.getName(), "someAction"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org.isisaddons.module.security.dom.feature"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org.isisaddons.module.security.dom"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org.isisaddons.module.security"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org.isisaddons.module"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org.isisaddons"))));
+
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ inSequence(sequence);
+ will(returnValue(new ApplicationFeature(ApplicationFeatureId.newPackage("org"))));
+ }});
+
+ // when
+ applicationFeatureRepository.createApplicationFeaturesFor(mockSpec);
+
+ // then
+ final ApplicationFeature orgPkg = applicationFeatureRepository.findPackage(ApplicationFeatureId.newPackage("org"));
+ assertThat(orgPkg, is(notNullValue()));
+ final ApplicationFeature orgIsisaddonsPkg = applicationFeatureRepository.findPackage(ApplicationFeatureId.newPackage("org.isisaddons"));
+ assertThat(orgPkg, is(notNullValue()));
+ final ApplicationFeature featurePkg = applicationFeatureRepository.findPackage(ApplicationFeatureId.newPackage("org.isisaddons.module.security.dom.feature"));
+ assertThat(orgPkg, is(notNullValue()));
+ assertThat(orgPkg.getContents(), contains(orgIsisaddonsPkg.getFeatureId()));
+ assertThat(featurePkg.getContents(), contains(ApplicationFeatureId.newClass(Bar.class.getName())));
+
+ // then
+ final ApplicationFeature barClass = applicationFeatureRepository.findClass(ApplicationFeatureId.newClass(Bar.class.getName()));
+ assertThat(barClass, is(Matchers.notNullValue()));
+
+ // then the mockActThatIsHidden is not listed.
+ assertThat(barClass.getProperties().size(), is(1));
+ assertThat(barClass.getCollections().size(), is(1));
+ assertThat(barClass.getActions().size(), is(1));
+ assertThat(barClass.getProperties(),
+ containsInAnyOrder(
+ ApplicationFeatureId.newMember(Bar.class.getName(), "someProperty")
+ ));
+ assertThat(barClass.getCollections(),
+ containsInAnyOrder(
+ ApplicationFeatureId.newMember(Bar.class.getName(), "someCollection")
+ ));
+ assertThat(barClass.getActions(),
+ containsInAnyOrder(
+ ApplicationFeatureId.newMember(Bar.class.getName(), "someAction")
+ ));
+ }
+
+ }
+
+ public static class AddClassParent extends ApplicationFeatureRepositoryDefaultTest {
+
+ @Test
+ public void parentNotYetEncountered() throws Exception {
+
+ // given
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ // then
+ final ApplicationFeature newlyCreatedParent = new ApplicationFeature();
+ context.checking(new Expectations() {{
+ oneOf(mockContainer).newTransientInstance(ApplicationFeature.class);
+ will(returnValue(newlyCreatedParent));
+ }});
+
+ // when
+ final ApplicationFeatureId classParentId = applicationFeatureRepository.addClassParent(classFeatureId);
+
+ // then
+ Assert.assertThat(classParentId, is(equalTo(classFeatureId.getParentPackageId())));
+ final ApplicationFeature classPackage = applicationFeatureRepository.findPackage(classParentId);
+ assertThat(classPackage, is(newlyCreatedParent));
+ }
+
+ @Test
+ public void parentAlreadyEncountered() throws Exception {
+
+ // given
+ final ApplicationFeatureId packageId = ApplicationFeatureId.newPackage("com.mycompany");
+ final ApplicationFeature pkg = new ApplicationFeature();
+ pkg.setFeatureId(packageId);
+ applicationFeatureRepository.packageFeatures.put(packageId, pkg);
+
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ // when
+ final ApplicationFeatureId applicationFeatureId = applicationFeatureRepository.addClassParent(classFeatureId);
+
+ // then
+ Assert.assertThat(applicationFeatureId, is(equalTo(packageId)));
+ }
+
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/565ac811/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
new file mode 100644
index 0000000..e439b3b
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.services.appfeat;
+
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
+
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.Assert.assertThat;
+
+public class ApplicationFeatureTest {
+
+ public static class GetContents_and_AddToContents extends ApplicationFeatureTest {
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void givenPackage_whenAddPackageAndClass() throws Exception {
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newPackage("com.mycompany"));
+ final ApplicationFeatureId packageFeatureId = ApplicationFeatureId.newPackage("com.mycompany.flob");
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+ applicationFeature.addToContents(packageFeatureId);
+ applicationFeature.addToContents(classFeatureId);
+
+ assertThat(applicationFeature.getContents().size(), is(2));
+ assertThat(applicationFeature.getContents(), containsInAnyOrder(packageFeatureId, classFeatureId));
+ }
+
+ @Test
+ public void givenPackage_whenAddMember() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newPackage("com.mycompany"));
+ final ApplicationFeatureId memberFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+
+ applicationFeature.addToContents(memberFeatureId);
+ }
+
+ @Test
+ public void givenClass() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newClass("com.mycompany.Bar"));
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.flob.Bar");
+
+ applicationFeature.addToContents(classFeatureId);
+ }
+
+ @Test
+ public void givenMember() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newMember("com.mycompany.Bar", "foo"));
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.flob.Bar");
+
+ applicationFeature.addToContents(classFeatureId);
+ }
+
+ }
+
+ public static class GetMembers_and_AddToMembers extends ApplicationFeatureTest {
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void givenPackage() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newPackage("com.mycompany"));
+ final ApplicationFeatureId memberFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+
+ applicationFeature.addToMembers(memberFeatureId, ApplicationMemberType.PROPERTY);
+ }
+
+ @Test
+ public void givenClass_whenAddMember() throws Exception {
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newClass("com.mycompany.Bar"));
+ final ApplicationFeatureId memberFeatureId = ApplicationFeatureId.newMember("com.mycompany.Bar", "foo");
+ final ApplicationFeatureId memberFeatureId2 = ApplicationFeatureId.newMember("com.mycompany.Bar", "boz");
+
+ applicationFeature.addToMembers(memberFeatureId, ApplicationMemberType.PROPERTY);
+ applicationFeature.addToMembers(memberFeatureId2, ApplicationMemberType.PROPERTY);
+
+ assertThat(applicationFeature.getProperties().size(), is(2));
+ assertThat(applicationFeature.getProperties(), containsInAnyOrder(memberFeatureId, memberFeatureId2));
+ }
+
+ @Test
+ public void givenClass_whenAddPackage() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newClass("com.mycompany.Bar"));
+ final ApplicationFeatureId packageFeatureId = ApplicationFeatureId.newPackage("com.mycompany");
+
+ applicationFeature.addToMembers(packageFeatureId, ApplicationMemberType.PROPERTY);
+ }
+
+ @Test
+ public void givenClass_whenAddClass() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newClass("com.mycompany.Bar"));
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bop");
+
+ applicationFeature.addToMembers(classFeatureId, ApplicationMemberType.PROPERTY);
+ }
+
+ @Test
+ public void givenMember() throws Exception {
+
+ expectedException.expect(IllegalStateException.class);
+
+ final ApplicationFeature applicationFeature = new ApplicationFeature(ApplicationFeatureId.newMember("com.mycompany.Bar", "foo"));
+ final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.flob.Bar");
+
+ applicationFeature.addToMembers(classFeatureId, ApplicationMemberType.PROPERTY);
+ }
+ }
+
+
+ public static class FunctionsTest extends ApplicationFeatureTest {
+
+ @Test
+ public void GET_FQN() throws Exception {
+ final ApplicationFeature input = new ApplicationFeature(ApplicationFeatureId.newMember("com.mycompany.Foo#bar"));
+ assertThat(ApplicationFeature.Functions.GET_FQN.apply(input), is("com.mycompany.Foo#bar"));
+ }
+ @Test
+ public void GET_ID() throws Exception {
+ final ApplicationFeatureId featureId = ApplicationFeatureId.newMember("com.mycompany.Foo#bar");
+ final ApplicationFeature input = new ApplicationFeature(featureId);
+ assertThat(ApplicationFeature.Functions.GET_ID.apply(input), is(featureId));
+ }
+ }
+
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/565ac811/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
new file mode 100644
index 0000000..1f00249
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.services.appfeat;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+public class ApplicationFeatureTypeTest {
+
+ public static class HideClassName extends ApplicationFeatureTypeTest {
+ @Test
+ public void all() throws Exception {
+ assertThat(ApplicationFeatureType.PACKAGE.hideClassName(), is(true));
+ assertThat(ApplicationFeatureType.CLASS.hideClassName(), is(false));
+ assertThat(ApplicationFeatureType.MEMBER.hideClassName(), is(false));
+ }
+ }
+
+ public static class HideMemberName extends ApplicationFeatureTypeTest {
+
+ @Test
+ public void all() throws Exception {
+ assertThat(ApplicationFeatureType.PACKAGE.hideMember(), is(true));
+ assertThat(ApplicationFeatureType.CLASS.hideMember(), is(true));
+ assertThat(ApplicationFeatureType.MEMBER.hideMember(), is(false));
+ }
+ }
+
+ public static class Init extends ApplicationFeatureTypeTest {
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void givenPackage() throws Exception {
+
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.PACKAGE);
+
+ ApplicationFeatureType.PACKAGE.init(applicationFeatureId, "com.mycompany");
+
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is(nullValue()));
+ assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
+
+ }
+ @Test
+ public void givenClass() throws Exception {
+
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.CLASS);
+
+ ApplicationFeatureType.CLASS.init(applicationFeatureId, "com.mycompany.Bar");
+
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
+
+ }
+ @Test
+ public void givenMember() throws Exception {
+
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.MEMBER);
+
+ ApplicationFeatureType.MEMBER.init(applicationFeatureId, "com.mycompany.Bar#foo");
+
+ assertThat(applicationFeatureId.getPackageName(), is("com.mycompany"));
+ assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getMemberName(), is("foo"));
+ }
+ @Test
+ public void givenMemberMalformed() throws Exception {
+
+ expectedException.expect(IllegalArgumentException.class);
+ final ApplicationFeatureId applicationFeatureId = new ApplicationFeatureId(ApplicationFeatureType.MEMBER);
+
+ ApplicationFeatureType.MEMBER.init(applicationFeatureId, "com.mycompany.BarISMISSINGTHEHASHSYMBOL");
+ }
+ }
+
+ public static class EnsurePackage extends ApplicationFeatureTypeTest {
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void whenPackage() throws Exception {
+ ApplicationFeatureType.ensurePackage(new ApplicationFeatureId(ApplicationFeatureType.PACKAGE));
+ }
+ @Test
+ public void whenClass() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensurePackage(new ApplicationFeatureId(ApplicationFeatureType.CLASS));
+ }
+ @Test
+ public void whenMember() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensurePackage(new ApplicationFeatureId(ApplicationFeatureType.MEMBER));
+ }
+ }
+
+ public static class EnsurePackageOrClass extends ApplicationFeatureTypeTest {
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void whenPackage() throws Exception {
+ ApplicationFeatureType.ensurePackageOrClass(new ApplicationFeatureId(ApplicationFeatureType.PACKAGE));
+ }
+ @Test
+ public void whenClass() throws Exception {
+ ApplicationFeatureType.ensurePackageOrClass(new ApplicationFeatureId(ApplicationFeatureType.CLASS));
+ }
+ @Test
+ public void whenMember() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensurePackageOrClass(new ApplicationFeatureId(ApplicationFeatureType.MEMBER));
+ }
+
+ }
+
+ public static class EnsureClass extends ApplicationFeatureTypeTest {
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void whenPackage() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensureClass(new ApplicationFeatureId(ApplicationFeatureType.PACKAGE));
+ }
+ @Test
+ public void whenClass() throws Exception {
+ ApplicationFeatureType.ensureClass(new ApplicationFeatureId(ApplicationFeatureType.CLASS));
+ }
+ @Test
+ public void whenMember() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensureClass(new ApplicationFeatureId(ApplicationFeatureType.MEMBER));
+ }
+
+ }
+
+ public static class EnsureMember extends ApplicationFeatureTypeTest {
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Test
+ public void whenPackage() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensureMember(new ApplicationFeatureId(ApplicationFeatureType.PACKAGE));
+ }
+ @Test
+ public void whenClass() throws Exception {
+ expectedException.expect(IllegalStateException.class);
+ ApplicationFeatureType.ensureMember(new ApplicationFeatureId(ApplicationFeatureType.CLASS));
+ }
+ @Test
+ public void whenMember() throws Exception {
+ ApplicationFeatureType.ensureMember(new ApplicationFeatureId(ApplicationFeatureType.MEMBER));
+ }
+ }
+
+ public static class ToString extends ApplicationFeatureTypeTest {
+
+ @Test
+ public void happyCase() throws Exception {
+ assertThat(ApplicationFeatureType.PACKAGE.toString(), is("PACKAGE"));
+ }
+ }
+
+}
\ No newline at end of file
[03/11] isis git commit: ISIS-1362: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-1362: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd6274ca
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd6274ca
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd6274ca
Branch: refs/heads/master
Commit: dd6274caa7ef6247bda0a75e717312f749799933
Parents: cae8df3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:09:08 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:09:08 2016 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 ++--
.../simpleapp/src/main/resources/archetype-resources/dom/pom.xml | 2 +-
.../src/main/resources/archetype-resources/integtests/pom.xml | 2 +-
.../simpleapp/src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/test/resources/projects/basic/archetype.properties | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index b74afaa..89551e5 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index fbaca0c..9b75a5e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -180,7 +180,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0.20150826</version>
+ <version>19.0</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
index 84f8899..63d740f 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
@@ -119,7 +119,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0.1</version>
+ <version>19.0</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index a35dbac..71cb3b4 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,11 +32,11 @@
</prerequisites>
<properties>
- <isis.version>1.12.0</isis.version>
+ <isis.version>1.12.1</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <assertj-core.version>2.0.0</assertj-core.version>
+ <assertj-core.version>2.4.0</assertj-core.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/isis/blob/dd6274ca/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 1c3daeb..33bf84a 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Fri Mar 25 10:54:14 GMT 2016
+#Sat Apr 09 07:08:53 BST 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[10/11] isis git commit: ISIS-1362: fixing merge issue
Posted by da...@apache.org.
ISIS-1362: fixing merge issue
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5306e051
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5306e051
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5306e051
Branch: refs/heads/master
Commit: 5306e051c7d744b7bf3cbde546b4aacb94b1c26a
Parents: 974c8a8 9846e43
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Apr 12 08:38:30 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Apr 12 08:38:30 2016 +0100
----------------------------------------------------------------------
.../simpleapp/src/main/resources/archetype-resources/dom/pom.xml | 2 +-
.../src/main/resources/archetype-resources/integtests/pom.xml | 2 +-
.../simpleapp/src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/test/resources/projects/basic/archetype.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------