date:20170921

[isis] Git Push Summary

2017-09-21 Thread danhaywood

Repository: isis
Updated Tags:  refs/tags/simpleapp-archetype-1.15.1-RC1 [created] baac217e2

[isis] Git Push Summary

2017-09-21 Thread danhaywood

Repository: isis
Updated Tags:  refs/tags/helloworld-archetype-1.15.1-RC1 [created] 6292ef282

[isis] Git Push Summary

2017-09-21 Thread danhaywood

Repository: isis
Updated Tags:  refs/tags/isis-1.15.1-RC1 [created] 26acbe951

[03/11] isis git commit: [maven-release-plugin] prepare for next development iteration

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2acefdb3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2acefdb3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2acefdb3

Branch: refs/heads/release-1.15.1-RC1
Commit: 2acefdb3d7a13c421b9737ad82e723b226d66033
Parents: 24cc6f2
Author: Dan Haywood 
Authored: Thu Sep 21 23:12:26 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 23:12:26 2017 +0100

--
 core/applib/pom.xml  |  2 +-
 core/integtestsupport/pom.xml|  2 +-
 core/log4j/pom.xml   |  2 +-
 core/maven-plugin/pom.xml|  2 +-
 core/mavendeps-intellij/pom.xml  |  2 +-
 core/mavendeps-testing/pom.xml   |  2 +-
 core/mavendeps-webapp/pom.xml|  2 +-
 core/metamodel/pom.xml   |  2 +-
 core/pom.xml | 72 +++
 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 +-
 24 files changed, 61 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 5b5ce3f..c048c8c 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-1.15.1
+1.16.0-SNAPSHOT
 
 
 isis-core-applib

http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index f07faaa..fc22bd8 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@

org.apache.isis.core
isis
-1.15.1
+1.16.0-SNAPSHOT

 
isis-core-integtestsupport

http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/log4j/pom.xml
--
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index a061115..d56799f 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
 
 org.apache.isis.core
 isis
-1.15.1
+1.16.0-SNAPSHOT
 
 
 isis-core-log4j

http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/maven-plugin/pom.xml
--
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 42a1975..0988899 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-1.15.1
+1.16.0-SNAPSHOT
 
 
 org.apache.isis.tool

http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/mavendeps-intellij/pom.xml
--
diff --git a/core/mavendeps-intellij/pom.xml b/core/mavendeps-intellij/pom.xml
index 7abea15..4e8600c 100644
--- a/core/mavendeps-intellij/pom.xml
+++ b/core/mavendeps-intellij/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-1.15.1
+1.16.0-SNAPSHOT
 
 
 org.apache.isis.mavendeps

http://git-wip-us.apache.org/repos/asf/isis/blob/2acefdb3/core/mavendeps-testing/pom.xml
--
diff --git a/core/mavendeps-testing/pom.xml b/core/mavendeps-testing/pom.xml
index c63bf1f..3a9959f 100644
--- a/core/mavendeps-testing/pom.xml
+++ b/core/mavendeps-testing/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-1.15.1
+1.16.0-SNAPSHOT
 
 
 org.apache.isis.mavendeps

[04/11] isis git commit: ISIS-1712: updates simpleapp example app to use isis 1.15.1

2017-09-21 Thread danhaywood

ISIS-1712: updates simpleapp example app to use isis 1.15.1

Also bumps lombok to 1.16.18


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3ea3af66
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3ea3af66
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3ea3af66

Branch: refs/heads/release-1.15.1-RC1
Commit: 3ea3af6618440d1524329c29164e54048e30b702
Parents: 2acefdb
Author: Dan Haywood 
Authored: Thu Sep 21 23:36:49 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 23:36:49 2017 +0100

--
 example/application/simpleapp/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/3ea3af66/example/application/simpleapp/pom.xml
--
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index 989a275..9ee473a 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -40,9 +40,9 @@
 
 
 
-1.16.0-SNAPSHOT
+1.15.1
 
-1.16.10
+1.16.18
 
 1.7
 1.7

[11/11] isis git commit: [maven-release-plugin] prepare for next development iteration

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/75be6112
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/75be6112
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/75be6112

Branch: refs/heads/release-1.15.1-RC1
Commit: 75be61123c75c6002ffd99922102788d35cad865
Parents: 0e98c1a
Author: Dan Haywood 
Authored: Fri Sep 22 00:29:59 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:29:59 2017 +0100

