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/10/21 15:00:55 UTC
[01/44] isis git commit: ISIS-1470: updates pom.xml from
1.14.0-SNAPSHOT to 1.13.1-SNAPSHOT
Repository: isis
Updated Branches:
refs/heads/master d023786e7 -> d89a12611
ISIS-1470: updates pom.xml from 1.14.0-SNAPSHOT to 1.13.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f264a797
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f264a797
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f264a797
Branch: refs/heads/master
Commit: f264a797578f5764c4046511380fb7d71e5c0ea3
Parents: 9772654
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 14 12:35:02 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 14 12:35:02 2016 +0100
----------------------------------------------------------------------
adocs/documentation/pom.xml | 2 +-
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 | 64 ++++++++++----------
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 +-
example/application/simpleapp/app/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 4 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
29 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/adocs/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index c6627c9..8c34857 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.isis.docs</groupId>
<artifactId>isis-documentation</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 7e93ae8..b7eef02 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a834871..3a2061d 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 41fa92b..ca20444 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 99ff1a2..93d4119 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 69be87e..6273e63 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3f45024..66cfce5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -1082,13 +1082,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1097,14 +1097,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1113,14 +1113,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1129,7 +1129,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1138,14 +1138,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1154,40 +1154,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1195,36 +1195,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1233,12 +1233,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
@@ -1246,41 +1246,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1290,7 +1290,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index e70fb3b..a6eed59 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index d6e40ef..1918a33 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 93d8e2a..48d9308 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index c89b85e..b0589df 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 008ecd6..a7b6f35 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 23dd13e..63504ea 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index 53f7d79..ab5c695 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 3060db5..891b199 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 3611539..f1c6737 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 704cf32..69903e9 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 56a1232..55c20e8 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 0aa91b0..06b2b3d 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index c7ebe31..f28816a 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index a7172cc..43d2f62 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index c8223a5..4384f19 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/app/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/pom.xml b/example/application/simpleapp/app/pom.xml
index 23eba68..1e827ef 100644
--- a/example/application/simpleapp/app/pom.xml
+++ b/example/application/simpleapp/app/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-app</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index d65bf4c..b1fd337 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/pom.xml b/example/application/simpleapp/fixture/pom.xml
index f992662..6231416 100644
--- a/example/application/simpleapp/fixture/pom.xml
+++ b/example/application/simpleapp/fixture/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index eb9bf97..7cb0d5c 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 1bbb74a..af4bca5 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<name>Simple App</name>
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.14.0-SNAPSHOT</isis.version>
+ <isis.version>1.13.1-SNAPSHOT</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index a6839d1..d866717 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f264a797/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index d2f508a..657f73d 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.14.0-SNAPSHOT</version>
+ <version>1.13.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
[43/44] isis git commit: Merge branch 'maint-1.13.1'
Posted by da...@apache.org.
Merge branch 'maint-1.13.1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/01e81010
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/01e81010
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/01e81010
Branch: refs/heads/master
Commit: 01e81010a8f5dde146ec44eed8f2fefc21d6de25
Parents: aeaaeca 43a2bd5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 21 15:40:18 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 21 15:40:18 2016 +0100
----------------------------------------------------------------------
adocs/documentation/pom.xml | 2 +-
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 | 64 ++++++++++----------
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 +-
example/application/simpleapp/app/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 4 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
29 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/01e81010/core/maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/01e81010/core/pom.xml
----------------------------------------------------------------------
[28/44] isis git commit: ISIS-1494: EmailNotificationServiceDefault
now uses EmailService (interface) rather than the concrete default impl
Posted by da...@apache.org.
ISIS-1494: EmailNotificationServiceDefault now uses EmailService (interface) rather than the concrete default impl
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d532abc8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d532abc8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d532abc8
Branch: refs/heads/master
Commit: d532abc8c6f576521e683efde40ad5f1a8dcc4e0
Parents: c8f5655
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 18:15:14 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 18:15:14 2016 +0100
----------------------------------------------------------------------
.../services/userreg/EmailNotificationServiceDefault.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d532abc8/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
index 12fc4b8..679b204 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -23,20 +23,23 @@ import java.net.URL;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
+
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.events.EmailEventAbstract;
import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent;
import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
-import org.apache.isis.core.runtime.services.email.EmailServiceDefault;
import static java.util.regex.Pattern.compile;
import static java.util.regex.Pattern.quote;
@@ -172,7 +175,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//region > dependencies
@javax.inject.Inject
- private EmailServiceDefault emailService;
+ private EmailService emailService;
//endregion
}
[15/44] isis git commit: ISIS-1465: yet another attempt to fix
.travis.yml
Posted by da...@apache.org.
ISIS-1465: yet another attempt to fix .travis.yml
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2f0226b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2f0226b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2f0226b
Branch: refs/heads/master
Commit: b2f0226b551a7ccba4435ce03985e2d35af2f946
Parents: 4c0f2e4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:45:48 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:45:48 2016 +0200
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b2f0226b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a3950e8..ae5c5a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,5 @@ language: java
jdk:
- oraclejdk8
install:
+ -
script: "mvn clean install -Dskip.app -Dskip.arch"
[40/44] isis git commit: ISIS-1519: deprecates JdoColumnLength in the
applib
Posted by da...@apache.org.
ISIS-1519: deprecates JdoColumnLength in the applib
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/43a2bd58
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/43a2bd58
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/43a2bd58
Branch: refs/heads/master
Commit: 43a2bd58da55b3e0aa2e2ffc3c05f57eac2598a9
Parents: 00ef021
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 16 07:35:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 16 07:35:28 2016 +0100
----------------------------------------------------------------------
.../jdo/applib/service/JdoColumnLength.java | 110 ++++++++++++++++++-
1 file changed, 104 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/43a2bd58/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
index 0a863d3..02b4298 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
@@ -18,55 +18,153 @@
*/
package org.apache.isis.objectstore.jdo.applib.service;
+/**
+ * @deprecated
+ */
+@Deprecated
public final class JdoColumnLength {
private JdoColumnLength() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TRANSACTION_ID = 36;
- // ie OID str (based on the defacto limit of a request URL in web browsers such as IE8)
- public final static int BOOKMARK = 2000;
+
+ /**
+ * ie OID str (based on the defacto limit of a request URL in web browsers such as IE8)
+ *
+ * @deprecated
+ */
+ @Deprecated
+ public final static int BOOKMARK = 2000;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int MEMBER_IDENTIFIER = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int USER_NAME = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TARGET_CLASS = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TARGET_ACTION = 50;
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int DESCRIPTION = 254;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class SettingAbstract {
private SettingAbstract(){}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int SETTING_KEY = 128;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int SETTING_TYPE = 20;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int VALUE_RAW = 255;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class Command {
private Command() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int EXECUTE_IN = 10;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class AuditEntry {
private AuditEntry() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int PROPERTY_ID = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int PROPERTY_VALUE = 255;
}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class PublishedEvent {
private PublishedEvent() {
}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int TITLE = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int EVENT_TYPE = 20;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int STATE = 20;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class StatusMessage {
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int MESSAGE = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int URI = BOOKMARK;
}
[35/44] isis git commit: ISIS-1508: makes the clean up functionality
within IsisTransactionRule (as used by integ tests) more robust to a badly
behaving test.
Posted by da...@apache.org.
ISIS-1508: makes the clean up functionality within IsisTransactionRule (as used by integ tests) more robust to a badly behaving test.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/89886e0c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/89886e0c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/89886e0c
Branch: refs/heads/master
Commit: 89886e0c1743f66d625078200071928d1975e9a6
Parents: f3f53f6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 30 09:03:59 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 30 09:11:32 2016 +0100
----------------------------------------------------------------------
.../IntegrationTestAbstract.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/89886e0c/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
index c9ee2ea..935577d 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
@@ -39,6 +39,7 @@ import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.specsupport.scenarios.ScenarioExecution;
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -214,6 +215,10 @@ public abstract class IntegrationTestAbstract {
isft.endTran();
isft.nextSession();
} catch(final Throwable e) {
+
+ // if test failed to clean up after itself, then take care of it here.
+ endTransactionTilDone();
+
isft.nextSession();
final List<Throwable> causalChain = Throwables.getCausalChain(e);
// if underlying cause is an applib-defined exception, throw that rather than Isis' wrapper exception
@@ -226,6 +231,21 @@ public abstract class IntegrationTestAbstract {
throw e;
}
}
+
+ protected void endTransactionTilDone() {
+ IsisTransactionManager tranMgr = isft.getIsisSessionFactory().getCurrentSession()
+ .getPersistenceSession().getTransactionManager();
+ int count = 0;
+ while(tranMgr.getTransactionLevel() > 0 &&
+ count++ < 10 // just in case, to prevent an infinite loop...
+ ) {
+ try {
+ tranMgr.endTransaction();
+ } catch(Exception ignore) {
+ // ignore
+ }
+ }
+ }
};
}
}
[44/44] isis git commit: ISIS-1521: bumping versions to
1.14.0-SNAPSHOT
Posted by da...@apache.org.
ISIS-1521: bumping versions to 1.14.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d89a1261
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d89a1261
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d89a1261
Branch: refs/heads/master
Commit: d89a12611306f4e8af6a612a337400d152df7d66
Parents: 01e8101
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 21 15:51:51 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 21 15:51:51 2016 +0100
----------------------------------------------------------------------
adocs/documentation/pom.xml | 2 +-
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 | 64 ++++++++++----------
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 +-
example/application/simpleapp/app/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
29 files changed, 62 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/adocs/documentation/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 8c34857..c6627c9 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.isis.docs</groupId>
<artifactId>isis-documentation</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index a2a1d41..0679a79 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 3a2061d..a834871 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index ca20444..41fa92b 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 9287021..75fc5fe 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 6273e63..69be87e 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b77590f..a02eaad 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -1082,13 +1082,13 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1097,14 +1097,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1113,14 +1113,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1129,7 +1129,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1138,14 +1138,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1154,40 +1154,40 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<!-- not scope=test, because referenced by some sql-tests-common under compile scope -->
</dependency>
@@ -1195,36 +1195,36 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1233,12 +1233,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
@@ -1246,41 +1246,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-applib</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-model</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.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.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-wicket-impl</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1290,7 +1290,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
<!-- JodaTime -->
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index a6eed59..e70fb3b 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/schema/pom.xml
----------------------------------------------------------------------
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 1918a33..d6e40ef 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/security-shiro/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 48d9308..93d8e2a 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/security/pom.xml
----------------------------------------------------------------------
diff --git a/core/security/pom.xml b/core/security/pom.xml
index b0589df..c89b85e 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/specsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index a7b6f35..008ecd6 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 63504ea..23dd13e 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-restfulobjects-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index ab5c695..53f7d79 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-restfulobjects-rendering/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 891b199..3060db5 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-restfulobjects-server/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index f1c6737..3611539 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index 69903e9..704cf32 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-wicket-impl/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 55c20e8..56a1232 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 06b2b3d..0aa91b0 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index f28816a..c7ebe31 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.viewer</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 43d2f62..a7172cc 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/core/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 4384f19..c8223a5 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.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/app/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/pom.xml b/example/application/simpleapp/app/pom.xml
index 1e827ef..23eba68 100644
--- a/example/application/simpleapp/app/pom.xml
+++ b/example/application/simpleapp/app/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-app</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index b1fd337..d65bf4c 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-dom</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/pom.xml b/example/application/simpleapp/fixture/pom.xml
index 6231416..f992662 100644
--- a/example/application/simpleapp/fixture/pom.xml
+++ b/example/application/simpleapp/fixture/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index 7cb0d5c..eb9bf97 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index af4bca5..1c15b91 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<name>Simple App</name>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index d866717..a6839d1 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.13.1-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/d89a1261/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 657f73d..657589e 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0</version>
+ <version>1.14.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
[34/44] isis git commit: EST-1507: fixes unit test for
QueryResultsCache
Posted by da...@apache.org.
EST-1507: fixes unit test for QueryResultsCache
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f3f53f63
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f3f53f63
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f3f53f63
Branch: refs/heads/master
Commit: f3f53f63cc20996ee2b45388b3ebdcf0460493d4
Parents: f6976b1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 30 09:09:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 30 09:11:24 2016 +0100
----------------------------------------------------------------------
.../QueryResultsCacheTest.java | 43 ++++++++++++++++++--
1 file changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f3f53f63/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
index d5210dd..d0e99cf 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
@@ -16,22 +16,30 @@
*/
package org.apache.isis.applib.services.queryresultscache;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.events.system.FixturesInstallingEvent;
+import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class QueryResultsCacheTest {
private QueryResultsCache queryResultsCache;
+ QueryResultsCache.Control control;
+
@Before
public void setUp() throws Exception {
queryResultsCache = new QueryResultsCache();
+ control = new QueryResultsCache.Control();
+ queryResultsCache.control = control;
}
+
@Test
public void execute() {
@@ -80,4 +88,33 @@ public class QueryResultsCacheTest {
assertThat(i[0], is(5));
}
+ @Test
+ public void cachingDisabled() {
+
+ // given fixtures installing, hence caching disabled
+ control.on(new FixturesInstallingEvent(new FixtureScriptsDefault()));
+
+ final int[] i = new int[]{0};
+
+ Callable<String> callable = new Callable<String>(){
+
+ @Override
+ public String call() throws Exception {
+ i[0]++;
+ return "foo";
+ }
+
+ };
+
+ // when, then (a cache miss)
+ assertThat(i[0], is(0));
+ assertThat(queryResultsCache.execute(callable, QueryResultsCacheTest.class, "caching", "a","b",1,2), is("foo"));
+ assertThat(i[0], is(1));
+
+ // when, then should also be a cache miss - would've been a hit previously
+ assertThat(queryResultsCache.execute(callable, QueryResultsCacheTest.class, "caching", "a","b",1,2), is("foo"));
+ assertThat(i[0], is(2));
+
+ }
+
}
[17/44] isis git commit: ISIS-1465: fixes error in last commit on the
simpleapp archetype
Posted by da...@apache.org.
ISIS-1465: fixes error in last commit on the simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b6245475
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b6245475
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b6245475
Branch: refs/heads/master
Commit: b6245475b2b625ef043854cc4e511d9a9a22b31c
Parents: 8e6baa2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 16 13:09:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 16 13:10:34 2016 +0100
----------------------------------------------------------------------
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b6245475/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index b789f3a..69e36b8 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
- simpleObject = new SimpleObject(null);
+ simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
[30/44] isis git commit: ISIS-1502: previous fix wasn't correctly
handling nested transactions
Posted by da...@apache.org.
ISIS-1502: previous fix wasn't correctly handling nested transactions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/364a1aac
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/364a1aac
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/364a1aac
Branch: refs/heads/master
Commit: 364a1aac241af8a2c556d69d3f017cbdfafdad56
Parents: 5692abc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 29 11:51:02 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 29 11:52:22 2016 +0100
----------------------------------------------------------------------
.../runtime/system/transaction/IsisTransactionManager.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/364a1aac/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 560b2a1..8564a37 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -358,7 +358,10 @@ public class IsisTransactionManager implements SessionScopedComponent {
// we don't decrement the transactionLevel just yet, because an exception might end up being thrown
// (meaning there would be more faffing around to ensure that the transactionLevel
// and state of the currentTransaction remain in sync)
- if ( (transactionLevel - 1) == 0) {
+ int nextTransactionLevel = transactionLevel - 1;
+ if ( nextTransactionLevel > 0) {
+ transactionLevel --;
+ } else if ( nextTransactionLevel == 0) {
//
// TODO: granted, this is some fairly byzantine coding. but I'm trying to account for different types
@@ -433,7 +436,8 @@ public class IsisTransactionManager implements SessionScopedComponent {
getCurrentTransaction().commit();
}
- } else if (transactionLevel < 0) {
+ } else {
+ // transactionLevel < 0
LOG.error("endTransaction: transactionLevel={}", transactionLevel);
transactionLevel = 0;
IllegalStateException ex = new IllegalStateException(" no transaction running to end (transactionLevel < 0)");
[26/44] isis git commit: ISIS-1465: further improvements to
interim-release.sh
Posted by da...@apache.org.
ISIS-1465: further improvements to interim-release.sh
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c5a7b5e9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c5a7b5e9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c5a7b5e9
Branch: refs/heads/master
Commit: c5a7b5e97a9771d384ec3eb5995f2ef6fdf56b4b
Parents: 06d95ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 16:17:58 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 16:17:58 2016 +0100
----------------------------------------------------------------------
interim-release.sh | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c5a7b5e9/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index 34dacb8..337d7e7 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -12,13 +12,9 @@ DATE=`date +'%Y%m%d-%H%M'`
VERSION="$VERSION_BASE.$DATE"
BRANCH="interim/$VERSION"
-TAG="isis-$VERSION"
+TAG="interim/isis-$VERSION"
-echo "removing any earlier (local) 'interim' branches"
-for a in `git branch --list | grep interim`
-do
- git branch -D $a
-done
+CURR_BRANCH=`git rev-parse --abbrev-ref HEAD`
echo "checking out new branch $BRANCH"
git checkout -b "$BRANCH"
@@ -34,15 +30,11 @@ git commit -am "bumping to $VERSION"
echo "tagging"
git tag $TAG
-echo "removing any earlier remote branches"
-for a in `git ls-remote --heads $REMOTE | sed 's?.*refs/heads/??' | grep interim`
-do
- git push $REMOTE --delete $a
-done
-
echo "pushing tag"
git push $REMOTE $TAG
-echo "pushing branch"
-git push $REMOTE $BRANCH
+echo "switching back to original branch"
+git checkout $CURR_BRANCH
+echo "and deleting interim branch"
+git branch -D $BRANCH
[18/44] isis git commit: Fix 'svg' suffix in
ImageResourceCacheClassPath
Posted by da...@apache.org.
Fix 'svg' suffix in ImageResourceCacheClassPath
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8f943fd4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8f943fd4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8f943fd4
Branch: refs/heads/master
Commit: 8f943fd4c5a8679abd2b961956405e13d5a9427c
Parents: b624547
Author: Andi Huber <ho...@gmx.at>
Authored: Wed Aug 31 02:17:32 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 16 14:00:51 2016 +0100
----------------------------------------------------------------------
.../wicket/viewer/imagecache/ImageResourceCacheClassPath.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8f943fd4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
index e6295d0..a8eb2d9 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
@@ -48,7 +48,7 @@ public class ImageResourceCacheClassPath implements ImageResourceCache {
private static final long serialVersionUID = 1L;
- private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg", ".svg");
+ private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg", "svg");
private static final String FALLBACK_IMAGE = "Default.png";
private final Map<ImageResourceCacheKey, ResourceReference> resourceReferenceByKey = Maps.newConcurrentMap();
[32/44] isis git commit: ISIS-1465: interim-release.sh needs to push
the remote branch, so can be picked up by CI
Posted by da...@apache.org.
ISIS-1465: interim-release.sh needs to push the remote branch, so can be picked up by CI
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/242e76bc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/242e76bc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/242e76bc
Branch: refs/heads/master
Commit: 242e76bc5ed79f99e2bbff68deab83bb1cf6ec4a
Parents: d647bdf
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 29 22:47:17 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 29 22:47:17 2016 +0100
----------------------------------------------------------------------
interim-release.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/242e76bc/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index 097b8bd..fd9afc2 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -36,6 +36,16 @@ git tag $TAG
echo "pushing tag"
git push $REMOTE $TAG
+echo "removing any earlier remote branches"
+for a in `git ls-remote --heads $REMOTE | sed 's?.*refs/heads/??' | grep interim`
+do
+ git push $REMOTE --delete $a
+done
+
+# need to push branch, so will be picked up for building by CI
+echo "pushing branch"
+git push $REMOTE $BRANCH
+
echo "switching back to original branch"
git checkout $CURR_BRANCH
[12/44] isis git commit: ISIS-1465: updates .travis.yml to not build
simpleapp or archetype
Posted by da...@apache.org.
ISIS-1465: updates .travis.yml to not build simpleapp or archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e788773f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e788773f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e788773f
Branch: refs/heads/master
Commit: e788773fecd8fed7c4eb260c4f968853cd0e8816
Parents: f4586d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 08:03:00 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 08:03:00 2016 +0200
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e788773f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index cd1b609..c44eb99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
language: java
jdk:
- oraclejdk8
-install: "mvn clean install -P released"
+install: "mvn clean install -Dskip.app -Dskip.arch"
[36/44] isis git commit: ISIS-1482: synchronizes access to PoWriter,
to avoid deadlocks
Posted by da...@apache.org.
ISIS-1482: synchronizes access to PoWriter, to avoid deadlocks
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fd7f1052
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fd7f1052
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fd7f1052
Branch: refs/heads/master
Commit: fd7f1052924b71b697f4b424d66da4dbd2a7cfcf
Parents: 89886e0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 30 11:44:17 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 30 11:44:17 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/core/runtime/services/i18n/po/PoWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fd7f1052/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
index 4ae4b93..562ac51 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
@@ -136,7 +136,7 @@ class PoWriter extends PoAbstract {
return null;
}
- private Block blockFor(final String msgId) {
+ private synchronized Block blockFor(final String msgId) {
Block block = blocksByMsgId.get(msgId);
if(block == null) {
block = new Block(msgId);
[24/44] isis git commit: ISIS-1497: Fixes unmarshalling of arguments
out of DTO within AbstractIsisSessionTemplate (and leverage this in
BackgroundCommandExecution).
Posted by da...@apache.org.
ISIS-1497: Fixes unmarshalling of arguments out of DTO within AbstractIsisSessionTemplate (and leverage this in BackgroundCommandExecution).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dc671d0c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dc671d0c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dc671d0c
Branch: refs/heads/master
Commit: dc671d0c5ea09ccae92faf9373c0b3b0160cdb8f
Parents: fa99caa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 15:01:45 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 15:04:36 2016 +0100
----------------------------------------------------------------------
.../background/BackgroundCommandExecution.java | 44 ++++++++++++++------
.../AbstractIsisSessionTemplate.java | 22 +++++++++-
2 files changed, 52 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dc671d0c/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 6362647..9343c11 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -175,11 +174,7 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
for (OidDto targetOidDto : targetOidDtos) {
- final Bookmark bookmark = Bookmark.from(targetOidDto);
- final Object targetObject = bookmarkService.lookup(bookmark);
-
- final ObjectAdapter targetAdapter = adapterFor(targetObject);
-
+ final ObjectAdapter targetAdapter = targetAdapterFor(targetOidDto);
final ObjectAction objectAction = findObjectAction(targetAdapter, memberId);
// we pass 'null' for the mixedInAdapter; if this action _is_ a mixin then
@@ -314,18 +309,41 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
if(arg == null) {
return null;
}
- if(Bookmark.class != argType) {
- return adapterFor(arg);
- } else {
- final Bookmark argBookmark = (Bookmark)arg;
- final RootOid rootOid = RootOid.create(argBookmark);
- return adapterFor(rootOid);
- }
+ return argAdapterFor(argType, arg);
+
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
+ protected ObjectAdapter targetAdapterFor(final OidDto targetOidDto) {
+
+// // this is the original code, but it can be simplified ...
+// // (moved out to separate method so that, if proven wrong, can override as a patch)
+
+// final Bookmark bookmark = Bookmark.from(targetOidDto);
+// final Object targetObject = bookmarkService.lookup(bookmark);
+// final ObjectAdapter targetAdapter = adapterFor(targetObject);
+
+ return adapterFor(targetOidDto);
+ }
+
+ protected ObjectAdapter argAdapterFor(final Class<?> argType, final Object arg) {
+
+// // this is the original code, but it can be simplified ...
+// // (moved out to separate method so that, if proven wrong, can override as a patch)
+
+// if(Bookmark.class != argType) {
+// return adapterFor(arg);
+// } else {
+// final Bookmark argBookmark = (Bookmark)arg;
+// final RootOid rootOid = RootOid.create(argBookmark);
+// return adapterFor(rootOid);
+// }
+
+ return adapterFor(arg);
+ }
+
private ObjectAdapter[] argAdaptersFor(final ActionDto actionDto) {
final List<ParamDto> params = paramDtosFrom(actionDto);
final List<ObjectAdapter> args = Lists.newArrayList(
http://git-wip-us.apache.org/repos/asf/isis/blob/dc671d0c/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index df2aa76..1bec4ed 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -16,9 +16,9 @@
*/
package org.apache.isis.core.runtime.sessiontemplate;
+import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -27,6 +27,7 @@ import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
+import org.apache.isis.schema.common.v1.OidDto;
public abstract class AbstractIsisSessionTemplate {
@@ -82,8 +83,27 @@ public abstract class AbstractIsisSessionTemplate {
// //////////////////////////////////////
protected ObjectAdapter adapterFor(final Object targetObject) {
+ if(targetObject instanceof OidDto) {
+ final OidDto oidDto = (OidDto) targetObject;
+ return adapterFor(oidDto);
+ }
+ if(targetObject instanceof Bookmark) {
+ final Bookmark bookmark = (Bookmark) targetObject;
+ return adapterFor(bookmark);
+ }
return getPersistenceSession().adapterFor(targetObject);
}
+
+ protected ObjectAdapter adapterFor(final OidDto oidDto) {
+ final Bookmark bookmark = Bookmark.from(oidDto);
+ return adapterFor(bookmark);
+ }
+
+ protected ObjectAdapter adapterFor(final Bookmark bookmark) {
+ final RootOid rootOid = RootOid.create(bookmark);
+ return adapterFor(rootOid);
+ }
+
protected ObjectAdapter adapterFor(final RootOid rootOid) {
return getPersistenceSession().adapterFor(rootOid);
}
[33/44] isis git commit: ISIS-1507: switches off the
QueryResultsCache while fixtures are being installed.
Posted by da...@apache.org.
ISIS-1507: switches off the QueryResultsCache while fixtures are being installed.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6976b14
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6976b14
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6976b14
Branch: refs/heads/master
Commit: f6976b14f241a104fcb90b6b0fb74fd3da7b9fca
Parents: 242e76b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 30 08:54:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 30 08:54:27 2016 +0100
----------------------------------------------------------------------
.../guides/_rgsvc_api_EventBusService.adoc | 2 +-
core/applib/pom.xml | 6 ++
.../events/system/FixturesInstalledEvent.java | 32 +++++++++
.../events/system/FixturesInstallingEvent.java | 32 +++++++++
.../fixturespec/FixtureScriptsDefault.java | 15 +++-
.../queryresultscache/QueryResultsCache.java | 73 +++++++++++++++++++-
core/pom.xml | 6 ++
7 files changed, 160 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_EventBusService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_EventBusService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_EventBusService.adoc
index c7ed940..e8b6763 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_EventBusService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_EventBusService.adoc
@@ -131,7 +131,7 @@ or if using Axonframework, the subscriber uses a different annotation:
@DomainService(nature=NatureOfService.DOMAIN)
public class MySubscribingDomainService
@Programmatic
- @org.axonframework.eventhandling.annotation.EventHandle
+ @org.axonframework.eventhandling.annotation.EventHandler
public void on(ActionDomainEvent ev) { ... }
...
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index b7eef02..a2a1d41 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -114,6 +114,12 @@
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.axonframework</groupId>
+ <artifactId>axon-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!-- DataNucleus' standard JDO support -->
<dependency>
<groupId>javax.jdo</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java
new file mode 100644
index 0000000..83060c3
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java
@@ -0,0 +1,32 @@
+/*
+ * 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.events.system;
+
+import java.util.EventObject;
+
+public class FixturesInstalledEvent extends EventObject {
+
+ private static final long serialVersionUID = 1L;
+
+ public FixturesInstalledEvent(final Object source) {
+ super(source);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java
new file mode 100644
index 0000000..812c4e6
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java
@@ -0,0 +1,32 @@
+/*
+ * 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.events.system;
+
+import java.util.EventObject;
+
+public class FixturesInstallingEvent extends EventObject {
+
+ private static final long serialVersionUID = 1L;
+
+ public FixturesInstallingEvent(final Object source) {
+ super(source);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index 6401aab..ae88f38 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -21,7 +21,6 @@ package org.apache.isis.applib.services.fixturespec;
import java.util.List;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -32,9 +31,12 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.events.system.FixturesInstalledEvent;
+import org.apache.isis.applib.events.system.FixturesInstallingEvent;
import org.apache.isis.applib.fixturescripts.FixtureResult;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.applib.services.eventbus.EventBusService;
/**
* Default instance of {@link FixtureScripts}, instantiated automatically by the framework if no custom user-defined instance was
@@ -101,7 +103,12 @@ public class FixtureScriptsDefault extends FixtureScripts {
multiLine = 10)
@Parameter(optionality = Optionality.OPTIONAL)
final String parameters) {
- return super.runFixtureScript(fixtureScript, parameters);
+ try {
+ eventBusService.post(new FixturesInstallingEvent(this));
+ return super.runFixtureScript(fixtureScript, parameters);
+ } finally {
+ eventBusService.post(new FixturesInstalledEvent(this));
+ }
}
/**
@@ -216,7 +223,9 @@ public class FixtureScriptsDefault extends FixtureScripts {
//region > injected services
@javax.inject.Inject
- private FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider;
+ FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider;
+ @javax.inject.Inject
+ EventBusService eventBusService;
//endregion
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index 12accb1..82b45a8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -20,9 +20,13 @@ import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.Callable;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
import com.google.common.collect.Maps;
+import com.google.common.eventbus.Subscribe;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +34,10 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.events.system.FixturesInstalledEvent;
+import org.apache.isis.applib.events.system.FixturesInstallingEvent;
import org.apache.isis.applib.services.WithTransactionScope;
+import org.apache.isis.applib.services.eventbus.EventBusService;
/**
* This service (API and implementation) provides a mechanism by which idempotent query results can be cached for the duration of an interaction.
@@ -48,6 +55,7 @@ public class QueryResultsCache implements WithTransactionScope {
private static final Logger LOG = LoggerFactory.getLogger(QueryResultsCache.class);
+
public static class Key {
private final Class<?> callingClass;
private final String methodName;
@@ -134,17 +142,35 @@ public class QueryResultsCache implements WithTransactionScope {
@Programmatic
public <T> T execute(final Callable<T> callable, final Class<?> callingClass, final String methodName, final Object... keys) {
+ if(control.isFixturesInstalling()) {
+ try {
+ return callable.call();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
final Key cacheKey = new Key(callingClass, methodName, keys);
- return execute(callable, cacheKey);
+ return executeWithCaching(callable, cacheKey);
}
@Programmatic
@SuppressWarnings("unchecked")
public <T> T execute(final Callable<T> callable, final Key cacheKey) {
+ if(control.isFixturesInstalling()) {
+ try {
+ return callable.call();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return executeWithCaching(callable, cacheKey);
+ }
+
+ protected <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey) {
try {
final Value<?> cacheValue = cache.get(cacheKey);
logHitOrMiss(cacheKey, cacheValue);
- if(cacheValue != null) {
+ if(cacheValue != null) {
return (T) cacheValue.getResult();
}
@@ -208,4 +234,47 @@ public class QueryResultsCache implements WithTransactionScope {
cache.clear();
}
+ /**
+ * In separate class because {@link QueryResultsCache} itself is request-scoped
+ */
+ @DomainService(nature = NatureOfService.DOMAIN)
+ public static class Control {
+
+ @PostConstruct
+ public void postConstruct() {
+ eventBusService.register(this);
+ }
+
+ @PreDestroy
+ public void preDestroy() {
+ eventBusService.unregister(this);
+ }
+
+ @Subscribe
+ @org.axonframework.eventhandling.annotation.EventHandler
+ public void on(FixturesInstallingEvent ev) {
+ fixturesInstalling = true;
+ }
+
+ @Subscribe
+ @org.axonframework.eventhandling.annotation.EventHandler
+ public void on(FixturesInstalledEvent ev) {
+ fixturesInstalling = false;
+ }
+
+ private boolean fixturesInstalling;
+
+ public boolean isFixturesInstalling() {
+ return fixturesInstalling;
+ }
+
+ @Inject
+ EventBusService eventBusService;
+ }
+
+
+ @Inject
+ Control control;
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f6976b14/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 66cfce5..2c9adf8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -153,6 +153,7 @@
<guice.version>4.0</guice.version>
<picocontainer.version>2.15</picocontainer.version>
+
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
<xstream.version>1.4.8</xstream.version>
@@ -1306,6 +1307,11 @@ ${license.additional-notes}
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.axonframework</groupId>
+ <artifactId>axon-core</artifactId>
+ <version>${axon-core.version}</version>
+ </dependency>
<!-- Logging -->
<dependency>
[06/44] isis git commit: ISIS-1476: updating docs
Posted by da...@apache.org.
ISIS-1476: updating docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/87966d8f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/87966d8f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/87966d8f
Branch: refs/heads/master
Commit: 87966d8f0a0efabe69e7fad414b380d514c3081f
Parents: b12d2ac
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Aug 25 12:04:22 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 25 12:06:04 2016 +0100
----------------------------------------------------------------------
.../guides/_rgsvc_api_TransactionService.adoc | 23 ++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/87966d8f/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_TransactionService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_TransactionService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_TransactionService.adoc
index 3c0d7b4..960cd79 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_TransactionService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_TransactionService.adoc
@@ -47,6 +47,7 @@ public interface Transaction {
UUID getTransactionId(); // <1>
int getSequence(); // <2>
void flush(); // <3>
+ void clearAbortCause(); // <4>
}
----
<1> is a unique identifier for the interaction/request, as defined by the
@@ -54,7 +55,29 @@ xref:rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[`HasTransactionId`] mixin
<2> there can actually be multiple transactions within such a request/interaction; the sequence is a (0-based) is used
to distinguish such.
<3> as per `TransactionService#flushTransaction()` described above.
+<4> If the cause has been rendered higher up in the stack, then clear the cause so that it won't be picked up and
+rendered elsewhere.
+[TIP]
+====
+One place where `clearAboutCause()` may be useful is for application-level handling of SQL integrity exceptions, eg as
+described in link:https://issues.apache.org/jira/browse/ISIS-1476[ISIS-1476]:
+
+[source,java]
+----
+try {
+ // do something...
+} catch (final JDODataStoreException e) {
+ if (Iterables.filter(Throwables.getCausalChain(e),
+ SQLIntegrityConstraintViolationException.class) != null) {
+ // ignore
+ this.transactionService.currentTransaction().clearAbortCause();
+ } else {
+ throw e;
+ }
+}
+----
+====
== Implementation
[23/44] isis git commit: ISIS-1495: adds RESTART as a further value
for SessionLoggingService#CausedBy
Posted by da...@apache.org.
ISIS-1495: adds RESTART as a further value for SessionLoggingService#CausedBy
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fa99caaf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fa99caaf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fa99caaf
Branch: refs/heads/master
Commit: fa99caaf905e007baaa062a8be6cbbca6b9fc814
Parents: 5d1438a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 14:38:54 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 15:04:28 2016 +0100
----------------------------------------------------------------------
.../isis/applib/services/session/SessionLoggingService.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fa99caaf/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
index 4e67b90..84d137a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/session/SessionLoggingService.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.applib.services.session;
-import java.util.Date;
-
import org.apache.isis.applib.annotation.Programmatic;
+import java.util.Date;
+
/**
* Similar to the {@link org.apache.isis.applib.services.audit.AuditingService3}, this defines an API to track
* the status of the current sessions ("users logged on") on the system.
@@ -35,7 +35,8 @@ public interface SessionLoggingService {
public enum CausedBy {
USER,
- SESSION_EXPIRATION
+ SESSION_EXPIRATION,
+ RESTART
}
@Programmatic
[04/44] isis git commit: ISIS-1475: Named-annotation disappeared on
AccountManagementPageAbstract
Posted by da...@apache.org.
ISIS-1475: Named-annotation disappeared on AccountManagementPageAbstract
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c066d41e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c066d41e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c066d41e
Branch: refs/heads/master
Commit: c066d41e4c9da6b5a858c9b410b7547c15943a38
Parents: a8837d4
Author: Erik de Hair <e....@pocos.nl>
Authored: Wed Aug 10 11:50:26 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 25 11:49:12 2016 +0100
----------------------------------------------------------------------
.../wicket/ui/pages/accmngt/AccountManagementPageAbstract.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c066d41e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 7116a4d..8182966 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -73,6 +73,7 @@ public class AccountManagementPageAbstract extends WebPage {
* {@link com.google.inject.Inject}ed when {@link #init() initialized}.
*/
@com.google.inject.Inject
+ @Named("applicationName")
private String applicationName;
/**
[37/44] isis git commit: ISIS-1507: makes Control injected service
settable from unit tests.
Posted by da...@apache.org.
ISIS-1507: makes Control injected service settable from unit tests.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b09f9685
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b09f9685
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b09f9685
Branch: refs/heads/master
Commit: b09f9685dae4e44a2055d730e5a5bc676c7b8304
Parents: fd7f105
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 30 15:42:11 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 30 15:42:11 2016 +0100
----------------------------------------------------------------------
.../isis/applib/services/queryresultscache/QueryResultsCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b09f9685/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index 82b45a8..6e39a3e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -274,7 +274,7 @@ public class QueryResultsCache implements WithTransactionScope {
@Inject
- Control control;
+ protected Control control;
}
[25/44] isis git commit: ISIS-1498: introduces new
clearAbortCauseAndContinue() internal API for IsisTransaction,
and leverage within BackgroundCommandExecution for the case where an action
throws an exception (want to capture that, mark on the backgroun
Posted by da...@apache.org.
ISIS-1498: introduces new clearAbortCauseAndContinue() internal API for IsisTransaction, and leverage within BackgroundCommandExecution for the case where an action throws an exception (want to capture that, mark on the background Command, and persist).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/06d95ab9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/06d95ab9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/06d95ab9
Branch: refs/heads/master
Commit: 06d95ab91a69e8f8e5513fef40fe086259f69a80
Parents: dc671d0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 15:03:19 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 15:04:43 2016 +0100
----------------------------------------------------------------------
.../background/BackgroundCommandExecution.java | 19 +++++++++++--------
.../system/transaction/IsisTransaction.java | 15 +++++++++++++--
2 files changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/06d95ab9/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 9343c11..ba6d03d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -217,18 +217,21 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
}
} catch (RuntimeException e) {
- // this doesn't really make sense if >1 action
- // in any case, the capturing of the action interaction should be the
- // responsibility of auditing/profiling
+ // hmmm, this doesn't really make sense if >1 action
+ //
+ // in any case, the capturing of the result of the action invocation should be the
+ // responsibility of the interaction...
backgroundCommand.setException(Throwables.getStackTraceAsString(e));
- // alternatively, could have used ...
- Exception unused = backgroundInteraction.getPriorExecution().getThrew();
-
- backgroundInteraction.getCurrentExecution().setThrew(e);
+ // lower down the stack the IsisTransactionManager will have set the transaction to abort
+ // however, we don't want that to occur (because any changes made to the backgroundCommand itself
+ // would also be rolled back, and it would keep getting picked up again by a scheduler for
+ // processing); instead we clear the abort cause and ensure we can continue.
+ transactionManager.getCurrentTransaction().clearAbortCauseAndContinue();
}
- backgroundCommand.setCompletedAt(backgroundInteraction.getPriorExecution().getCompletedAt());
+ final Interaction.Execution priorExecution = backgroundInteraction.getPriorExecution();
+ backgroundCommand.setCompletedAt(priorExecution.getCompletedAt());
}
private ObjectAction findObjectAction(
http://git-wip-us.apache.org/repos/asf/isis/blob/06d95ab9/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index ace6b3c..f7eaf60 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -472,8 +472,12 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
*
* <p>
* If the cause is subsequently rendered by code higher up the stack, then the
- * cause can be {@link #clearAbortCause() cleared}. However, it is not possible
- * to change the state from {@link State#MUST_ABORT}.
+ * cause can be {@link #clearAbortCause() cleared}. Note that this keeps the transaction in a state of
+ * {@link State#MUST_ABORT}.
+ *
+ * <p>
+ * If the cause is to be discarded completely (eg background command execution), then
+ * {@link #clearAbortCauseAndContinue()} can be used.
*/
public void setAbortCause(IsisException abortCause) {
setState(State.MUST_ABORT);
@@ -489,6 +493,13 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
abortCause = null;
}
+ public void clearAbortCauseAndContinue() {
+ setState(State.IN_PROGRESS);
+ clearAbortCause();
+ }
+
+
+
//endregion
[27/44] isis git commit: ISIS-1499: enhances BookmarkServiceDefault
to also support lookup of domain services.
Posted by da...@apache.org.
ISIS-1499: enhances BookmarkServiceDefault to also support lookup of domain services.
nb: requires that the bookmark's objectType is the fully qualified class name of the service.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c8f56552
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c8f56552
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c8f56552
Branch: refs/heads/master
Commit: c8f565523dd926edf9d690618face73a99524cf4
Parents: c5a7b5e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 18:04:18 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 18:04:18 2016 +0100
----------------------------------------------------------------------
.../BookmarkServiceInternalDefault.java | 56 ++++++++++++++++++--
1 file changed, 52 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c8f56552/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
index 7eb86f5..d4f9406 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -18,12 +18,20 @@
*/
package org.apache.isis.core.metamodel.services.bookmarks;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import com.google.common.collect.Maps;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkHolder;
import org.apache.isis.applib.services.bookmark.BookmarkService2;
+import org.apache.isis.applib.services.registry.ServiceRegistry2;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -43,7 +51,6 @@ public class BookmarkServiceInternalDefault implements BookmarkService2 {
@Programmatic
- @Override
public Object lookup(
final BookmarkHolder bookmarkHolder,
final FieldResetPolicy fieldResetPolicy) {
@@ -58,9 +65,7 @@ public class BookmarkServiceInternalDefault implements BookmarkService2 {
}
- @Programmatic
- @Override
- public Object lookup(
+ private Object lookupInternal(
final Bookmark bookmark,
final FieldResetPolicy fieldResetPolicy) {
if(bookmark == null) {
@@ -73,6 +78,25 @@ public class BookmarkServiceInternalDefault implements BookmarkService2 {
}
}
+
+ @Programmatic
+ @Override
+ public Object lookup(
+ final Bookmark bookmark,
+ final FieldResetPolicy fieldResetPolicy) {
+ if(bookmark == null) {
+ return null;
+ }
+ final String objectType = bookmark.getObjectType();
+ final Object service = lookupService(objectType);
+ if(service != null) {
+ return service;
+ }
+ return lookupInternal(bookmark, fieldResetPolicy);
+ }
+
+
+
@Programmatic
@Override
public Object lookup(final Bookmark bookmark) {
@@ -120,10 +144,34 @@ public class BookmarkServiceInternalDefault implements BookmarkService2 {
+
+
+ private Map<String,Object> servicesByClassName;
+ private Object lookupService(final String className) {
+ cacheServicesByClassNameIfNecessary();
+ return servicesByClassName.get(className);
+ }
+
+ private void cacheServicesByClassNameIfNecessary() {
+ if (servicesByClassName == null) {
+ final Map<String,Object> servicesByClassName = Maps.newHashMap();
+ final List<Object> registeredServices = serviceRegistry2.getRegisteredServices();
+ for (Object registeredService : registeredServices) {
+ final String serviceClassName = registeredService.getClass().getName();
+ servicesByClassName.put(serviceClassName, registeredService);
+ }
+ this.servicesByClassName = servicesByClassName;
+ }
+ }
+
+
@javax.inject.Inject
PersistenceSessionServiceInternal persistenceSessionServiceInternal;
@javax.inject.Inject
private WrapperFactory wrapperFactory;
+ @Inject
+ ServiceRegistry2 serviceRegistry2;
+
}
[14/44] isis git commit: ISIS-1465: another attempt at getting travis
to build (no 'install' step)
Posted by da...@apache.org.
ISIS-1465: another attempt at getting travis to build (no 'install' step)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4c0f2e4e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4c0f2e4e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4c0f2e4e
Branch: refs/heads/master
Commit: 4c0f2e4e5b7854d4d0f874fba33838a5da4213ab
Parents: 8829ff8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:38:14 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:38:14 2016 +0200
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4c0f2e4e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2bb59e0..a3950e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
language: java
jdk:
- oraclejdk8
+install:
script: "mvn clean install -Dskip.app -Dskip.arch"
[42/44] isis git commit: ISIS-1519: deprecates JdoColumnLength in the
applib
Posted by da...@apache.org.
ISIS-1519: deprecates JdoColumnLength in the applib
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/aeaaecad
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/aeaaecad
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/aeaaecad
Branch: refs/heads/master
Commit: aeaaecad614bb0617d25fec3fcdaa2024fa701dc
Parents: 1bb051f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 16 07:35:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 21 15:40:06 2016 +0100
----------------------------------------------------------------------
.../jdo/applib/service/JdoColumnLength.java | 110 ++++++++++++++++++-
1 file changed, 104 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/aeaaecad/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
index 0a863d3..02b4298 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
@@ -18,55 +18,153 @@
*/
package org.apache.isis.objectstore.jdo.applib.service;
+/**
+ * @deprecated
+ */
+@Deprecated
public final class JdoColumnLength {
private JdoColumnLength() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TRANSACTION_ID = 36;
- // ie OID str (based on the defacto limit of a request URL in web browsers such as IE8)
- public final static int BOOKMARK = 2000;
+
+ /**
+ * ie OID str (based on the defacto limit of a request URL in web browsers such as IE8)
+ *
+ * @deprecated
+ */
+ @Deprecated
+ public final static int BOOKMARK = 2000;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int MEMBER_IDENTIFIER = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int USER_NAME = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TARGET_CLASS = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public final static int TARGET_ACTION = 50;
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int DESCRIPTION = 254;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class SettingAbstract {
private SettingAbstract(){}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int SETTING_KEY = 128;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int SETTING_TYPE = 20;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int VALUE_RAW = 255;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class Command {
private Command() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int EXECUTE_IN = 10;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class AuditEntry {
private AuditEntry() {
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int PROPERTY_ID = 50;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int PROPERTY_VALUE = 255;
}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class PublishedEvent {
private PublishedEvent() {
}
-
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int TITLE = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int EVENT_TYPE = 20;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int STATE = 20;
}
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final class StatusMessage {
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int MESSAGE = 255;
+ /**
+ * @deprecated
+ */
+ @Deprecated
public static final int URI = BOOKMARK;
}
[08/44] isis git commit: ISIS-1481: no need to obtain
SessionLoggingService from within a session.
Posted by da...@apache.org.
ISIS-1481: no need to obtain SessionLoggingService from within a session.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e5ecb882
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e5ecb882
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e5ecb882
Branch: refs/heads/master
Commit: e5ecb8821717b287f96eee4cd711665b5c14b87f
Parents: bab40dc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 7 14:36:11 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 7 14:36:11 2016 +0100
----------------------------------------------------------------------
.../integration/wicket/AuthenticatedWebSessionForIsis.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e5ecb882/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 21189a1..d3470db 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -183,14 +183,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
protected SessionLoggingService getSessionLoggingService() {
- return getIsisSessionFactory().doInSession(new Callable<SessionLoggingService>() {
- @Override
- public SessionLoggingService call() throws Exception {
-
- // REVIEW: I strongly suspect that this doesn't need to be done in a session anymore
- return getIsisSessionFactory().getServicesInjector().lookupService(SessionLoggingService.class);
- }
- });
+ return getIsisSessionFactory().getServicesInjector().lookupService(SessionLoggingService.class);
}
@Override
[31/44] isis git commit: ISIS-1465: improving interim-release.sh,
build before tagging
Posted by da...@apache.org.
ISIS-1465: improving interim-release.sh, build before tagging
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d647bdf5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d647bdf5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d647bdf5
Branch: refs/heads/master
Commit: d647bdf54822f019c3007429a3a38065e732afe5
Parents: 364a1aa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 29 11:58:01 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 29 11:58:01 2016 +0100
----------------------------------------------------------------------
interim-release.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d647bdf5/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index 337d7e7..097b8bd 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -27,6 +27,9 @@ popd >/dev/null
echo "Committing changes"
git commit -am "bumping to $VERSION"
+echo "Building"
+mvn clean install -o
+
echo "tagging"
git tag $TAG
[22/44] isis git commit: ISIS-1465: further tiny fix required for
simpleapp archetype
Posted by da...@apache.org.
ISIS-1465: further tiny fix required for simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5d1438a6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5d1438a6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5d1438a6
Branch: refs/heads/master
Commit: 5d1438a6689b1d7323bb7a791692c18b76c5122b
Parents: 29a3010
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 21 18:33:07 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 21 18:33:07 2016 +0100
----------------------------------------------------------------------
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5d1438a6/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index 69e36b8..371bc8d 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -35,10 +35,10 @@ public class SimpleObjectTest {
@Test
public void happyCase() throws Exception {
// given
- String name = "Foobar";
- assertThat(simpleObject.getName()).isNull();
+ assertThat(simpleObject.getName()).isEqualTo("Foobar");
// when
+ String name = "Foobar - updated";
simpleObject.setName(name);
// then
[38/44] isis git commit: ISIS-1510: allows configuration properties
to be overridden from either system properties or a new ISIS_OPTS environment
variable
Posted by da...@apache.org.
ISIS-1510: allows configuration properties to be overridden from either system properties or a new ISIS_OPTS environment variable
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/62853b95
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/62853b95
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/62853b95
Branch: refs/heads/master
Commit: 62853b95249d48212ca340765fa498e82b14d0a3
Parents: b09f968
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 5 11:44:58 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 5 11:44:58 2016 +0200
----------------------------------------------------------------------
.../guides/_ugbtb_deployment_docker.adoc | 56 ++++++++++++++++-
.../configbuilder/IsisConfigurationBuilder.java | 23 +++++--
.../PrimerForEnvironmentVariableISIS_OPT.java | 66 ++++++++++++++++++++
...PrimerForEnvironmentVariablesIsisPrefix.java | 35 +++++++++++
.../PrimerForSystemProperties.java | 52 +++++++++++++++
.../runtime/optionhandler/OptionHandler.java | 3 +-
.../core/webapp/IsisWebAppBootstrapper.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 2 +-
8 files changed, 230 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_docker.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_docker.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_docker.adoc
index 26ed652..1a42d17 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_docker.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_docker.adoc
@@ -5,6 +5,21 @@
:_imagesdir: images/
+When running the application within a Docker container, the problem that must be solved is to override the
+configuration properties baked into the war file, eg to point to the app to a different JDBC URL.
+
+There are several options.
+
+[WARNING]
+====
+All the options here rely on starting the Docker container with a set of arguments, some of which would very likely
+be passwords for database connections etc. As such these techniques are only suitable where the security of the
+Docker host can be assured.
+====
+
+
+== Using an `overrides.properties` file
+
In addition to loading the regular configuration properties from `WEB-INF` directory (described
xref:rgcfg.adoc#_rgcfg_configuration-files[here]), Apache Isis will also load the `overrides.properties` file.
@@ -16,7 +31,7 @@ While the regular configuration files are "baked into" the application WAR file,
created dynamically as part of the Docker `ENTRYPOINT` script, eg as documented in the
link:https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/[Dockerfile best practices].
-This, Docker can be supported relatively trivially:
+Thus, Docker can be supported as follows:
* use `mvn` (as currently) to create a WAR file; set up with the `pom.xml` with the JDBC drivers of all DB servers that
you might want to connect to (hsqldb, sql server, postgresql etc)
@@ -33,3 +48,42 @@ over the WAR file itself.
* use `ENTRYPOINT` (and probably also `CMD`) to invoke above script.
+
+
+== Using system properties
+
+(As of `1.13.1-SNAPSHOT`), the servlet context initializer will search for any system properties called `isis.xxx`
+ and if present will use them as overrides.
+
+Thus, an alternative option for a Docker image is to bootstrap the servlet container (Tomcat, Jetty) with appropriate
+system properties set up. For example, with Tomcat this can be done by writing into the `conf/catalina.properties` file
+(see for example link:http://stackoverflow.com/a/16566920[this stackoverflow] post).
+
+The Docker's `ENTRYPOINT` therefore just needs to parse the Docker container's own command line arguments and use to
+create this file.
+
+
+== Using the `ISIS_OPT` environment variable
+
+(As of `1.13.1-SNAPSHOT`), the servlet context initializer will search for an environment variable called `$ISIS_OPTS`
+ and if present will parse the content as a set of key/value pairs. Each key/value pair is separated by "||".
+
+For example:
+
+[source,bash]
+----
+export ISIS_OPTS="isis.appManifest=domainapp.app.DomainAppAppManifestWithFixtures||isis.objects.editing=false"
+----
+
+can be used to run with a different app manifest, and also to disable editing of properties.
+
+To use a different separator, set the (optional) `$ISIS_OPTS_SEPARATOR` variable.
+
+[source,bash]
+----
+export ISIS_OPTS_SEPARATOR=";"
+export ISIS_OPTS="isis.appManifest=domainapp.app.DomainAppAppManifestWithFixtures;isis.objects.editing=false"
+----
+
+The Docker's `ENTRYPOINT` therefore just needs to parse the Docker container's own command line arguments and use to
+set this environment variable.
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
index 447983d..ba75b22 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
@@ -106,7 +106,12 @@ public final class IsisConfigurationBuilder {
return composite;
}
- public void addDefaultConfigurationResources() {
+ public void addDefaultConfigurationResourcesAndPrimers() {
+ addDefaultConfigurationResources();
+ addDefaultPrimers();
+ }
+
+ private void addDefaultConfigurationResources() {
IsisConfigurationDefault.ContainsPolicy ignorePolicy = IsisConfigurationDefault.ContainsPolicy.IGNORE;
NotFoundPolicy continuePolicy = NotFoundPolicy.CONTINUE;
@@ -147,6 +152,11 @@ public final class IsisConfigurationBuilder {
addConfigurationResource("overrides.properties", NotFoundPolicy.CONTINUE, IsisConfigurationDefault.ContainsPolicy.OVERWRITE);
}
+ private void addDefaultPrimers() {
+ primeWith(new PrimerForSystemProperties());
+ primeWith(new PrimerForEnvironmentVariablesIsisPrefix());
+ primeWith(new PrimerForEnvironmentVariableISIS_OPT());
+ }
//endregion
@@ -300,11 +310,15 @@ public final class IsisConfigurationBuilder {
return true;
}
- public void primeWith(final OptionHandler optionHandler) {
+ public interface Primer {
+ void prime(IsisConfigurationBuilder isisConfigurationBuilder);
+ }
+
+ public void primeWith(final Primer primer) {
ensureNotLocked();
- LOG.debug("priming configurations for '{}'", optionHandler);
- optionHandler.prime(this);
+ LOG.debug("priming configurations for '{}'", primer);
+ primer.prime(this);
}
//endregion
@@ -376,5 +390,4 @@ public final class IsisConfigurationBuilder {
//endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
new file mode 100644
index 0000000..e0bebd9
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariableISIS_OPT.java
@@ -0,0 +1,66 @@
+/*
+ * 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.commons.configbuilder;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.Maps;
+
+public class PrimerForEnvironmentVariableISIS_OPT implements IsisConfigurationBuilder.Primer {
+
+ public static final String OPT_ENV = "ISIS_OPTS";
+ public static final String SEPARATOR_ENV = "ISIS_OPTS_SEPARATOR";
+ public static final String SEPARATOR_DEFAULT = "||";
+
+ @Override
+ public void prime(final IsisConfigurationBuilder builder) {
+ final String separator = determineSeparator();
+ final String env = System.getenv(OPT_ENV);
+ for (Map.Entry<String, String> entry : fromEnv(env, separator).entrySet()) {
+ final String envVarName = entry.getKey();
+ final String envVarValue = entry.getValue();
+ builder.put(envVarName, envVarValue);
+ }
+ }
+
+ private static String determineSeparator() {
+ final String separator = System.getenv(SEPARATOR_ENV);
+ if (separator != null) {
+ return separator;
+ }
+ return SEPARATOR_DEFAULT;
+ }
+
+ private static Map<String, String> fromEnv(final String env, final String separator) {
+ final LinkedHashMap<String, String> map = Maps.newLinkedHashMap();
+ if (env != null) {
+ final List<String> keyAndValues = Splitter.on(separator).splitToList(env);
+ for (String keyAndValue : keyAndValues) {
+ final List<String> parts = Splitter.on("=").splitToList(keyAndValue);
+ if (parts.size() == 2) {
+ map.put(parts.get(0), parts.get(1));
+ }
+ }
+ }
+ return map;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java
new file mode 100644
index 0000000..b5e5a4d
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForEnvironmentVariablesIsisPrefix.java
@@ -0,0 +1,35 @@
+/*
+ * 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.commons.configbuilder;
+
+import java.util.Map;
+
+public class PrimerForEnvironmentVariablesIsisPrefix implements IsisConfigurationBuilder.Primer {
+ @Override
+ public void prime(final IsisConfigurationBuilder builder) {
+ final Map<String, String> envVars = System.getenv();
+ for (Map.Entry<String, String> entry : envVars.entrySet()) {
+ final String envVarName = entry.getKey();
+ final String envVarValue = entry.getValue();
+ if (envVarName.startsWith("isis.")) {
+ builder.put(envVarName, envVarValue);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java
new file mode 100644
index 0000000..1dc9002
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/PrimerForSystemProperties.java
@@ -0,0 +1,52 @@
+/*
+ * 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.commons.configbuilder;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import com.google.common.collect.Maps;
+
+public class PrimerForSystemProperties implements IsisConfigurationBuilder.Primer {
+
+ @Override
+ public void prime(final IsisConfigurationBuilder builder) {
+ final Properties properties = System.getProperties();
+ for (Map.Entry<String, String> entry : fromProperties(properties).entrySet()) {
+ final String envVarName = entry.getKey();
+ final String envVarValue = entry.getValue();
+ if (envVarName.startsWith("isis.")) {
+ builder.put(envVarName, envVarValue);
+ }
+ }
+ }
+
+ private static Map<String, String> fromProperties(final Properties properties) {
+ final LinkedHashMap<String, String> map = Maps.newLinkedHashMap();
+ for (final Map.Entry<Object, Object> entry : properties.entrySet()) {
+ final Object key = entry.getKey();
+ final Object value = entry.getValue();
+ if (key instanceof String && value instanceof String) {
+ map.put((String) key, (String) value);
+ }
+ }
+ return map;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
index 1419063..366af3c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
@@ -24,12 +24,11 @@ import org.apache.commons.cli.Options;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-public interface OptionHandler {
+public interface OptionHandler extends IsisConfigurationBuilder.Primer {
void addOption(Options options);
boolean handle(CommandLine commandLine, BootPrinter bootPrinter, Options options);
- void prime(IsisConfigurationBuilder isisConfigurationBuilder);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index 603d44e..9123aea 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -40,9 +40,9 @@ import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.runner.opts.OptionHandlerInitParameters;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
/**
@@ -84,7 +84,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
loggingConfigurer.configureLogging(webInfDir, new String[0]);
final IsisConfigurationBuilder isisConfigurationBuilder = obtainIsisConfigurationBuilder(servletContext);
- isisConfigurationBuilder.addDefaultConfigurationResources();
+ isisConfigurationBuilder.addDefaultConfigurationResourcesAndPrimers();
final DeploymentType deploymentType = determineDeploymentType(servletContext, isisConfigurationBuilder);
addConfigurationResourcesForDeploymentType(isisConfigurationBuilder, deploymentType);
http://git-wip-us.apache.org/repos/asf/isis/blob/62853b95/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 5839215..c40b7d9 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -256,7 +256,7 @@ public class IsisWicketApplication
getResourceSettings().setParentFolderPlaceholder("$up$");
final IsisConfigurationBuilder isisConfigurationBuilder = obtainConfigBuilder();
- isisConfigurationBuilder.addDefaultConfigurationResources();
+ isisConfigurationBuilder.addDefaultConfigurationResourcesAndPrimers();
final IsisConfigurationDefault configuration = isisConfigurationBuilder.getConfiguration();
[29/44] isis git commit: ISIS-1502: prevents infinite loop in
IsisTransactionManager#endTransaction() when there is an error in domain
logic code
Posted by da...@apache.org.
ISIS-1502: prevents infinite loop in IsisTransactionManager#endTransaction() when there is an error in domain logic code
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5692abcb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5692abcb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5692abcb
Branch: refs/heads/master
Commit: 5692abcbc0d2c1927cf6ac6cb0c8256e2e342f9f
Parents: d532abc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 29 10:47:07 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 29 10:58:01 2016 +0100
----------------------------------------------------------------------
.../system/transaction/IsisTransaction.java | 2 +-
.../transaction/IsisTransactionManager.java | 116 +++++++++++++------
2 files changed, 80 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5692abcb/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index f7eaf60..be7a32a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -429,7 +429,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
}
- public void commit() {
+ void commit() {
assert getState().canCommit();
assert abortCause == null;
http://git-wip-us.apache.org/repos/asf/isis/blob/5692abcb/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 4d1f123..560b2a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.runtime.system.transaction;
+import java.text.MessageFormat;
import java.util.UUID;
import org.slf4j.Logger;
@@ -118,7 +119,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
* {@link IsisTransaction transaction}.
*
* <p>
- * If a transaction is {@link IsisContext#inTransaction() in progress}, then
+ * If a transaction is in progress, then
* uses that. Otherwise will {@link #startTransaction() start} a transaction
* before running the block and {@link #endTransaction() commit} it at the
* end.
@@ -286,22 +287,52 @@ public class IsisTransactionManager implements SessionScopedComponent {
* exception in turn.
*/
public void endTransaction() {
- if (LOG.isDebugEnabled()) {
- LOG.debug("endTransaction: level " + (transactionLevel) + "->" + (transactionLevel - 1));
- }
final IsisTransaction transaction = getCurrentTransaction();
- if (transaction == null || transaction.getState().isComplete()) {
+ if (transaction == null) {
// allow this method to be called >1 with no adverse affects
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("endTransaction: level {} (no transaction exists)", transactionLevel);
+ }
+
return;
+ } else if (transaction.getState().isComplete()) {
+ // allow this method to be called >1 with no adverse affects
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("endTransaction: level {} (previous transaction completed)", transactionLevel);
+ }
+
+ return;
+ } else {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("endTransaction: level {}->{}", transactionLevel, transactionLevel - 1);
+ }
}
+
+ try {
+ endTransactionInternal();
+ } finally {
+ final IsisTransaction.State state = getCurrentTransaction().getState();
+ int transactionLevel = this.transactionLevel;
+ if(transactionLevel == 0 && !state.isComplete()) {
+ LOG.error("endTransaction: inconsistency detected between transactionLevel {} and transactionState '{}'", transactionLevel, state);
+ }
+ }
+ }
+
+ private void endTransactionInternal() {
+
+ final IsisTransaction transaction = getCurrentTransaction();
+
// terminate the transaction early if an abort cause was already set.
RuntimeException abortCause = this.getCurrentTransaction().getAbortCause();
if(transaction.getState().mustAbort()) {
-
+
if (LOG.isDebugEnabled()) {
- LOG.debug("endTransaction: aborting instead [EARLY TERMINATION], abort cause '" + abortCause.getMessage() + "' has been set");
+ LOG.debug("endTransaction: aborting instead [EARLY TERMINATION], abort cause '{}' has been set", abortCause.getMessage());
}
try {
abortTransaction();
@@ -309,12 +340,12 @@ public class IsisTransactionManager implements SessionScopedComponent {
// just in case any different exception was raised...
abortCause = this.getCurrentTransaction().getAbortCause();
} catch(RuntimeException ex) {
-
+
// ... or, capture this most recent exception
abortCause = ex;
}
-
-
+
+
if(abortCause != null) {
// hasn't been rendered lower down the stack, so fall back
throw abortCause;
@@ -324,61 +355,66 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
}
-
- transactionLevel--;
- if (transactionLevel == 0) {
+ // we don't decrement the transactionLevel just yet, because an exception might end up being thrown
+ // (meaning there would be more faffing around to ensure that the transactionLevel
+ // and state of the currentTransaction remain in sync)
+ if ( (transactionLevel - 1) == 0) {
//
// TODO: granted, this is some fairly byzantine coding. but I'm trying to account for different types
// of object store implementations that could start throwing exceptions at any stage.
// once the contract/API for the objectstore is better tied down, hopefully can simplify this...
//
-
+
if(abortCause == null) {
-
+
if (LOG.isDebugEnabled()) {
LOG.debug("endTransaction: committing");
}
try {
getCurrentTransaction().preCommit();
- } catch(RuntimeException ex) {
+ } catch(Exception ex) {
// just in case any new exception was raised...
- abortCause = ex;
- transactionLevel = 1; // because the transactionLevel was decremented earlier
+
+ // this bizarre code because an InvocationTargetException (which is not a RuntimeException) was
+ // being thrown due to a coding error in a domain object
+ abortCause = ex instanceof RuntimeException ? (RuntimeException) ex : new RuntimeException(ex);
+
+ getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
}
}
-
+
if(abortCause == null) {
try {
persistenceSession.endTransaction();
- } catch(RuntimeException ex) {
+ } catch(Exception ex) {
// just in case any new exception was raised...
- abortCause = ex;
-
+ abortCause = ex instanceof RuntimeException ? (RuntimeException) ex : new RuntimeException(ex);
+
// hacky... moving the transaction back to something other than COMMITTED
- transactionLevel = 1; // because the transactionLevel was decremented earlier
getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
}
}
- if(abortCause == null) {
- try {
- getCurrentTransaction().commit();
- } catch(RuntimeException ex) {
- // just in case any new exception was raised...
- abortCause = ex;
- transactionLevel = 1; // because the transactionLevel was decremented earlier
- }
- }
+
+ //
+ // ok, everything that could have thrown an exception is now done,
+ // so it's safe to decrement the transaction level
+ //
+ transactionLevel = 0;
// previously we called __isis_endRequest here on all RequestScopedServices. This is now
// done later, in PersistenceSession#close(). If we introduce support for @TransactionScoped
// services, then this would be the place to finalize them.
+
+ //
+ // finally, if an exception was thrown, we rollback the transaction
+ //
if(abortCause != null) {
-
+
if (LOG.isDebugEnabled()) {
LOG.debug("endTransaction: aborting instead, abort cause has been set");
}
@@ -389,17 +425,23 @@ public class IsisTransactionManager implements SessionScopedComponent {
// * we want the existing abortCause to be available
// * the transactionLevel is correctly now at 0.
}
-
+
throw abortCause;
+ } else {
+
+ // keeping things in sync
+ getCurrentTransaction().commit();
}
+
} else if (transactionLevel < 0) {
- LOG.error("endTransaction: transactionLevel=" + transactionLevel);
+ LOG.error("endTransaction: transactionLevel={}", transactionLevel);
transactionLevel = 0;
- throw new IllegalStateException(" no transaction running to end (transactionLevel < 0)");
+ IllegalStateException ex = new IllegalStateException(" no transaction running to end (transactionLevel < 0)");
+ getCurrentTransaction().setAbortCause(new IsisException(ex));
+ throw ex;
}
}
-
public void abortTransaction() {
if (getCurrentTransaction() != null) {
getCurrentTransaction().markAsAborted();
[11/44] isis git commit: ISIS-1465: adding interim-release.sh
Posted by da...@apache.org.
ISIS-1465: adding interim-release.sh
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f4586d84
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f4586d84
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f4586d84
Branch: refs/heads/master
Commit: f4586d8497ba30d2ec56c3f5f10d51feb2d4155c
Parents: aa1b1b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 01:13:47 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 01:21:26 2016 +0200
----------------------------------------------------------------------
interim-release.sh | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f4586d84/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
new file mode 100644
index 0000000..ea2231b
--- /dev/null
+++ b/interim-release.sh
@@ -0,0 +1,26 @@
+VERSION_BASE=$1
+
+if [ ! "$VERSION_BASE" ]; then
+ echo "usage: $(basename $0) [base version]"
+ echo " eg: $(basename $0) 1.13.0"
+ exit 1
+fi
+
+DATE=`date +'%Y%m%d-%H%M'`
+
+VERSION="$VERSION_BASE.$DATE"
+BRANCH="interim/$VERSION"
+TAG="isis-$VERSION"
+
+git checkout -b "$BRANCH"
+
+echo "updating version in all pom.xml files..."
+pushd core >/dev/null
+mvn versions:set -DnewVersion=$VERSION > /dev/null
+popd >/dev/null
+
+echo "Committing changes"
+git commit -am "bumping to $VERSION"
+
+echo "tagging"
+git tag $TAG
[20/44] isis git commit: ISIS-1492: Added css-class to object form
Posted by da...@apache.org.
ISIS-1492: Added css-class to object form
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/92de6a99
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/92de6a99
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/92de6a99
Branch: refs/heads/master
Commit: 92de6a994d3a0e17909f467b18325194239bcc4a
Parents: 0a1a968
Author: Erik de Hair <e....@pocos.nl>
Authored: Wed Sep 21 12:29:38 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 21 18:20:53 2016 +0100
----------------------------------------------------------------------
.../wicket/ui/pages/entity/EntityPage.java | 29 ++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/92de6a99/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 9574b18..f4d9bb0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -19,20 +19,13 @@
package org.apache.isis.viewer.wicket.ui.pages.entity;
-import org.apache.wicket.Application;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.string.Strings;
-
import org.apache.isis.applib.layout.component.Grid;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -43,6 +36,13 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+import org.apache.wicket.Application;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.Strings;
/**
* Web page representing an entity.
@@ -167,12 +167,12 @@ public class EntityPage extends PageAbstract {
}
final ObjectSpecification objectSpec = model.getTypeOfSpecification();
- final GridFacet facet = objectSpec.getFacet(GridFacet.class);
- if(facet != null) {
+ final GridFacet gridFacet = objectSpec.getFacet(GridFacet.class);
+ if(gridFacet != null) {
// the facet should always exist, in fact
// just enough to ask for the metadata.
// This will cause the current ObjectSpec to be updated as a side effect.
- final Grid unused = facet.getGrid();
+ final Grid unused = gridFacet.getGrid();
}
if(titleString == null) {
@@ -183,6 +183,13 @@ public class EntityPage extends PageAbstract {
WebMarkupContainer entityPageContainer = new WebMarkupContainer("entityPageContainer");
CssClassAppender.appendCssClassTo(entityPageContainer, objectSpec.getFullIdentifier().replace('.','-'));
CssClassAppender.appendCssClassTo(entityPageContainer, objectSpec.getCorrespondingClass().getSimpleName());
+
+ CssClassFacet cssClassFacet = objectSpec.getFacet(CssClassFacet.class);
+ if(cssClassFacet != null) {
+ final String cssClass = cssClassFacet.cssClass(objectAdapter);
+ CssClassAppender.appendCssClassTo(entityPageContainer, cssClass);
+ }
+
themeDiv.addOrReplace(entityPageContainer);
addChildComponents(entityPageContainer, model);
[16/44] isis git commit: ISIS-1465: enhancing interim-release.sh to
automatically cleanrremote branches and push new branch (and tag)
Posted by da...@apache.org.
ISIS-1465: enhancing interim-release.sh to automatically cleanrremote branches and push new branch (and tag)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8e6baa27
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8e6baa27
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8e6baa27
Branch: refs/heads/master
Commit: 8e6baa275e21ab2e5f4ff9ac66d34cf2469c843c
Parents: b2f0226
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 9 00:15:31 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 9 00:32:20 2016 +0200
----------------------------------------------------------------------
interim-release.sh | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8e6baa27/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index ea2231b..34dacb8 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -1,8 +1,10 @@
+#!/bin/bash
VERSION_BASE=$1
+REMOTE=$2
-if [ ! "$VERSION_BASE" ]; then
- echo "usage: $(basename $0) [base version]"
- echo " eg: $(basename $0) 1.13.0"
+if [ -z "$VERSION_BASE" -o -z "$REMOTE" ]; then
+ echo "usage: $(basename $0) [base version] [remote]"
+ echo " eg: $(basename $0) 1.13.0 incodehq"
exit 1
fi
@@ -12,6 +14,13 @@ VERSION="$VERSION_BASE.$DATE"
BRANCH="interim/$VERSION"
TAG="isis-$VERSION"
+echo "removing any earlier (local) 'interim' branches"
+for a in `git branch --list | grep interim`
+do
+ git branch -D $a
+done
+
+echo "checking out new branch $BRANCH"
git checkout -b "$BRANCH"
echo "updating version in all pom.xml files..."
@@ -24,3 +33,16 @@ git commit -am "bumping to $VERSION"
echo "tagging"
git tag $TAG
+
+echo "removing any earlier remote branches"
+for a in `git ls-remote --heads $REMOTE | sed 's?.*refs/heads/??' | grep interim`
+do
+ git push $REMOTE --delete $a
+done
+
+echo "pushing tag"
+git push $REMOTE $TAG
+
+echo "pushing branch"
+git push $REMOTE $BRANCH
+
[19/44] isis git commit: Changed all occurrences of allowNulls and
allowsNulls in the docs to allowsNull
Posted by da...@apache.org.
Changed all occurrences of allowNulls and allowsNulls in the docs to allowsNull
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a1a9682
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a1a9682
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a1a9682
Branch: refs/heads/master
Commit: 0a1a96820eb0a4aac021d08fcbbc7e76a465172f
Parents: 8f943fd
Author: Rosco Kalis <ro...@gmail.com>
Authored: Tue Sep 13 13:39:39 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 16 14:14:39 2016 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/_release-notes_1.3.0.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Column.adoc | 4 ++--
.../src/main/asciidoc/guides/_rgant-Property.adoc | 4 ++--
.../asciidoc/guides/_rgant-Property_optionality.adoc | 12 ++++++------
.../guides/_ugfun_core-concepts_building-blocks.adoc | 2 +-
.../_ugfun_how-tos_class-structure_properties.adoc | 8 ++++----
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
index be4e631..c3fc460 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.3.0.adoc
@@ -213,7 +213,7 @@
* link:https://issues.apache.org/jira/browse/ISIS-427[ISIS-427] - specific), with JDO implementation.
* link:https://issues.apache.org/jira/browse/ISIS-450[ISIS-450] - session interaction between entities.
* link:https://issues.apache.org/jira/browse/ISIS-459[ISIS-459] - Enhance IsisJdoSupport service to support integration testing (execute arbitrary SQL, delete all instances of an entity)
-* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive Apache Isis' MandatoryFacet from JDO @Column(allowNulls=) annotation, and provide @Mandatory annotation as override
+* link:https://issues.apache.org/jira/browse/ISIS-488[ISIS-488] - Derive Apache Isis' MandatoryFacet from JDO @Column(allowsNull=) annotation, and provide @Mandatory annotation as override
* link:https://issues.apache.org/jira/browse/ISIS-553[ISIS-553] - Provide view model support, as sketched out in the Restful Objects spec
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
index 97a1b12..f782a44 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Column.adoc
@@ -29,7 +29,7 @@ For example:
[source,java]
----
public class Customer {
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
----
@@ -54,7 +54,7 @@ public class Customer {
@javax.jdo.annotations.Column(length=20)
public String getFirstName() { ... }
public void setFirstName(String firstName) { ... }
- @javax.jdo.annotations.Column(allowNulls="true", length=1)
+ @javax.jdo.annotations.Column(allowsNull="true", length=1)
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
@javax.jdo.annotations.Column(length=30)
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
index 9d27376..774741b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property.adoc
@@ -73,7 +73,7 @@ Property must also be annotated with `@javax.jdo.annotations.NotPersistent` in o
|
|specifies a property is optional rather than mandatory +
-In many/most cases you should however use xref:rgant.adoc#_rgant-Column[`@Column#allowNulls()`]
+In many/most cases you should however use xref:rgant.adoc#_rgant-Column[`@Column#allowsNull()`]
@@ -102,7 +102,7 @@ public class Customer {
return EmailUtil.ensureValidEmail(proposed); // <1>
}
}
- @javax.jdo.annotations.Column(allowNulls="true") // <2>
+ @javax.jdo.annotations.Column(allowsNull="true") // <2>
@Property(
maxLength=30,
minLength=5,
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_rgant-Property_optionality.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property_optionality.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property_optionality.adoc
index 0d69502..932a20b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Property_optionality.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Property_optionality.adoc
@@ -12,14 +12,14 @@ By default, Apache Isis assumes that all properties of an domain object or view
That said, properties are most commonly defined on persistent domain objects (entities), in which case the JDO xref:rgant.adoc#_rgant-Column[`@Column`] should be specified. Apache Isis can infer the maxLength directly from the equivalent @Column#length() annotation.
-That said, properties are most commonly defined on persistent domain objects (entities), in which case the JDO xref:rgant.adoc#_rgant-Column[`@Column`] will in any case need to be specified. Apache Isis can infer the `optionality` semantic directly from the equivalent `@Column#allowNulls()` annotation/attribute.
+That said, properties are most commonly defined on persistent domain objects (entities), in which case the JDO xref:rgant.adoc#_rgant-Column[`@Column`] will in any case need to be specified. Apache Isis can infer the `optionality` semantic directly from the equivalent `@Column#allowsNull()` annotation/attribute.
For example:
[source,java]
----
public class Customer {
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
public String getMiddleInitial() { ... }
public void setMiddleInitial(String middleInitial) { ... }
...
@@ -31,9 +31,9 @@ In this case there is no need for the `@Property#optionality()` attribute.
== Mismatched defaults
-If the `@Column#allowNulls()` attribute is omitted and the `@Property#optionality() attribute is also omitted, then note that Isis' defaults and JDO's defaults differ. Specifically, Isis always assumes properties are mandatory, whereas JDO specifies that primitives are mandatory, but all reference types are optional.
+If the `@Column#allowsNull()` attribute is omitted and the `@Property#optionality() attribute is also omitted, then note that Isis' defaults and JDO's defaults differ. Specifically, Isis always assumes properties are mandatory, whereas JDO specifies that primitives are mandatory, but all reference types are optional.
-When Apache Isis initializes it checks for these mismatches during its metamodel validation phase, and will fail to boot ("fail-fast") if there is a mismatch. The fix is usually to add the `@Column#allowsNulls()` annotation/attribute.
+When Apache Isis initializes it checks for these mismatches during its metamodel validation phase, and will fail to boot ("fail-fast") if there is a mismatch. The fix is usually to add the `@Column#allowsNull()` annotation/attribute.
== Superclass inheritance type
@@ -53,7 +53,7 @@ public abstract class PaymentMethod {
@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.SUPERCLASS_TABLE)
public class CreditCardPaymentMethod extends PaymentMethod {
private String cardNumber;
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
@Property(optionality=Optionality.MANDATORY)
public String getCardNumber() { return this.cardNumber; }
public void setCardNumber(String cardNumber) { this.cardNumber = cardNumber; }
@@ -68,7 +68,7 @@ Alternatively, you could rely on the fact that Apache Isis never looks at fields
@javax.jdo.annotations.PersistenceCapable
@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.SUPERCLASS_TABLE)
public class CreditCardPaymentMethod extends PaymentMethod {
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
private String cardNumber;
public String getCardNumber() { return this.cardNumber; }
public void setCardNumber(String cardNumber) { this.cardNumber = cardNumber; }
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
index 45e5bef..6bd4d2e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
@@ -25,7 +25,7 @@ certain other JEE annotations such as `@javax.inject.Inject` (used for dependenc
The framework uses DataNucleus for its persistence mechanism. This is an ORM that implements the JDO and JPA APIs, and
which can map domain objects either to an RDBMS or to various NoSQL objectstores such as MongoDB or Neo4J. Apache Isis
-recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowNulls=...)`.
+recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowsNull=...)`.
In addition, the framework builds up the metamodel for each domain object using
xref:ugfun.adoc#_ugfun_object-layout[layout hints], such as `Customer.layout.json`. These provide metadata such as
http://git-wip-us.apache.org/repos/asf/isis/blob/0a1a9682/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
index c1e5327..a530db6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
@@ -31,7 +31,7 @@ For example, rather than:
[source,java]
----
-@javax.jdo.annotations.Column(allowNulls="true")
+@javax.jdo.annotations.Column(allowsNull="true")
private LocalDate date;
@Property(optionality=Optionality.OPTIONAL)
public LocalDate getDate() { ... }
@@ -43,7 +43,7 @@ you should instead simply write:
[source,java]
----
private LocalDate date;
-@javax.jdo.annotations.Column(allowNulls="true")
+@javax.jdo.annotations.Column(allowsNull="true")
public LocalDate getDate() { ... }
public void setDate(LocalDate d) { ... }
----
@@ -84,7 +84,7 @@ For example:
@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.SUPER_TABLE)
public class SomeSubtype extends SomeSuperType {
private LocalDate date;
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
@Property(optionality=Optionality.MANDATORY)
public LocalDate getDate() { ... }
public void setDate(LocalDate d) { ... }
@@ -102,7 +102,7 @@ An alternative way to achieve this is to leave the JDO annotation on the field (
----
@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.SUPER_TABLE)
public class SomeSubtype extends SomeSuperType {
- @javax.jdo.annotations.Column(allowNulls="true")
+ @javax.jdo.annotations.Column(allowsNull="true")
private LocalDate date;
// mandatory in Apache Isis by default
public LocalDate getDate() { }
[05/44] isis git commit: ISIS-1476: Transaction interface: Expose
"clearAbortCause" for don't pick up handled persistence Exceptions
Posted by da...@apache.org.
ISIS-1476: Transaction interface: Expose "clearAbortCause" for don't pick up handled persistence Exceptions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b12d2ac0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b12d2ac0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b12d2ac0
Branch: refs/heads/master
Commit: b12d2ac0209fd67ac4d2c6aaaba6b205c8202ffd
Parents: c066d41
Author: Oscar Bou <os...@apache.org>
Authored: Thu Aug 18 15:31:45 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 25 12:05:44 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/services/xactn/Transaction.java | 7 +++++++
.../isis/core/runtime/system/transaction/IsisTransaction.java | 5 +----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b12d2ac0/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
index 7c183a7..d95a044 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/xactn/Transaction.java
@@ -53,4 +53,11 @@ public interface Transaction extends HasTransactionId {
@Programmatic
void flush();
+ /**
+ * If the cause has been rendered higher up in the stack, then clear the cause so that
+ * it won't be picked up and rendered elsewhere.
+ */
+ @Programmatic
+ void clearAbortCause();
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b12d2ac0/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index ee2f65e..ace6b3c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -484,10 +484,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
return abortCause;
}
- /**
- * If the cause has been rendered higher up in the stack, then clear the cause so that
- * it won't be picked up and rendered elsewhere.
- */
+ @Override
public void clearAbortCause() {
abortCause = null;
}
[07/44] isis git commit: ISIS-1481: ensures that all methods of
AuthenticatedWebSession are synchronized, in order to avoid a race conditions,
eg in SessionLoggingService when authenicating.
Posted by da...@apache.org.
ISIS-1481: ensures that all methods of AuthenticatedWebSession are synchronized, in order to avoid a race conditions, eg in SessionLoggingService when authenicating.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bab40dc2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bab40dc2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bab40dc2
Branch: refs/heads/master
Commit: bab40dc25d00761bd447a0aaa7305f4efea7044d
Parents: 87966d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 7 14:35:47 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 7 14:35:47 2016 +0100
----------------------------------------------------------------------
.../wicket/AuthenticatedWebSessionForIsis.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bab40dc2/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 60750f0..21189a1 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.viewer.integration.wicket;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.Callable;
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
@@ -68,7 +67,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
@Override
- public boolean authenticate(final String username, final String password) {
+ public synchronized boolean authenticate(final String username, final String password) {
AuthenticationRequest authenticationRequest = new AuthenticationRequestPassword(username, password);
authenticationRequest.setRoles(Arrays.asList(USER_ROLE));
authenticationSession = getAuthenticationManager().authenticate(authenticationRequest);
@@ -81,7 +80,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
@Override
- public void invalidateNow() {
+ public synchronized void invalidateNow() {
// similar code in Restful Objects viewer (UserResourceServerside#logout)
// this needs to be done here because Wicket will expire the HTTP session
@@ -105,7 +104,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
@Override
- public void onInvalidate() {
+ public synchronized void onInvalidate() {
super.onInvalidate();
SessionLoggingService.CausedBy causedBy = RequestCycle.get() != null
@@ -120,12 +119,12 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
log(SessionLoggingService.Type.LOGOUT, userName, causedBy);
}
- public AuthenticationSession getAuthenticationSession() {
+ public synchronized AuthenticationSession getAuthenticationSession() {
return authenticationSession;
}
@Override
- public Roles getRoles() {
+ public synchronized Roles getRoles() {
if (!isSignedIn()) {
return null;
}
@@ -134,7 +133,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
@Override
- public void detach() {
+ public synchronized void detach() {
breadcrumbModel.detach();
super.detach();
}
@@ -195,7 +194,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
@Override
- public void replaceSession() {
+ public synchronized void replaceSession() {
// do nothing here because this will lead to problems with Shiro
// see https://issues.apache.org/jira/browse/ISIS-1018
}
[09/44] isis git commit: ISIS-1474: also allow implementations of
AuthenticationManagerInstaller to be instantiated with no-arg constructor
(same as behaviour in isis 1.12.x).
Posted by da...@apache.org.
ISIS-1474: also allow implementations of AuthenticationManagerInstaller to be instantiated with no-arg constructor (same as behaviour in isis 1.12.x).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6b9abc3c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6b9abc3c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6b9abc3c
Branch: refs/heads/master
Commit: 6b9abc3c695568f176166f662b55f018ac4c525e
Parents: e5ecb88
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 7 23:06:46 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 7 23:06:46 2016 +0200
----------------------------------------------------------------------
.../IsisComponentProviderUsingInstallers.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6b9abc3c/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index aa009b9..66edd6a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -174,6 +174,16 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
LOG.info("component installer not found; it will not be available: " + className);
} catch (final InstanceCreationClassException e) {
LOG.info("instance creation exception: " + e.getMessage());
+ } catch (final InstanceCreationException e) {
+ try {
+ final Installer object = (Installer) InstanceUtil.createInstance(className);
+ LOG.debug("created component installer: " + object.getName() + " - " + className);
+ installerList.add(object);
+ } catch (final UnavailableClassException e2) {
+ LOG.info("component installer not found; it will not be available: " + className);
+ } catch (final InstanceCreationClassException e2) {
+ LOG.info("instance creation exception: " + e2.getMessage());
+ }
}
}
}
[21/44] isis git commit: ISIS-1493: changed the way reversing order
applies for null values
Posted by da...@apache.org.
ISIS-1493: changed the way reversing order applies for null values
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/29a30101
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/29a30101
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/29a30101
Branch: refs/heads/master
Commit: 29a30101ef578ecb86e2c04dd5bb98118d90fc85
Parents: 92de6a9
Author: Erik de Hair <e....@pocos.nl>
Authored: Wed Sep 21 12:36:30 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 21 18:28:36 2016 +0100
----------------------------------------------------------------------
.../CollectionContentsSortableDataProvider.java | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/29a30101/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 0c2b36e..c032e58 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -19,19 +19,10 @@
package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable;
-import java.util.Iterator;
-import java.util.List;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.model.IModel;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -44,6 +35,13 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.model.IModel;
+
+import java.util.Iterator;
+import java.util.List;
/**
* Part of the {@link AjaxFallbackDefaultDataTable} API.
@@ -160,14 +158,16 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
public int compare(final ObjectAdapter p, final ObjectAdapter q) {
final ObjectAdapter pSort = sortProperty.get(p, InteractionInitiatedBy.FRAMEWORK);
final ObjectAdapter qSort = sortProperty.get(q, InteractionInitiatedBy.FRAMEWORK);
- Ordering<ObjectAdapter> naturalOrdering =
- ascending
- ? ORDERING_BY_NATURAL.nullsFirst()
- : ORDERING_BY_NATURAL.nullsLast();
+ Ordering<ObjectAdapter> naturalOrdering;
+ if(ascending){
+ naturalOrdering = ORDERING_BY_NATURAL.nullsFirst();
+ } else {
+ naturalOrdering = ORDERING_BY_NATURAL.reverse().nullsLast();
+ }
return naturalOrdering.compare(pSort, qSort);
}
};
- return ascending?ordering:ordering.reverse();
+ return ordering;
}
private static Ordering<ObjectAdapter> ORDERING_BY_NATURAL = new Ordering<ObjectAdapter>(){
[13/44] isis git commit: ISIS-1465: for .travis.yml,
use 'script' rather than 'install' to build the project (otherwise
will run 'mvn test -B' at the end as the default script)
Posted by da...@apache.org.
ISIS-1465: for .travis.yml, use 'script' rather than 'install' to build the project (otherwise will run 'mvn test -B' at the end as the default script)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8829ff82
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8829ff82
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8829ff82
Branch: refs/heads/master
Commit: 8829ff82533bfff98284f4bbb316d4b15e275b4d
Parents: e788773
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:28:30 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:28:30 2016 +0200
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8829ff82/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c44eb99..2bb59e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
language: java
jdk:
- oraclejdk8
-install: "mvn clean install -Dskip.app -Dskip.arch"
+script: "mvn clean install -Dskip.app -Dskip.arch"
[03/44] isis git commit: ISIS-1477: add null checking in case there
are no parameters in the DTO (as appears to be the case for 0-arg commands).
Posted by da...@apache.org.
ISIS-1477: add null checking in case there are no parameters in the DTO (as appears to be the case for 0-arg commands).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a8837d43
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a8837d43
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a8837d43
Branch: refs/heads/master
Commit: a8837d433863b2d527016f0504e70b615a11c7fc
Parents: 32e0161
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 23 22:04:39 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 23 22:04:39 2016 +0100
----------------------------------------------------------------------
.../background/BackgroundCommandExecution.java | 22 +++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a8837d43/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 2b3c8cb..6362647 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -16,6 +16,7 @@
*/
package org.apache.isis.core.runtime.services.background;
+import java.util.Collections;
import java.util.List;
import com.google.common.base.Function;
@@ -51,6 +52,7 @@ import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MemberDto;
import org.apache.isis.schema.cmd.v1.ParamDto;
+import org.apache.isis.schema.cmd.v1.ParamsDto;
import org.apache.isis.schema.cmd.v1.PropertyDto;
import org.apache.isis.schema.common.v1.InteractionType;
import org.apache.isis.schema.common.v1.OidDto;
@@ -107,13 +109,6 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
final IsisTransactionManager transactionManager,
final Command backgroundCommand) {
-
- //
- // TODO: need to generalize so that can invoke property modifications also.
- //
-
-
-
transactionManager.executeWithinTransaction(
backgroundCommand,
new TransactionalClosure() {
@@ -332,7 +327,7 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
}
private ObjectAdapter[] argAdaptersFor(final ActionDto actionDto) {
- final List<ParamDto> params = actionDto.getParameters().getParameter();
+ final List<ParamDto> params = paramDtosFrom(actionDto);
final List<ObjectAdapter> args = Lists.newArrayList(
Iterables.transform(params, new Function<ParamDto, ObjectAdapter>() {
@Override
@@ -345,6 +340,17 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
return args.toArray(new ObjectAdapter[]{});
}
+ private static List<ParamDto> paramDtosFrom(final ActionDto actionDto) {
+ final ParamsDto parameters = actionDto.getParameters();
+ if (parameters != null) {
+ final List<ParamDto> parameterList = parameters.getParameter();
+ if (parameterList != null) {
+ return parameterList;
+ }
+ }
+ return Collections.emptyList();
+ }
+
// //////////////////////////////////////
@javax.inject.Inject
[02/44] isis git commit: ISIS-1472: set Command#Executor when
invoking an action or editing a property.
Posted by da...@apache.org.
ISIS-1472: set Command#Executor when invoking an action or editing a property.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/32e01615
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/32e01615
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/32e01615
Branch: refs/heads/master
Commit: 32e01615381e9a3721f61b3b08117d93605fcac6
Parents: f264a79
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jul 19 15:56:25 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 23 21:54:27 2016 +0100
----------------------------------------------------------------------
.../server/resources/DomainObjectResourceServerside.java | 11 +++++++++++
.../resources/DomainServiceResourceServerside.java | 9 ++++++++-
.../server/resources/ResourceAbstract.java | 6 ++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/32e01615/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
index 8948555..6afa9f4 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.command.Command;
import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -206,6 +207,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public Response modifyProperty(@PathParam("domainType") String domainType, @PathParam("instanceId") final String instanceId, @PathParam("propertyId") final String propertyId, final InputStream body) {
init(Where.OBJECT_FORMS, RepresentationService.Intent.NOT_APPLICABLE);
+ setCommandExecutor(Command.Executor.USER);
+
final ObjectAdapter objectAdapter = getObjectAdapterElseThrowNotFound(domainType, instanceId);
final DomainResourceHelper helper = newDomainResourceHelper(objectAdapter);
final ObjectAdapterAccessHelper accessHelper = new ObjectAdapterAccessHelper(getResourceContext(), objectAdapter);
@@ -243,6 +246,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public Response clearProperty(@PathParam("domainType") String domainType, @PathParam("instanceId") final String instanceId, @PathParam("propertyId") final String propertyId) {
init(Where.OBJECT_FORMS, RepresentationService.Intent.NOT_APPLICABLE);
+ setCommandExecutor(Command.Executor.USER);
+
final ObjectAdapter objectAdapter = getObjectAdapterElseThrowNotFound(domainType, instanceId);
final DomainResourceHelper helper = newDomainResourceHelper(objectAdapter);
final ObjectAdapterAccessHelper accessHelper = new ObjectAdapterAccessHelper(getResourceContext(), objectAdapter);
@@ -454,6 +459,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
final String urlUnencodedQueryString = UrlEncodingUtils.urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, urlUnencodedQueryString);
+ setCommandExecutor(Command.Executor.USER);
+
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
final ObjectAdapter objectAdapter = getObjectAdapterElseThrowNotFound(domainType, instanceId);
@@ -479,6 +486,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, body);
+ setCommandExecutor(Command.Executor.USER);
+
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
final ObjectAdapter objectAdapter = getObjectAdapterElseThrowNotFound(domainType, instanceId);
@@ -504,6 +513,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE,
body);
+ setCommandExecutor(Command.Executor.USER);
+
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
final ObjectAdapter objectAdapter = getObjectAdapterElseThrowNotFound(domainType, instanceId);
http://git-wip-us.apache.org/repos/asf/isis/blob/32e01615/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
index 4fcad7f..010785c 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
@@ -36,6 +36,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.command.Command;
import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
@@ -201,10 +202,10 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
final @PathParam("actionId") String actionId,
final @QueryParam("x-isis-querystring") String xIsisUrlEncodedQueryString) {
-
final String urlUnencodedQueryString = UrlEncodingUtils.urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, urlUnencodedQueryString);
+ setCommandExecutor(Command.Executor.USER);
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
@@ -230,6 +231,8 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
final InputStream body) {
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, body);
+ setCommandExecutor(Command.Executor.USER);
+
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
final ObjectAdapter serviceAdapter = getServiceAdapter(serviceId);
@@ -250,6 +253,8 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
public Response invokeAction(@PathParam("serviceId") final String serviceId, @PathParam("actionId") final String actionId, final InputStream body) {
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, body);
+ setCommandExecutor(Command.Executor.USER);
+
final JsonRepresentation arguments = getResourceContext().getQueryStringAsJsonRepr();
final ObjectAdapter serviceAdapter = getServiceAdapter(serviceId);
@@ -268,4 +273,6 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/32e01615/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 9911d63..8806959 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -31,6 +31,8 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Providers;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlEncodingUtils;
@@ -129,6 +131,10 @@ public abstract class ResourceAbstract {
}
+ protected void setCommandExecutor(Command.Executor executor) {
+ getServicesInjector().lookupServiceElseFail(CommandContext.class).getCommand().setExecutor(executor);
+ }
+
// //////////////////////////////////////////////////////////////
// Isis integration
// //////////////////////////////////////////////////////////////
[10/44] isis git commit: ISIS-1465: tiny patch to archetype's unit
test
Posted by da...@apache.org.
ISIS-1465: tiny patch to archetype's unit test
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/aa1b1b0f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/aa1b1b0f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/aa1b1b0f
Branch: refs/heads/master
Commit: aa1b1b0f39ff6f08df3984069cf5458bef87df28
Parents: 6b9abc3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 7 23:07:10 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 7 23:07:10 2016 +0200
----------------------------------------------------------------------
.../dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/aa1b1b0f/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index b9dbcb4..b789f3a 100644
--- a/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++ b/example/application/simpleapp/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -27,7 +27,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
- simpleObject = new SimpleObject();
+ simpleObject = new SimpleObject(null);
}
public static class Name extends SimpleObjectTest {
[41/44] isis git commit: ISIS-1516: fixes typo on home page
Posted by da...@apache.org.
ISIS-1516: fixes typo on home page
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1bb051ff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1bb051ff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1bb051ff
Branch: refs/heads/master
Commit: 1bb051fffa998b13e8555333e549cd98b73f80df
Parents: d023786
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 12 14:23:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 21 15:39:47 2016 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1bb051ff/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 f735450..a84dc8e 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -808,7 +808,7 @@ mvn archetype:generate \
<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> -->
+<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
<script src="./js/slick/1.5.0/slick.min.js"></script>
[39/44] isis git commit: ISIS-1516: fixes typo on home page
Posted by da...@apache.org.
ISIS-1516: fixes typo on home page
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/00ef021e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/00ef021e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/00ef021e
Branch: refs/heads/master
Commit: 00ef021e2d48a0fccfbb3625b6f0a493fd52fda0
Parents: 62853b9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 12 14:23:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 12 14:23:35 2016 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/00ef021e/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 c471e75..8bff14a 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -783,7 +783,7 @@ mvn archetype:generate \
<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> -->
+<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
<script src="./js/slick/1.5.0/slick.min.js"></script>