--
 example/archetype/helloworld/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/75be6112/example/archetype/helloworld/pom.xml
--
diff --git a/example/archetype/helloworld/pom.xml 
b/example/archetype/helloworld/pom.xml
index 4efbaff..f10a2c3 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.isis.archetype
 helloworld-archetype
-1.15.1
+1.16.0-SNAPSHOT
 maven-archetype
 helloworld-archetype
 
@@ -65,7 +65,7 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 g...@github.com:incodehq/incode-build.git/helloworld
-  helloworld-archetype-1.15.1
+  HEAD
   
 
 org.apache.isis.core

[08/11] isis git commit: ISIS-1712: updates helloworld app to use 1.15.1.

2017-09-21 Thread danhaywood

ISIS-1712: updates helloworld app to use 1.15.1.

Also updates lombok to 1.16.18


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/498c9bb7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/498c9bb7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/498c9bb7

Branch: refs/heads/release-1.15.1-RC1
Commit: 498c9bb74402aa312771292c69be622bc32fd327
Parents: 41ee2cb
Author: Dan Haywood 
Authored: Fri Sep 22 00:24:32 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:24:32 2017 +0100

--
 example/application/helloworld/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/498c9bb7/example/application/helloworld/pom.xml
--
diff --git a/example/application/helloworld/pom.xml 
b/example/application/helloworld/pom.xml
index a1cdb4d..646de10 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -36,9 +36,9 @@
 war
 
 
-1.16.0-SNAPSHOT
+1.15.1
 
-1.16.10
+1.16.18
 
 1.8
 1.8

[06/11] isis git commit: [maven-release-plugin] prepare release simpleapp-archetype-1.15.1

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare release simpleapp-archetype-1.15.1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d8f12f45
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d8f12f45
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d8f12f45

Branch: refs/heads/release-1.15.1-RC1
Commit: d8f12f45a3765e0b6b683adb74cb18885f129973
Parents: 215969c
Author: Dan Haywood 
Authored: Fri Sep 22 00:06:21 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:06:21 2017 +0100

--
 example/archetype/simpleapp/pom.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/d8f12f45/example/archetype/simpleapp/pom.xml
--
diff --git a/example/archetype/simpleapp/pom.xml 
b/example/archetype/simpleapp/pom.xml
index 5607d72..d2d3b39 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
 org.apache.isis.archetype
 simpleapp-archetype
-1.16.0-SNAPSHOT
+1.15.1
 maven-archetype
 simpleapp-archetype
 
@@ -65,7 +65,8 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 g...@github.com:incodehq/incode-build.git/simpleapp
-
+  simpleapp-archetype-1.15.1
+  
 
 org.apache.isis.core
 isis

[09/11] isis git commit: ISIS-1712: recreating helloworld archetype

2017-09-21 Thread danhaywood

ISIS-1712: recreating helloworld archetype


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/057b85c9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/057b85c9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/057b85c9

Branch: refs/heads/release-1.15.1-RC1
Commit: 057b85c906fb108a64daab6f0f545e8993d525aa
Parents: 498c9bb
Author: Dan Haywood 
Authored: Fri Sep 22 00:27:20 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:27:20 2017 +0100

--
 example/archetype/helloworld/pom.xml|  7 +++
 .../resources/META-INF/maven/archetype-metadata.xml |  1 +
 .../resources/archetype-resources/enhance-all.sh|  2 ++
 .../src/main/resources/archetype-resources/pom.xml  |  4 ++--
 .../java/domainapp/dom/impl/HelloWorldObject.java   | 16 +++-
 .../java/domainapp/dom/impl/HelloWorldObjects.java  |  5 +
 .../dom/impl/HelloWorldObjectTest_delete.java   |  2 +-
 .../dom/impl/HelloWorldObjectTest_updateName.java   |  2 +-
 .../resources/projects/basic/archetype.properties   |  2 +-
 9 files changed, 23 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/057b85c9/example/archetype/helloworld/pom.xml
--
diff --git a/example/archetype/helloworld/pom.xml 
b/example/archetype/helloworld/pom.xml
index 811a887..6adeb64 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 4.0.0
 org.apache.isis.archetype
 helloworld-archetype
@@ -65,12 +65,11 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 g...@github.com:incodehq/incode-build.git/helloworld
-  HEAD
-  
+
 
 org.apache.isis.core
 isis
-1.15.0
+1.15.1
 ../../../core/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/057b85c9/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
 
b/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
index 3d3fcec..fbec4e4 100644
--- 
a/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ 
b/example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -72,6 +72,7 @@
 
 .gitattributes
 .gitignore
+enhance-all.sh
 README.adoc
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/057b85c9/example/archetype/helloworld/src/main/resources/archetype-resources/enhance-all.sh
--
diff --git 
a/example/archetype/helloworld/src/main/resources/archetype-resources/enhance-all.sh
 
b/example/archetype/helloworld/src/main/resources/archetype-resources/enhance-all.sh
new file mode 100644
index 000..2da7b0f
--- /dev/null
+++ 
b/example/archetype/helloworld/src/main/resources/archetype-resources/enhance-all.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+mvn datanucleus:enhance -o
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/057b85c9/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml 
b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
index fb3c632..c11f281 100644
--- 
a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
+++ 
b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
@@ -34,9 +34,9 @@
 war
 
 
-1.15.0
+1.15.1
 
-1.16.10
+1.16.18
 
 1.8
 1.8

http://git-wip-us.apache.org/repos/asf/isis/blob/057b85c9/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java

[02/11] isis git commit: [maven-release-plugin] prepare release isis-1.15.1

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare release isis-1.15.1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24cc6f2b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24cc6f2b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24cc6f2b

Branch: refs/heads/release-1.15.1-RC1
Commit: 24cc6f2b2d287547474143ca352ee6c23f221b19
Parents: 8562ddb
Author: Dan Haywood 
Authored: Thu Sep 21 23:12:23 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 23:12:23 2017 +0100

--
 core/applib/pom.xml  |  2 +-
 core/integtestsupport/pom.xml|  2 +-
 core/log4j/pom.xml   |  2 +-
 core/maven-plugin/pom.xml|  2 +-
 core/mavendeps-intellij/pom.xml  |  2 +-
 core/mavendeps-testing/pom.xml   |  2 +-
 core/mavendeps-webapp/pom.xml|  2 +-
 core/metamodel/pom.xml   |  2 +-
 core/pom.xml | 72 +++
 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 +-
 24 files changed, 61 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/applib/pom.xml
--
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index c048c8c..5b5ce3f 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-1.16.0-SNAPSHOT
+1.15.1
 
 
 isis-core-applib

http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/integtestsupport/pom.xml
--
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index fc22bd8..f07faaa 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@

org.apache.isis.core
isis
-1.16.0-SNAPSHOT
+1.15.1

 
isis-core-integtestsupport

http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/log4j/pom.xml
--
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index d56799f..a061115 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
 
 org.apache.isis.core
 isis
-1.16.0-SNAPSHOT
+1.15.1
 
 
 isis-core-log4j

http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/maven-plugin/pom.xml
--
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 0988899..42a1975 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-1.16.0-SNAPSHOT
+1.15.1
 
 
 org.apache.isis.tool

http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/mavendeps-intellij/pom.xml
--
diff --git a/core/mavendeps-intellij/pom.xml b/core/mavendeps-intellij/pom.xml
index 4e8600c..7abea15 100644
--- a/core/mavendeps-intellij/pom.xml
+++ b/core/mavendeps-intellij/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-1.16.0-SNAPSHOT
+1.15.1
 
 
 org.apache.isis.mavendeps

http://git-wip-us.apache.org/repos/asf/isis/blob/24cc6f2b/core/mavendeps-testing/pom.xml
--
diff --git a/core/mavendeps-testing/pom.xml b/core/mavendeps-testing/pom.xml
index 3a9959f..c63bf1f 100644
--- a/core/mavendeps-testing/pom.xml
+++ b/core/mavendeps-testing/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-1.16.0-SNAPSHOT
+1.15.1
 
 
 org.apache.isis.mavendeps

[05/11] isis git commit: ISIS-1712: recreating simpleapp archetype

2017-09-21 Thread danhaywood

ISIS-1712: recreating simpleapp archetype


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/215969cb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/215969cb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/215969cb

Branch: refs/heads/release-1.15.1-RC1
Commit: 215969cbc905e397145c880a069ca3891ee0411f
Parents: 3ea3af6
Author: Dan Haywood 
Authored: Fri Sep 22 00:05:08 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:05:08 2017 +0100

--
 example/archetype/simpleapp/pom.xml |  7 +-
 .../META-INF/maven/archetype-metadata.xml   |  7 +-
 .../application/manifest/isis.properties| 12 ++-
 .../archetype-resources/enhance-all.sh  |  2 +
 .../archetype-resources/module-simple/pom.xml   |  5 ++
 .../modules/simple/dom/impl/SimpleObject.java   | 17 ++--
 .../simple/dom/impl/SimpleObjectRepository.java |  5 +-
 .../dom/impl/SimpleObjectRepository_Test.java   |  8 +-
 .../simple/dom/impl/SimpleObject_Test.java  |  2 +-
 .../archetype-resources/pom-jdo-enhance-all.xml | 92 
 .../main/resources/archetype-resources/pom.xml  |  4 +-
 .../webapp/src/main/webapp/WEB-INF/shiro.ini| 10 +--
 .../projects/basic/archetype.properties |  2 +-
 13 files changed, 43 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/215969cb/example/archetype/simpleapp/pom.xml
--
diff --git a/example/archetype/simpleapp/pom.xml 
b/example/archetype/simpleapp/pom.xml
index 4b2d6cf..5607d72 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
 4.0.0
 org.apache.isis.archetype
 simpleapp-archetype
@@ -65,12 +65,11 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 g...@github.com:incodehq/incode-build.git/simpleapp
-  HEAD
-  
+
 
 org.apache.isis.core
 isis
-1.15.0
+1.15.1
 ../../../core/pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/215969cb/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
 
b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
index bb3c767..4092c71 100644
--- 
a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ 
b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -44,17 +44,12 @@
 **/*.class
 
 
-
-
-
-pom-jdo-enhance-all.xml
-
-
 
 
 
 .gitattributes
 .gitignore
+enhance-all.sh
 README.adoc
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/215969cb/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
--
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
index 9d24286..1e73022 100644
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
+++ 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/resources/domainapp/application/manifest/isis.properties
@@ -263,7 +263,7 @@ 
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${sym
 ${symbol_pound}
 ${symbol_pound} Whether changes to objects should be audited; if not set, 
defaults to "none"
 ${symbol_pound} - if not set or set to

[10/11] isis git commit: [maven-release-plugin] prepare release helloworld-archetype-1.15.1

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare release helloworld-archetype-1.15.1


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0e98c1a1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0e98c1a1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0e98c1a1

Branch: refs/heads/release-1.15.1-RC1
Commit: 0e98c1a13364f36e5637cbdca636b516b9d70796
Parents: 057b85c
Author: Dan Haywood 
Authored: Fri Sep 22 00:29:57 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:29:57 2017 +0100

--
 example/archetype/helloworld/pom.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/0e98c1a1/example/archetype/helloworld/pom.xml
--
diff --git a/example/archetype/helloworld/pom.xml 
b/example/archetype/helloworld/pom.xml
index 6adeb64..4efbaff 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -17,11 +17,11 @@
   specific language governing permissions and limitations
   under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
 4.0.0
 org.apache.isis.archetype
 helloworld-archetype
-1.16.0-SNAPSHOT
+1.15.1
 maven-archetype
 helloworld-archetype
 
@@ -65,7 +65,8 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 
scm:git:g...@github.com:incodehq/incode-build.git/helloworld
 g...@github.com:incodehq/incode-build.git/helloworld
-
+  helloworld-archetype-1.15.1
+  
 
 org.apache.isis.core
 isis

[01/11] isis git commit: ISIS-1712: adds missing license header

2017-09-21 Thread danhaywood

Repository: isis
Updated Branches:
  refs/heads/release-1.15.1-RC1 [created] 75be61123


ISIS-1712: adds missing license header


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8562ddbc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8562ddbc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8562ddbc

Branch: refs/heads/release-1.15.1-RC1
Commit: 8562ddbc05a4bf78bcca419f68d8308af8604ac1
Parents: ff85b71
Author: Dan Haywood 
Authored: Thu Sep 21 22:40:25 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 22:40:25 2017 +0100

--
 .../DomainServiceMenuOrder_UnitTest.java  | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/8562ddbc/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
--
diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
index 2960ea1..0f28ed0 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder_UnitTest.java
@@ -1,3 +1,21 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
 package org.apache.isis.core.metamodel.facets.object.domainservice;
 
 import org.junit.Test;

[07/11] isis git commit: [maven-release-plugin] prepare for next development iteration

2017-09-21 Thread danhaywood

[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/41ee2cba
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/41ee2cba
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/41ee2cba

Branch: refs/heads/release-1.15.1-RC1
Commit: 41ee2cbaa6d007e5b6591a8c57594094637c5725
Parents: d8f12f4
Author: Dan Haywood 
Authored: Fri Sep 22 00:06:23 2017 +0100
Committer: Dan Haywood 
Committed: Fri Sep 22 00:06:23 2017 +0100

--
 example/archetype/simpleapp/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/41ee2cba/example/archetype/simpleapp/pom.xml
--
diff --git a/example/archetype/simpleapp/pom.xml 
b/example/archetype/simpleapp/pom.xml
index d2d3b39..652b50a 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
 4.0.0
 org.apache.isis.archetype
 simpleapp-archetype
-1.15.1
+1.16.0-SNAPSHOT
 maven-archetype
 simpleapp-archetype
 
@@ -65,7 +65,7 @@
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 
scm:git:g...@github.com:incodehq/incode-build.git/simpleapp
 g...@github.com:incodehq/incode-build.git/simpleapp
-  simpleapp-archetype-1.15.1
+  HEAD
   
 
 org.apache.isis.core

[3/6] isis git commit: Merge branch 'ISIS-1731_pr-94'

2017-09-21 Thread danhaywood

Merge branch 'ISIS-1731_pr-94'


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2493cf84
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2493cf84
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2493cf84

Branch: refs/heads/master
Commit: 2493cf84f6a9fc08e65cac96f40810e7ae6c56e6
Parents: 9306dff 7f15b18
Author: Dan Haywood 
Authored: Thu Sep 21 11:19:25 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 11:19:25 2017 +0100

--
 .../scalars/ScalarPanelAbstract2.java   | 49 +---
 1 file changed, 33 insertions(+), 16 deletions(-)
--

[5/6] isis git commit: ISIS-1733: updates RepositoryService and its framework implementation so that persist and persistAndFlush are now generic and return the supplied object ... allow for more fluen

2017-09-21 Thread danhaywood

ISIS-1733: updates RepositoryService and its framework implementation so that 
persist and persistAndFlush are now generic and return the supplied object ... 
allow for more fluent coding style


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3076e5b7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3076e5b7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3076e5b7

Branch: refs/heads/master
Commit: 3076e5b796e30005f536eb8bcdd24b3f4ddca9b3
Parents: f8ecbde
Author: Dan Haywood 
Authored: Thu Sep 21 11:23:47 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 11:23:47 2017 +0100

--
 .../services/repository/RepositoryService.java |  4 ++--
 .../RepositoryServiceInternalDefault.java  | 17 ++---
 2 files changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/3076e5b7/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
--
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
 
b/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
index 49cbe08..46f77b9 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryService.java
@@ -72,7 +72,7 @@ public interface RepositoryService {
  * @see #isPersistent(Object)
  */
 @Programmatic
-void persist(Object domainObject);
+ T persist(T domainObject);
 
 /**
  * Persist the specified object (or do nothing if already persistent) and 
flushes changes to the database.
@@ -80,7 +80,7 @@ public interface RepositoryService {
  * @see #persist(Object)
  */
 @Programmatic
-void persistAndFlush(Object domainObject);
+ T persistAndFlush(T domainObject);
 
 /**
  * Deletes the domain object but only if is persistent.

http://git-wip-us.apache.org/repos/asf/isis/blob/3076e5b7/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
--
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
index e692dc2..15853c1 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
@@ -78,30 +78,33 @@ public class RepositoryServiceInternalDefault implements 
RepositoryService {
 
 @Programmatic
 @Override
-public void persist(final Object object) {
+public  T persist(final T object) {
 if (isPersistent(object)) {
-return;
+return object;
 }
 final ObjectAdapter adapter = 
persistenceSessionServiceInternal.adapterFor(unwrapped(object));
 
 if(adapter == null) {
-throw new PersistFailedException("Object not known to framework; 
instantiate using newTransientInstance(...) rather than simply new'ing up.");
+throw new PersistFailedException("Object not known to framework 
(unable to create/obtain an adapter)");
 }
 if (adapter.isParentedCollection()) {
 // TODO check aggregation is supported
-return;
+return  object;
 }
 if (isPersistent(object)) {
 throw new PersistFailedException("Object already persistent; OID=" 
+ adapter.getOid());
 }
 persistenceSessionServiceInternal.makePersistent(adapter);
+
+return object;
 }
 
 @Programmatic
 @Override
-public void persistAndFlush(final Object object) {
-   persist(object);
-   transactionService.flushTransaction();
+public  T persistAndFlush(final T object) {
+persist(object);
+transactionService.flushTransaction();
+return object;
 }
 
 @Override

[4/6] isis git commit: ISIS-1466: adds null guard which fixes Hidden(Where.PARENTED_TABLES), and testing Hidden(Where.REFERENCES_PARENT) this also seems to be ok.

2017-09-21 Thread danhaywood

ISIS-1466: adds null guard which fixes Hidden(Where.PARENTED_TABLES), and 
testing Hidden(Where.REFERENCES_PARENT) this also seems to be ok.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f8ecbde4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f8ecbde4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f8ecbde4

Branch: refs/heads/master
Commit: f8ecbde40c8014ebd24d868c3fb058d84b7b9ab9
Parents: 2493cf8
Author: Dan Haywood 
Authored: Thu Sep 21 11:21:41 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 11:21:41 2017 +0100

--
 .../ajaxtable/CollectionContentsAsAjaxTablePanel.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/f8ecbde4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
--
diff --git 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 8f5541c..94ca53d 100644
--- 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -205,8 +205,10 @@ public class CollectionContentsAsAjaxTablePanel
 
 for (final String propertyId : propertyIds) {
 final ObjectAssociation property = propertyById.get(propertyId);
-final ColumnAbstract nopc = 
createObjectAdapterPropertyColumn(property);
-columns.add(nopc);
+if(property != null) {
+final ColumnAbstract nopc = 
createObjectAdapterPropertyColumn(property);
+columns.add(nopc);
+}
 }
 }

[1/6] isis git commit: FIX ISIS-1731 @Property(hidden=Where.PARENTED_TABLES) does not render correctly in standalone collection view

2017-09-21 Thread danhaywood

Repository: isis
Updated Branches:
  refs/heads/master 9306dff52 -> ff85b71ee


FIX ISIS-1731 @Property(hidden=Where.PARENTED_TABLES) does not render
correctly in standalone collection view

Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0cae6aa3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0cae6aa3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0cae6aa3

Branch: refs/heads/master
Commit: 0cae6aa3fbf2fcfd3410ea5cb72c32a91bfb52f7
Parents: 4912a4d
Author: hobrom 
Authored: Thu Sep 21 01:32:19 2017 +0200
Committer: hobrom 
Committed: Thu Sep 21 01:32:19 2017 +0200

--
 .../scalars/ScalarPanelAbstract2.java   | 49 +---
 1 file changed, 33 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/0cae6aa3/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
--
diff --git 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 8678ea0..1d0a6cf 100644
--- 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -187,7 +187,7 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 }
 
 final ScalarModel scalarModel = getModel();
-final String disableReasonIfAny = 
scalarModel.whetherDisabled(getRendering().getWhere());
+final String disableReasonIfAny = 
scalarModel.whetherDisabled(whereAreWeRendering());
 
 if (scalarModel.isViewMode()) {
 onInitializeWhenViewMode();
@@ -398,10 +398,10 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 protected void onConfigure() {
 
 final ScalarModel scalarModel = getModel();
-
-final boolean hidden = 
scalarModel.whetherHidden(getRendering().getWhere());
+
+final boolean hidden = 
scalarModel.whetherHidden(whereAreWeRendering());
 setVisibilityAllowed(!hidden);
-
+
 super.onConfigure();
 }
 
@@ -474,7 +474,7 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 
 // ///
 
-
+
 public enum Rendering {
 /**
  * Does not show labels, eg for use in tables
@@ -490,10 +490,6 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 panel.getComponentForRegular().setVisible(false);
 }
 
-@Override
-public Where getWhere() {
-return Where.PARENTED_TABLES;
-}
 },
 /**
  * Does show labels, eg for use in forms.
@@ -509,20 +505,14 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 panel.scalarIfCompact.setVisible(false);
 }
 
-@Override
-public Where getWhere() {
-return Where.OBJECT_FORMS;
-}
 };
 
 public abstract String getLabelCaption(LabeledWebMarkupContainer 
labeledContainer);
 
 public abstract void buildGui(ScalarPanelAbstract2 panel);
 
-public abstract Where getWhere();
-
 private static Rendering renderingFor(EntityModel.RenderingHint 
renderingHint) {
-return renderingHint.isInTable()? Rendering.COMPACT: 
Rendering.REGULAR;
+return renderingHint.isRegular()? Rendering.REGULAR 
:Rendering.COMPACT;
 }
 }
 
@@ -530,6 +520,33 @@ public abstract class ScalarPanelAbstract2 extends 
PanelAbstract im
 return Rendering.renderingFor(scalarModel.getRenderingHint());
 }
 
+/**
+ * Returns the current rendering context of this component, one of 
+ * 
+ * standalone table
+ * parented table
+ * form
+ * 
+ * @return
+ */
+protected Where whereAreWeRendering() {
+switch (scalarModel.getRenderingHint()) {
+   case PARENTED_TITLE_COLUMN:
+   return Where.PARENTED_TABLES;
+   case STANDALONE_TITLE_COLUMN:
+   return Where.STANDALONE_TABLES;
+   case PROPERTY_COLUMN:
+   final ObjectAdapter parentAdapter =
+   
scalarModel.getParentEntityModel().load(AdapterManager.ConcurrencyChecking.NO_CHECK);
+   final boolean parented =

[6/6] isis git commit: ISIS-1712: uses @RequiredArgsConstructor from lombok to remove some more boilerplate from helloworld and simpleapp

2017-09-21 Thread danhaywood

ISIS-1712: uses @RequiredArgsConstructor from lombok to remove some more 
boilerplate from helloworld and simpleapp

Also adds enhance-all.sh to each


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ff85b71e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ff85b71e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ff85b71e

Branch: refs/heads/master
Commit: ff85b71ee89954b16fde26ba4769396fbdefc08a
Parents: 3076e5b
Author: Dan Haywood 
Authored: Thu Sep 21 11:27:51 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 11:38:09 2017 +0100

--
 example/application/helloworld/enhance-all.sh   |  2 +
 .../domainapp/dom/impl/HelloWorldObject.java| 14 +--
 .../domainapp/dom/impl/HelloWorldObjects.java   |  5 +-
 .../dom/impl/HelloWorldObjectTest_delete.java   |  2 +-
 .../impl/HelloWorldObjectTest_updateName.java   |  2 +-
 example/application/simpleapp/enhance-all.sh|  2 +
 .../modules/simple/dom/impl/SimpleObject.java   | 15 ++--
 .../simple/dom/impl/SimpleObjectRepository.java |  5 +-
 .../dom/impl/SimpleObjectRepository_Test.java   |  8 +-
 .../simple/dom/impl/SimpleObject_Test.java  |  2 +-
 .../simpleapp/pom-jdo-enhance-all.xml   | 89 
 11 files changed, 27 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/ff85b71e/example/application/helloworld/enhance-all.sh
--
diff --git a/example/application/helloworld/enhance-all.sh 
b/example/application/helloworld/enhance-all.sh
new file mode 100644
index 000..2da7b0f
--- /dev/null
+++ b/example/application/helloworld/enhance-all.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+mvn datanucleus:enhance -o
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/ff85b71e/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
--
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index d06ad59..40708dd 100644
--- 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -40,6 +40,8 @@ import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 
+import lombok.AccessLevel;
+
 @javax.jdo.annotations.PersistenceCapable(identityType = 
IdentityType.DATASTORE, schema = "helloworld" )
 @javax.jdo.annotations.DatastoreIdentity(strategy = 
IdGeneratorStrategy.IDENTITY, column = "id")
 @javax.jdo.annotations.Version(strategy= VersionStrategy.DATE_TIME, column 
="version")
@@ -53,20 +55,19 @@ import org.apache.isis.applib.services.title.TitleService;
 @javax.jdo.annotations.Unique(name="HelloWorldObject_name_UNQ", members = 
{"name"})
 @DomainObject(auditing = Auditing.ENABLED)
 @DomainObjectLayout()  // trigger events etc.
+@lombok.RequiredArgsConstructor(staticName = "create")
+@lombok.Getter @lombok.Setter
 public class HelloWorldObject implements Comparable {
 
-public HelloWorldObject(final String name) {
-this.name = name;
-}
 
 @javax.jdo.annotations.Column(allowsNull = "false", length = 40)
-@lombok.Getter @lombok.Setter
+@lombok.NonNull
 @Property(editing = Editing.DISABLED)
 @Title(prepend = "Object: ")
 private String name;
 
+
 @javax.jdo.annotations.Column(allowsNull = "true", length = 4000)
-@lombok.Getter @lombok.Setter
 @Property(editing = Editing.ENABLED)
 private String notes;
 
@@ -101,12 +102,15 @@ public class HelloWorldObject implements 
Comparable {
 
 //region > injected services
 @javax.inject.Inject
+@lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 RepositoryService repositoryService;
 
 @javax.inject.Inject
+@lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 TitleService titleService;
 
 @javax.inject.Inject
+@lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 MessageService messageService;
 //endregion
 

http://git-wip-us.apache.org/repos/asf/isis/blob/ff85b71e/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
--
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

[2/6] isis git commit: Merge branch 'ISIS-1731' of https://github.com/hobrom/isis into ISIS-1731_pr-94

2017-09-21 Thread danhaywood

Merge branch 'ISIS-1731' of https://github.com/hobrom/isis into ISIS-1731_pr-94


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7f15b185
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7f15b185
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7f15b185

Branch: refs/heads/master
Commit: 7f15b185379496ac30eb9bece3352cc62b3f
Parents: 9306dff 0cae6aa
Author: Dan Haywood 
Authored: Thu Sep 21 09:50:07 2017 +0100
Committer: Dan Haywood 
Committed: Thu Sep 21 09:50:07 2017 +0100

--
 .../scalars/ScalarPanelAbstract2.java   | 49 +---
 1 file changed, 33 insertions(+), 16 deletions(-)
--

[isis] Git Push Summary

[isis] Git Push Summary

[isis] Git Push Summary

[03/11] isis git commit: [maven-release-plugin] prepare for next development iteration

[04/11] isis git commit: ISIS-1712: updates simpleapp example app to use isis 1.15.1

[11/11] isis git commit: [maven-release-plugin] prepare for next development iteration

[08/11] isis git commit: ISIS-1712: updates helloworld app to use 1.15.1.

[06/11] isis git commit: [maven-release-plugin] prepare release simpleapp-archetype-1.15.1

[09/11] isis git commit: ISIS-1712: recreating helloworld archetype

[02/11] isis git commit: [maven-release-plugin] prepare release isis-1.15.1

[05/11] isis git commit: ISIS-1712: recreating simpleapp archetype

[10/11] isis git commit: [maven-release-plugin] prepare release helloworld-archetype-1.15.1

[01/11] isis git commit: ISIS-1712: adds missing license header

[07/11] isis git commit: [maven-release-plugin] prepare for next development iteration

[3/6] isis git commit: Merge branch 'ISIS-1731_pr-94'

[5/6] isis git commit: ISIS-1733: updates RepositoryService and its framework implementation so that persist and persistAndFlush are now generic and return the supplied object ... allow for more fluen

[4/6] isis git commit: ISIS-1466: adds null guard which fixes Hidden(Where.PARENTED_TABLES), and testing Hidden(Where.REFERENCES_PARENT) this also seems to be ok.

[1/6] isis git commit: FIX ISIS-1731 @Property(hidden=Where.PARENTED_TABLES) does not render correctly in standalone collection view

[6/6] isis git commit: ISIS-1712: uses @RequiredArgsConstructor from lombok to remove some more boilerplate from helloworld and simpleapp

[2/6] isis git commit: Merge branch 'ISIS-1731' of https://github.com/hobrom/isis into ISIS-1731_pr-94

20 matches

Site Navigation

Mail list logo

Footer information