[isis] 01/09: ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 354439f3c5594d49263eaa94405fe158c1ed4d92
Author: Dan Haywood
AuthorDate: Tue Feb 13 23:07:47 2018 +
ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8)
---
.../facets/members/cssclassfa/annotprop/MixinInterceptor.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
index 18b5866..9cf92f6 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
@@ -20,8 +20,6 @@
package org.apache.isis.core.metamodel.facets.members.cssclassfa.annotprop;
import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Optional;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -30,7 +28,7 @@ import
org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
/**
* To solve https://issues.apache.org/jira/browse/ISIS-1743";>ISIS-1743.
* Could be better integrated into Isis' meta-model.
- *
+ *
* @author ahu...@apache.org
*/
class MixinInterceptor {
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 02/09: [maven-release-plugin] prepare release isis-1.16.1
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f72981d1708f909cb0da2d12f787b23b7e794ca0
Author: Dan Haywood
AuthorDate: Tue Feb 13 23:47:31 2018 +
[maven-release-plugin] prepare release isis-1.16.1
---
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 | 74 ++--
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, 62 insertions(+), 62 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 35328e9..2b3001c 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
isis-core-applib
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index c1a080b..a1811eb 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
isis-core-integtestsupport
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 5b3777c..159c0b5 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
isis-core-log4j
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 9075531..d8fc83a 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
org.apache.isis.tool
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 91df0ef..e33d0d4 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
../../pom.xml
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index d37b826..8d04f5e 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
../../pom.xml
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index a130a8a..e3e2cdd 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
../../pom.xml
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index fb30fe1..aac030e 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
isis-core-metamodel
diff --git a/core/pom.xml b/core/pom.xml
index 373a4fa..0e8e8cc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
org.apache.isis.core
isis
-1.16.1-SNAPSHOT
+1.16.1
pom
@@ -190,7 +190,7 @@
scm:git:http://github.com/apache/isis.git
scm:git:https://github.com/apache/isis.git
http://github.com/apache/isis
-HEAD
+isis-1.16.1
http://isis.apache.org
@@ -847,7 +847,7 @@
${jar-plugin.automaticModuleName}
org.apache.isis
-Apache Isis™
Project
+Apache Isis™
Project
${git.commit.id.abbrev}
[isis] 07/09: ISIS-1813: recreating helloworld archetype
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ad8d4305e1793b7a1333eb71b610411cf4ffa221
Author: Dan Haywood
AuthorDate: Wed Feb 14 09:55:24 2018 +
ISIS-1813: recreating helloworld archetype
---
example/archetype/helloworld/pom.xml | 9 -
.../helloworld/src/main/resources/archetype-resources/pom.xml| 3 ++-
.../src/main/java/domainapp/dom/impl/HelloWorldObject.java | 1 +
.../src/test/resources/projects/basic/archetype.properties | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/example/archetype/helloworld/pom.xml
b/example/archetype/helloworld/pom.xml
index 7fab804..dbf6eed 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";
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
-2.0.0-SNAPSHOT
+1.16.1-SNAPSHOT
maven-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.16.0
+1.16.1
../../../core/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 d1a1371..790920c 100644
---
a/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
+++
b/example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml
@@ -34,10 +34,11 @@
war
-1.16.0
+1.16.1
1.8
1.8
+
-parameters
UTF-8
UTF-8
diff --git
a/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
b/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index 6217c1f..164705b 100644
---
a/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++
b/example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -114,4 +114,5 @@ public class HelloWorldObject implements
Comparable {
@javax.inject.Inject
MessageService messageService;
+
}
\ No newline at end of file
diff --git
a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
index 1d3452a..756a23f 100644
---
a/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
+++
b/example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Jan 04 19:13:48 GMT 2018
+#Wed Feb 14 09:55:12 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 04/09: ISIS-1813: recreating simpleapp archetype
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4c39bdb4d6c3964e3cca2f266c51892a58afa18e
Author: Dan Haywood
AuthorDate: Wed Feb 14 09:30:58 2018 +
ISIS-1813: recreating simpleapp archetype
---
example/archetype/simpleapp/pom.xml | 9 -
.../src/main/resources/archetype-resources/README.adoc | 2 +-
.../application/bdd/specglue/BootstrappingGlue.java | 16 ++--
.../specs/{RunBddSpecs.java => RunIntegBddSpecs.java}| 2 +-
.../domainapp/modules/simple/dom/impl/SimpleObject.java | 3 ++-
.../modules/simple/dom/impl/SimpleObject.layout.xml | 6 +-
.../src/main/resources/archetype-resources/pom.xml | 3 ++-
.../test/resources/projects/basic/archetype.properties | 2 +-
8 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml
b/example/archetype/simpleapp/pom.xml
index d6c8865..8a26db9 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";
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
-2.0.0-SNAPSHOT
+1.16.1-SNAPSHOT
maven-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.16.1-SNAPSHOT
+1.16.1
../../../core/pom.xml
diff --git
a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
index d52423d..6b62aab 100644
---
a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
+++
b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc
@@ -70,7 +70,7 @@ Extend/adapt these according to your own standards.
+
[source,bash]
-mvn -f pom-jdo-enhance-all.xml datanucleus:enhance
+mvn -pl module-simple datanucleus:enhance -o
* To also generate the link:https://github.com/eirbjo/jetty-console[Jetty
console], allowing the application to run as a standalone JAR: +
diff --git
a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
index 608334b..5b2364d 100644
---
a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
+++
b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specglue/BootstrappingGlue.java
@@ -19,11 +19,23 @@ O * Licensed to the Apache Software Foundation (ASF) under
one or more
*/
package domainapp.application.bdd.specglue;
-import org.apache.isis.core.specsupport.specs.CukeGlueBootstrappingAbstract;
+import org.apache.isis.core.runtime.headless.HeadlessWithBootstrappingAbstract;
+import cucumber.api.java.After;
+import cucumber.api.java.Before;
import domainapp.application.DomainAppApplicationModule;
-public class BootstrappingGlue extends CukeGlueBootstrappingAbstract {
+public class BootstrappingGlue extends HeadlessWithBootstrappingAbstract {
+
+@Before(order=100)
+public void beforeScenario() {
+super.bootstrapAndSetupIfRequired();
+}
+
+@After
+public void afterScenario(cucumber.api.Scenario sc) {
+super.tearDownAllModules();
+}
public BootstrappingGlue() {
super(new DomainAppApplicationModule());
diff --git
a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunBddSpecs.java
b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunIntegBddSpecs.java
similarity index 97%
rename from
example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/test/java/domainapp/application/bdd/specs/RunBddSpecs.java
rename to
example/archetype/simpleapp/
[isis] 08/09: [maven-release-plugin] prepare release helloworld-archetype-1.16.1
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 160f3ae15dc27c0fd32e6c5245892a9e6aaa0b89 Author: Dan Haywood AuthorDate: Wed Feb 14 09:59:25 2018 + [maven-release-plugin] prepare release helloworld-archetype-1.16.1 --- example/archetype/helloworld/pom.xml | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml index dbf6eed..9ffb224 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.1-SNAPSHOT +1.16.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.16.1 + org.apache.isis.core isis -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 06/09: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 834f8bb46a80177df763cb3405fc1d6da632d7dc Author: Dan Haywood AuthorDate: Wed Feb 14 09:32:32 2018 + [maven-release-plugin] prepare for next development iteration --- example/archetype/simpleapp/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index 777dde2..cc04125 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.16.1 +2.0.0-M1-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.16.1 + HEAD org.apache.isis.core -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch release-1.16.1-RC1 created (now 88c8aaa)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. at 88c8aaa [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 354439f ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8) new f72981d [maven-release-plugin] prepare release isis-1.16.1 new 831b964 [maven-release-plugin] prepare for next development iteration new 4c39bdb ISIS-1813: recreating simpleapp archetype new 1d52c26 [maven-release-plugin] prepare release simpleapp-archetype-1.16.1 new 834f8bb [maven-release-plugin] prepare for next development iteration new ad8d430 ISIS-1813: recreating helloworld archetype new 160f3ae [maven-release-plugin] prepare release helloworld-archetype-1.16.1 new 88c8aaa [maven-release-plugin] prepare for next development iteration The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 03/09: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 831b96417438d4816235099b97aabb4ec65d150f
Author: Dan Haywood
AuthorDate: Tue Feb 13 23:47:37 2018 +
[maven-release-plugin] prepare for next development iteration
---
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(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2b3001c..86dbc37 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
isis-core-applib
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index a1811eb..50e15c1 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
isis-core-integtestsupport
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 159c0b5..115312e 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
isis-core-log4j
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index d8fc83a..3e3646b 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
org.apache.isis.tool
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index e33d0d4..7a387b6 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
../../pom.xml
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 8d04f5e..6504f20 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
../../pom.xml
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index e3e2cdd..ddeecf4 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
../../pom.xml
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index aac030e..697eb3d 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
isis-core-metamodel
diff --git a/core/pom.xml b/core/pom.xml
index 0e8e8cc..2606976 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
org.apache.isis.core
isis
-1.16.1
+2.0.0-M1-SNAPSHOT
pom
@@ -190,7 +190,7 @@
scm:git:http://github.com/apache/isis.git
scm:git:https://github.com/apache/isis.git
http://github.com/apache/isis
-isis-1.16.1
+HEAD
http://isis.apache.org
@@ -1146,12 +1146,12 @@ ${license.additional-notes}
org.apache.isis.core
isis-core-unittestsupport
-1.16.1
+2.0.0-M1-SNAPSHOT
org.apache.isis.core
isis-core-unittestsupport
-
[isis] 09/09: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 88c8aaa620e4fb0be5e72e6ef692026697bc7415 Author: Dan Haywood AuthorDate: Wed Feb 14 09:59:28 2018 + [maven-release-plugin] prepare for next development iteration --- example/archetype/helloworld/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml index 9ffb224..5f84e1f 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.16.1 +2.0.0-M1-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.16.1 + HEAD org.apache.isis.core -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 05/09: [maven-release-plugin] prepare release simpleapp-archetype-1.16.1
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 1d52c267953192e49f8f80c29b6bd23d480461c9 Author: Dan Haywood AuthorDate: Wed Feb 14 09:32:29 2018 + [maven-release-plugin] prepare release simpleapp-archetype-1.16.1 --- example/archetype/simpleapp/pom.xml | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index 8a26db9..777dde2 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.1-SNAPSHOT +1.16.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.16.1 + org.apache.isis.core isis -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] annotated tag isis-1.16.1-RC1 updated (f72981d -> e059519)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to annotated tag isis-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. *** WARNING: tag isis-1.16.1-RC1 was modified! *** from f72981d (commit) to e059519 (tag) tagging f72981d1708f909cb0da2d12f787b23b7e794ca0 (commit) replaces helloworld-archetype-1.16.0 by Dan Haywood on Tue Feb 13 23:47:32 2018 + - Log - [maven-release-plugin] copy for tag isis-1.16.1 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] annotated tag simpleapp-archetype-1.16.1-RC1 updated (1d52c26 -> 386b2b6)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to annotated tag simpleapp-archetype-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. *** WARNING: tag simpleapp-archetype-1.16.1-RC1 was modified! *** from 1d52c26 (commit) to 386b2b6 (tag) tagging 1d52c267953192e49f8f80c29b6bd23d480461c9 (commit) replaces isis-1.16.1 by Dan Haywood on Wed Feb 14 09:32:31 2018 + - Log - [maven-release-plugin] copy for tag simpleapp-archetype-1.16.1 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] annotated tag helloworld-archetype-1.16.1-RC1 updated (160f3ae -> e1bea4f)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to annotated tag helloworld-archetype-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. *** WARNING: tag helloworld-archetype-1.16.1-RC1 was modified! *** from 160f3ae (commit) to e1bea4f (tag) tagging 160f3ae15dc27c0fd32e6c5245892a9e6aaa0b89 (commit) replaces simpleapp-archetype-1.16.1 by Dan Haywood on Wed Feb 14 09:59:26 2018 + - Log - [maven-release-plugin] copy for tag helloworld-archetype-1.16.1 --- No new revisions were added by this update. Summary of changes: -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 01/02: ISIS-1813: updates docs and example apps
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 0e041cfb2427df0b008a14a70e90b281976b727d Author: Dan Haywood AuthorDate: Wed Feb 14 10:32:44 2018 + ISIS-1813: updates docs and example apps The updates to example apps WILL BE in the released archetypes for 1.16.1 RC1 --- .../src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc| 2 +- example/application/helloworld/pom.xml | 2 +- example/application/simpleapp/README.adoc | 2 +- example/application/simpleapp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc index b5a167a..3fc0d8d 100644 --- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc +++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_cutting-a-release.adoc @@ -478,7 +478,7 @@ mvn clean install * can be run from an IDE ** mainClass=`org.apache.isis.WebServer` ** args=`-m domainapp.application.manifest.DomainAppAppManifestWithFixtures` -** run before: `mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o` in the root module +** run before: `mvn -pl module-simple datanucleus:enhance -o` in the root module * can be run using the mvn jetty plugin: + diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml index bb2cef0..efa8848 100644 --- a/example/application/helloworld/pom.xml +++ b/example/application/helloworld/pom.xml @@ -36,7 +36,7 @@ war -1.16.1-SNAPSHOT +1.16.1 1.8 1.8 diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc index d52423d..6b62aab 100644 --- a/example/application/simpleapp/README.adoc +++ b/example/application/simpleapp/README.adoc @@ -70,7 +70,7 @@ Extend/adapt these according to your own standards. + [source,bash] -mvn -f pom-jdo-enhance-all.xml datanucleus:enhance +mvn -pl module-simple datanucleus:enhance -o * To also generate the link:https://github.com/eirbjo/jetty-console[Jetty console], allowing the application to run as a standalone JAR: + diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index 8525106..35127f6 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -36,7 +36,7 @@ pom -1.16.1-SNAPSHOT +1.16.1 1.16.18 -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch release-1.16.1-RC1 updated (88c8aaa -> 403c85a)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. from 88c8aaa [maven-release-plugin] prepare for next development iteration new 0e041cf ISIS-1813: updates docs and example apps new 403c85a ISIS-1813: updates release notes for 1.16.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../guides/cgcom/_cgcom_cutting-a-release.adoc | 2 +- .../release-notes/_release-notes_1.16.1.adoc | 69 ++ .../main/asciidoc/release-notes/release-notes.adoc | 10 ++-- example/application/helloworld/pom.xml | 2 +- example/application/simpleapp/README.adoc | 2 +- example/application/simpleapp/pom.xml | 2 +- 6 files changed, 78 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 02/02: ISIS-1813: updates release notes for 1.16.1
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch release-1.16.1-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git commit 403c85a83a407ba4ed084b7a234a50e6f1fcb590 Author: Dan Haywood AuthorDate: Wed Feb 14 10:32:54 2018 + ISIS-1813: updates release notes for 1.16.1 --- .../release-notes/_release-notes_1.16.1.adoc | 69 ++ .../main/asciidoc/release-notes/release-notes.adoc | 10 ++-- 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc index 6f3d27d..fe8aa51 100644 --- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc +++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.16.1.adoc @@ -22,3 +22,72 @@ The majority of the implementation is provided in the (non-ASF) (non-ASF) link:h Applications written against v1.16.0 should run against v1.16.1 with few if any changes. + + +== New Feature + +* link:https://issues.apache.org/jira/browse/ISIS-1861[ISIS-1861] - Extend tabgroup layout control so that a tabgroup with only one tab can show either collapsed (default) or with the one tab. +* link:https://issues.apache.org/jira/browse/ISIS-1856[ISIS-1856] - Add git.properties and SCM-Revision into MANIFEST.MF +* link:https://issues.apache.org/jira/browse/ISIS-1585[ISIS-1585] - Allow objects in parented collections to be selected, automatically passed as defaults for collection parameter of associated actions. Also infer choices for both scalar and collection parameters. +* link:https://issues.apache.org/jira/browse/ISIS-1569[ISIS-1569] - Automated testing tool to replay commands against a copy of prod + + + +== Improvement + +* link:https://issues.apache.org/jira/browse/ISIS-1837[ISIS-1837] - Metamodel validator should check for cyclic dependencies (reference to entities that live outside of the module set) +* link:https://issues.apache.org/jira/browse/ISIS-1836[ISIS-1836] - Better diagnostic reporting in RO viewer if passed in a non-parseable value +* link:https://issues.apache.org/jira/browse/ISIS-1835[ISIS-1835] - Better diagnostic reporting if fail to read a configuration flie. +* link:https://issues.apache.org/jira/browse/ISIS-1834[ISIS-1834] - Relax metamodel validation to allow @PersistenceCapable on interfaces +* link:https://issues.apache.org/jira/browse/ISIS-1826[ISIS-1826] - Add Automatic-Module-Name to support Java 9. +* link:https://issues.apache.org/jira/browse/ISIS-1814[ISIS-1814] - JAXB validator fails requiring @XmlJavaTypeAdapter even if annotated with @XmlTransient +* link:https://issues.apache.org/jira/browse/ISIS-1808[ISIS-1808] - Let the error page be customisable, eg embed an image from randomkittengenerator.com +* link:https://issues.apache.org/jira/browse/ISIS-1759[ISIS-1759] - Always calling getXxx() and hideXxx() both decreases performance of application (?) +* link:https://issues.apache.org/jira/browse/ISIS-1743[ISIS-1743] - fa-Icon mapping for mixin provided methods not honored intuitively +* link:https://issues.apache.org/jira/browse/ISIS-1589[ISIS-1589] - Allow layout to be loaded from either .layout.xml or .layout.fallback.xml (so that library modules can provide a default layout for their entities using XML). + + +== Bug + +* link:https://issues.apache.org/jira/browse/ISIS-1858[ISIS-1858] - NPE when Log at Debug Level +* link:https://issues.apache.org/jira/browse/ISIS-1857[ISIS-1857] - help block for properties/parameters with drop down actions to right encroaches on the field. +* link:https://issues.apache.org/jira/browse/ISIS-1855[ISIS-1855] - scm entries in core pom.xml are incorrect +* link:https://issues.apache.org/jira/browse/ISIS-1854[ISIS-1854] - menubars.layout.xml seems to ignore the embedded ? +* link:https://issues.apache.org/jira/browse/ISIS-1853[ISIS-1853] - Fix AbstractSessionTemplate and to unmarshal collection and reference arguments. +* link:https://issues.apache.org/jira/browse/ISIS-1852[ISIS-1852] - Iterating over query result list with parallelStream produces next exception +* link:https://issues.apache.org/jira/browse/ISIS-1851[ISIS-1851] - Improve the dynamic visibility of PropertyGroups so works with pdf js viewer (anything that isn't a ScalarPanelAbstract2, basically). +* link:https://issues.apache.org/jira/browse/ISIS-1848[ISIS-1848] - References of type java.lang.Object (sometimes) not rendered correctly in Wicket viewer +* link:https://issues.apache.org/jira/browse/ISIS-1847[ISIS-1847] - Eventbus: AbstractDomainEvent incorrect veto handling? +* link:https://issues.apache.org/jira/browse/ISIS-1833[ISIS-1833] - Mandatory marker (red asterisk) not shown on mandatory parameters +* link:https://issues.apache.org/jira/browse/ISIS-1832[ISIS-1832] - Entering a non-valid string into a parameter of t
[1/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
Repository: isis-site
Updated Branches:
refs/heads/asf-site fcfba6eda -> 87081dfeb
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
--
diff --git a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
index 8afe049..4fb796f 100644
--- a/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
+++ b/content/versions/SNAPSHOT/guides/ugsec/ugsec.pdf
@@ -4,8 +4,8 @@
<< /Title (Security)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20180213223007+00'00')
-/ModDate (D:20180213223007+00'00')
+/CreationDate (D:20180214104042+00'00')
+/ModDate (D:20180214104042+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
--
diff --git a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
index c90dd92..642f3a8 100644
--- a/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
+++ b/content/versions/SNAPSHOT/guides/ugtst/ugtst.pdf
@@ -4,8 +4,8 @@
<< /Title (Testing)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20180213223014+00'00')
-/ModDate (D:20180213223014+00'00')
+/CreationDate (D:20180214104049+00'00')
+/ModDate (D:20180214104049+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
--
diff --git a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
index c424dcd..3d00529 100644
--- a/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
+++ b/content/versions/SNAPSHOT/guides/ugvro/ugvro.pdf
@@ -4,8 +4,8 @@
<< /Title (Restful Objects Viewer)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20180213223025+00'00')
-/ModDate (D:20180213223025+00'00')
+/CreationDate (D:20180214104101+00'00')
+/ModDate (D:20180214104101+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
--
diff --git a/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
b/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
index 07e6c79..704d395 100644
--- a/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
+++ b/content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf
@@ -4,8 +4,8 @@
<< /Title (Wicket Viewer)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20180213223032+00'00')
-/ModDate (D:20180213223032+00'00')
+/CreationDate (D:20180214104107+00'00')
+/ModDate (D:20180214104107+00'00')
>>
endobj
2 0 obj
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/release-notes/release-notes.html
--
diff --git a/content/versions/SNAPSHOT/release-notes/release-notes.html
b/content/versions/SNAPSHOT/release-notes/release-notes.html
index 3f7110c..21f5096 100644
--- a/content/versions/SNAPSHOT/release-notes/release-notes.html
+++ b/content/versions/SNAPSHOT/release-notes/release-notes.html
@@ -309,20 +309,20 @@ table.CodeRay td.code>pre{padding:0}
1.16.1
- xx-02-2018
+ 18-02-2018
Parented collections with checkboxes, replay module
- .
- .
- .
+ 4
+ 10
+ 17
- â¦â
+ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342424";>Release
notes for v1.16.1
@@ -970,6 +970,96 @@ table.CodeRay td.code>pre{padding:0}
Applications written against v1.16.0 should run against v1.16.1
with few if any changes.
+
+ New Feature
+
+
+https://issues.apache.org/jira/browse/ISIS-1861";>ISIS-1861 - Extend
tabgroup layout control so that a tabgroup with only one tab can show either
collapsed (default) or with the one tab.
+https://issues.apache.org/jira/browse/ISIS-1856";>ISIS-1856 - Add
git.properties and SCM-Revision into MANIFEST.MF
+https://issues.apache.org/jira/browse/ISIS-1585";>ISIS-1585 - Allow
o
[3/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf b/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf index cc4e3ce..fa9622a 100644 --- a/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf +++ b/content/versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf @@ -4,8 +4,8 @@ << /Title /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222757+00'00') -/ModDate (D:20180213222757+00'00') +/CreationDate (D:20180214103830+00'00') +/ModDate (D:20180214103830+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf b/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf index 732a4cb..01dc19a 100644 --- a/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf +++ b/content/versions/SNAPSHOT/guides/rgcms/rgcms.pdf @@ -4,8 +4,8 @@ << /Title (Classes, Methods and Schema) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222801+00'00') -/ModDate (D:20180213222801+00'00') +/CreationDate (D:20180214103834+00'00') +/ModDate (D:20180214103834+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf b/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf index c59fb2e..487eb99 100644 --- a/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf +++ b/content/versions/SNAPSHOT/guides/rgfis/rgfis.pdf @@ -4,8 +4,8 @@ << /Title (Framework Internal Services) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222825+00'00') -/ModDate (D:20180213222825+00'00') +/CreationDate (D:20180214103859+00'00') +/ModDate (D:20180214103859+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf b/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf index 56522f7..64a30df 100644 --- a/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf +++ b/content/versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf @@ -4,8 +4,8 @@ << /Title (Apache Isis Maven plugin) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222830+00'00') -/ModDate (D:20180213222830+00'00') +/CreationDate (D:20180214103904+00'00') +/ModDate (D:20180214103904+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf index d12145c..d4c1199 100644 --- a/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf +++ b/content/versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf @@ -4,8 +4,8 @@ << /Title (Domain Services) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222835+00'00') -/ModDate (D:20180213222835+00'00') +/CreationDate (D:20180214103909+00'00') +/ModDate (D:20180214103909+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf -- diff --git a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf b/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf index 064fa31..f4e4126 100644 --- a/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf +++ b/content/versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf @@ -4,8 +4,8 @@ << /Title (Beyond the Basics) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222914+00'00') -/ModDate (D:20180213222914+00'00') +/CreationDate (D:20180214103949+00'00') +/ModDate (D:20180214103949+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf -- diff --git a/content/versions/SNAPSHOT/guides/ugfun/ugfun.pdf
[4/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgant/rgant.pdf -- diff --git a/content/versions/SNAPSHOT/guides/rgant/rgant.pdf b/content/versions/SNAPSHOT/guides/rgant/rgant.pdf index 2a6e0ec..1e6ecde 100644 --- a/content/versions/SNAPSHOT/guides/rgant/rgant.pdf +++ b/content/versions/SNAPSHOT/guides/rgant/rgant.pdf @@ -4,16 +4,16 @@ << /Title (Annotations) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222716+00'00') -/ModDate (D:20180213222716+00'00') +/CreationDate (D:20180214103745+00'00') +/ModDate (D:20180214103745+00'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 20 0 R -/Outlines 2218 0 R -/PageLabels 2380 0 R +/Outlines 2213 0 R +/PageLabels 2375 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 842.89] /ViewerPreferences << /DisplayDocTitle true @@ -22,8 +22,8 @@ endobj endobj 3 0 obj << /Type /Pages -/Count 188 -/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 317 0 R 321 0 R 336 0 R 340 0 R 346 0 R 350 0 R 353 0 R 361 0 R 369 0 R 375 0 R 385 0 R 392 0 R 401 0 R 405 0 R 409 0 R 413 0 R 434 0 R 442 0 R 449 0 R 456 0 R 473 0 R 484 0 R 492 0 R 508 0 R 514 0 R 522 0 R 531 0 R 546 0 R 552 0 R 555 0 R 571 0 R 578 0 R 585 0 R 589 0 R 603 0 R 619 0 R 634 0 R 643 0 R 654 0 R 665 0 R 672 0 R 678 0 R 680 0 R 688 0 R 694 0 R 702 0 R 704 0 R 709 0 R 723 0 R 728 0 R 745 0 R 769 0 R 779 0 R 782 0 R 795 0 R 808 0 R 813 0 R 817 0 R 823 0 R 827 0 R 830 0 R 836 0 R 846 0 R 851 0 R 859 0 R 872 0 R 887 0 R 894 0 R 902 0 R 909 0 R 915 0 R 920 0 R 926 0 R 929 0 R 949 0 R 955 0 R 962 0 R 979 0 R 989 0 R 995 0 R 1011 0 R 1021 0 R 1035 0 R 1047 0 R 1059 0 R 1065 0 R 1071 0 R 1081 0 R 1086 0 R 1096 0 R 1104 0 R 1114 0 R 1120 0 R 1126 0 R 1137 0 R 1146 0 R 1149 0 R 1152 0 R 1158 0 R 1162 0 R 1174 0 R 1180 0 R 1183 0 R 1189 0 R 1199 0 R 1206 0 R 1208 0 R 1218 0 R 1222 0 R 1228 0 R 1238 0 R 1246 0 R 1254 0 R 1258 0 R 1263 0 R 1265 0 R 1278 0 R 1292 0 R 1302 0 R 1316 0 R 1324 0 R 1329 0 R 1342 0 R 1348 0 R 1359 0 R 1363 0 R 1372 0 R 1380 0 R 1385 0 R 1398 0 R 1408 0 R 1421 0 R 1430 0 R 1437 0 R 1440 0 R 1449 0 R 1455 0 R 1459 0 R 1473 0 R 1480 0 R 1488 0 R 1493 0 R 1499 0 R 1506 0 R 1509 0 R 1512 0 R 1517 0 R 1533 0 R 1548 0 R 1561 0 R 1578 0 R 1584 0 R 1596 0 R 1604 0 R 1610 0 R 1615 0 R 1621 0 R 1626 0 R 1628 0 R 1634 0 R 1640 0 R 1657 0 R 1674 0 R 1694 0 R 1704 0 R 1709 0 R 1724 0 R] +/Count 189 +/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 317 0 R 321 0 R 334 0 R 339 0 R 341 0 R 347 0 R 350 0 R 356 0 R 367 0 R 369 0 R 375 0 R 385 0 R 392 0 R 401 0 R 405 0 R 409 0 R 413 0 R 434 0 R 442 0 R 449 0 R 456 0 R 473 0 R 484 0 R 492 0 R 508 0 R 514 0 R 522 0 R 531 0 R 546 0 R 552 0 R 555 0 R 571 0 R 578 0 R 585 0 R 589 0 R 603 0 R 619 0 R 634 0 R 643 0 R 654 0 R 665 0 R 672 0 R 678 0 R 680 0 R 688 0 R 694 0 R 702 0 R 704 0 R 709 0 R 723 0 R 728 0 R 745 0 R 769 0 R 779 0 R 782 0 R 795 0 R 808 0 R 813 0 R 817 0 R 823 0 R 827 0 R 830 0 R 836 0 R 846 0 R 851 0 R 859 0 R 872 0 R 887 0 R 894 0 R 902 0 R 909 0 R 915 0 R 920 0 R 926 0 R 929 0 R 949 0 R 955 0 R 962 0 R 979 0 R 989 0 R 995 0 R 1011 0 R 1021 0 R 1035 0 R 1047 0 R 1059 0 R 1065 0 R 1072 0 R 1082 0 R 1087 0 R 1097 0 R 1104 0 R 1114 0 R 1120 0 R 1126 0 R 1137 0 R 1146 0 R 1149 0 R 1152 0 R 1158 0 R 1162 0 R 1174 0 R 1180 0 R 1183 0 R 1189 0 R 1199 0 R 1206 0 R 1208 0 R 1218 0 R 1222 0 R 1228 0 R 1238 0 R 1246 0 R 1254 0 R 1258 0 R 1263 0 R 1265 0 R 1278 0 R 1292 0 R 1302 0 R 1316 0 R 1324 0 R 1329 0 R 1342 0 R 1348 0 R 1359 0 R 1363 0 R 1372 0 R 1380 0 R 1385 0 R 1398 0 R 1408 0 R 1421 0 R 1429 0 R 1434 0 R 1438 0 R 1446 0 R 1452 0 R 1457 0 R 1470 0 R 1477 0 R 1485 0 R 1491 0 R 1496 0 R 1503 0 R 1506 0 R 1509 0 R 1514 0 R 1530 0 R 1545 0 R 1558 0 R 1575 0 R 1581 0 R 1593 0 R 1601 0 R 1607 0 R 1612 0 R 1618 0 R 1623 0 R 1625 0 R 1631 0 R 1637 0 R 1654 0 R 1671 0 R 1691 0 R 1701 0 R 1706 0 R 1721 0 R] >> endobj 4 0 obj @@ -80,15 +80,15 @@ endobj << /Type /Font /BaseFont /AZ+NotoSerif /Subtype /TrueType -/FontDescriptor 2382 0 R +/FontDescriptor 2377 0 R /FirstChar 32 /LastChar 255 -/Widths 2384 0 R -/ToUnicode 2383 0 R +/Widths 2379 0 R +/ToUnicode 2378 0 R >> endobj 9 0 obj -<< /Length 36109 +<< /Length 35909 >> stream q @@ -613,18 +613,7 @@ ET BT 60.24 530.09598 Td /F1.0 10.5 Tf -<332e322e20> Tj -ET - -0.000 0.000 0.000 SCN -0.000 0.000 0.000 scn -0.694 0.129 0.275 scn -0.694 0.129 0.275 SCN - -BT -79.9485 530.09598 Td -/F3.0 10.5 Tf -<636f6d6d616e642829> Tj +<332e322e20436f6d6d616e642050657273697374656e636520616e6420
[9/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
ISIS-1813: adds release notes for 1.16.1 Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/87081dfe Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/87081dfe Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/87081dfe Branch: refs/heads/asf-site Commit: 87081dfeb8270c1a865220361fb5ca7200ce8a67 Parents: fcfba6e Author: Dan Haywood Authored: Wed Feb 14 10:44:45 2018 + Committer: Dan Haywood Committed: Wed Feb 14 10:44:45 2018 + -- .../versions/SNAPSHOT/elasticlunr/index.json| 2 +- .../versions/SNAPSHOT/guides/cgcom/cgcom.html | 2 +- .../versions/SNAPSHOT/guides/cgcom/cgcom.pdf| 1270 +- content/versions/SNAPSHOT/guides/dg/dg.pdf | 4 +- content/versions/SNAPSHOT/guides/htg.html |90 + content/versions/SNAPSHOT/guides/htg.pdf| 6477 ++- .../versions/SNAPSHOT/guides/rgant/rgant.html | 2050 +- .../versions/SNAPSHOT/guides/rgant/rgant.pdf| 42239 ++--- .../versions/SNAPSHOT/guides/rgcfg/rgcfg.pdf| 4 +- .../versions/SNAPSHOT/guides/rgcms/rgcms.pdf| 4 +- .../versions/SNAPSHOT/guides/rgfis/rgfis.pdf| 4 +- .../versions/SNAPSHOT/guides/rgmvn/rgmvn.pdf| 4 +- .../versions/SNAPSHOT/guides/rgsvc/rgsvc.pdf| 4 +- .../versions/SNAPSHOT/guides/ugbtb/ugbtb.pdf| 4 +- .../versions/SNAPSHOT/guides/ugfun/ugfun.pdf| 4 +- .../versions/SNAPSHOT/guides/ugodn/ugodn.html | 100 + .../versions/SNAPSHOT/guides/ugodn/ugodn.pdf| 4345 +- .../versions/SNAPSHOT/guides/ugsec/ugsec.pdf| 4 +- .../versions/SNAPSHOT/guides/ugtst/ugtst.pdf| 4 +- .../versions/SNAPSHOT/guides/ugvro/ugvro.pdf| 4 +- content/versions/SNAPSHOT/guides/ugvw/ugvw.pdf | 4 +- .../SNAPSHOT/release-notes/release-notes.html | 414 +- 22 files changed, 36507 insertions(+), 20530 deletions(-) --
[7/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/cgcom/cgcom.html -- diff --git a/content/versions/SNAPSHOT/guides/cgcom/cgcom.html b/content/versions/SNAPSHOT/guides/cgcom/cgcom.html index 83d86ad..65871a5 100644 --- a/content/versions/SNAPSHOT/guides/cgcom/cgcom.html +++ b/content/versions/SNAPSHOT/guides/cgcom/cgcom.html @@ -1150,7 +1150,7 @@ env | grep ISIS | sort mainClass=org.apache.isis.WebServer args=-m domainapp.application.manifest.DomainAppAppManifestWithFixtures - run before: mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o in the root module + run before: mvn -pl module-simple datanucleus:enhance -o in the root module can be run using the mvn jetty plugin: http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf -- diff --git a/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf b/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf index c4352f0..8ce4561 100644 --- a/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf +++ b/content/versions/SNAPSHOT/guides/cgcom/cgcom.pdf @@ -4,8 +4,8 @@ << /Title (Committers' Guide) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222635+00'00') -/ModDate (D:20180213222635+00'00') +/CreationDate (D:20180214103700+00'00') +/ModDate (D:20180214103700+00'00') >> endobj 2 0 obj @@ -13282,7 +13282,7 @@ endobj >> endobj 119 0 obj -<< /Length 12544 +<< /Length 12526 >> stream q @@ -13559,7 +13559,7 @@ ET BT 143.607003 556.94601 Td /F4.0 10.5 Tf -<6d766e202d6620706f6d2d6a646f2d656e68616e63652d616c6c2e786d6c20646174616e75636c6575733a656e68616e6365202d6f> Tj +<6d766e202d706c206d6f64756c652d73696d706c6520646174616e75636c6575733a656e68616e6365202d6f> Tj ET 0.000 0.000 0.000 SCN @@ -13568,7 +13568,7 @@ ET 0.200 0.200 0.200 SCN BT -421.857 556.94601 Td +374.607 556.94601 Td /F1.0 10.5 Tf <20696e2074686520726f6f74206d6f64756c65> Tj ET @@ -56172,640 +56172,640 @@ xref 266036 0 n 266094 0 n 266270 0 n -278869 0 n -279110 0 n -283823 0 n -284122 0 n -319114 0 n -320848 0 n -321044 0 n -346814 0 n -347031 0 n -347242 0 n -358231 0 n -358486 0 n -358532 0 n -359579 0 n -359636 0 n -359693 0 n -370073 0 n -370314 0 n -370360 0 n -370417 0 n -370475 0 n -382377 0 n -382632 0 n -382678 0 n -394948 0 n -395221 0 n -395419 0 n -395465 0 n -395522 0 n -395580 0 n -405189 0 n -405448 0 n -405506 0 n -406525 0 n -406571 0 n -406788 0 n -479216 0 n -480194 0 n -480452 0 n -480646 0 n -580844 0 n -583413 0 n -583671 0 n -583865 0 n -687617 0 n -688235 0 n -688480 0 n -688674 0 n -791240 0 n -791931 0 n -792176 0 n -792371 0 n -909345 0 n -910345 0 n -910590 0 n -910784 0 n -992218 0 n -998866 0 n -999166 0 n -999361 0 n -999588 0 n -999645 0 n -999866 0 n -0001003514 0 n -0001003755 0 n -0001003801 0 n -0001003858 0 n -0001013985 0 n -0001014231 0 n -0001014443 0 n -0001028002 0 n -0001028323 0 n -0001028369 0 n -0001028578 0 n -0001028805 0 n -0001029032 0 n -0001029089 0 n -0001029318 0 n -0001029510 0 n -0001029714 0 n -0001029930 0 n -0001029988 0 n -0001041226 0 n -0001041509 0 n -0001041555 0 n -0001041781 0 n -0001042011 0 n -0001042068 0 n -0001042125 0 n -0001042182 0 n -0001042240 0 n -0001042485 0 n -0001042710 0 n -0001060185 0 n -0001060466 0 n -0001060524 0 n -0001060733 0 n -0001060790 0 n -0001061021 0 n -0001074768 0 n -0001075059 0 n -0001075105 0 n -0001075162 0 n -0001075220 0 n -0001075433 0 n -0001075639 0 n -0001075867 0 n -0001076091 0 n -0001076313 0 n -0001076371 0 n -0001086354 0 n -0001086613 0 n -0001086835 0 n -0001086892 0 n -0001098178 0 n -0001098453 0 n -0001098499 0 n -0001098879 0 n -0001099088 0 n -0001099298 0 n -0001099525 0 n -000109958
[8/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/elasticlunr/index.json
--
diff --git a/content/versions/SNAPSHOT/elasticlunr/index.json
b/content/versions/SNAPSHOT/elasticlunr/index.json
index fa62285..677318b 100644
--- a/content/versions/SNAPSHOT/elasticlunr/index.json
+++ b/content/versions/SNAPSHOT/elasticlunr/index.json
@@ -1 +1 @@
-{"version":"0.9.5","fields":["title","body","description","url"],"ref":"id","documentStore":{"docs":{"372886":{"title":"Rows,
full-width cols, and
tabs","url":"guides/ugvw/ugvw.html#_rows_full_width_cols_and_tabs","body":"Rows,
full-width cols, and tabs The example layout consists of three rows: a row
for the object/icon, a row containing a properties, and a row containing
collections. In all three cases the row contains a single column spanning the
full width of the page. For the property and collection rows, the column
contains a tab group. This corresponds to the following XML: You will notice
that one of the columns has an unreferencedActions attribute, while one of the
tabGroups has a similar unreferencedCollections attribute. This topic is
discussed in more detail below. ","description":" The example layout consists
of three rows: a row for the object/icon, a row containing a properties, and a
row containing collections. In all three cases the row contains a single column
s
panning the full width of the page. For the property and collection rows, the
column contains a","id":372886},"2646929":{"title":"Apache Isis vs
â¦â","url":"guides/ugfun/ugfun.html#_ugfun_core-concepts_apache-isis-vs","body":"Apache
Isis vs â¦â Many other frameworks promise rapid application development
and provide automatically generated user interfaces, so how do they compare to
Apache Isis? ","description":" Many other frameworks promise rapid application
development and provide automatically generated user interfaces, so how do they
compare to Apache Isis?
","id":2646929},"3836440":{"title":"Running","url":"guides/dg/dg.html#__dg_ide_intellij_running","body":"Running
Letâs see how to run both the app and the tests. ","description":" Letâs
see how to run both the app and the tests.
","id":3836440},"11600575":{"title":"Using
Contributions","url":"pages/tg/tg.html#_using_contributions","body":"Using
Contributions ","description":"","id":11600575},"12196042":{"title":"Te
rtiary Menu","url":"guides/ugvw/ugvw.html#_tertiary_menu","body":"Tertiary
Menu Domain services' actions can be associated with the tertiary menu using
the same @DomainServiceLayout annotation, but be aware that the
@DomainServiceLayout#name() attribute will be ignored (there is only one
effective menu). For example, the updateEpochDate(â¦â) and
listAllSettings(â¦â) actions come from the following service: Because the
number of items on the tertiary menu is expected to be small and most will
pertain to the current user, the viewer does not place dividers between actions
from different services on the tertiary menu. ","description":" Domain
services' actions can be associated with the tertiary menu using the same
@DomainServiceLayout annotation, but be aware that the
@DomainServiceLayout#name() attribute will be ignored (there is only one
effective menu). ","id":12196042},"12649581":{"title":"Mark the version as
released","url":"guides/cgcom/cgcom.html#_mark_the_version_as_r
eleased","body":"Mark the version as released In JIRA, go to the
administration section for the Apache Isis project and update the version as
being released. In the Kanban view this will have the effect of marking all
tickets as released (clearing the \"done\" column). ","description":" In JIRA,
go to the administration section for the Apache Isis project and update the
version as being released.
","id":12649581},"13573617":{"title":"hideâ¦â()","url":"guides/rgcms/rgcms.html#_rgcms_methods_prefixes_hide","body":"hideâ¦â()
The hideâ¦â() supporting method is called for properties, collections and
actions. It allows the property/collection to be completely hidden from view.
Itâs comparatively rare for properties or collections to be imperatively
hidden from view, but actions are sometimes hidden or shown visible (as opposed
to being just disabled, ie greyed out). The signature of the supporting method
is simply: Returning true will hide the property, collection or acti
on, returning false leaves it visible. For example, to hide an action: Or,
to hide a property: ","description":" The hideâ¦â() supporting method is
called for properties, collections and actions. It allows the
property/collection to be completely hidden from view.
","id":13573617},"14290952":{"title":"Vetoing
Visibility","url":"guides/htg.html#_ugbtb_hints-and-tips_vetoing-visibility","body":"Vetoing
Visibility eg if included an addon such as auditing or security. solution is
to writ
[2/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf -- diff --git a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf index 12e06c4..fcc8ed4 100644 --- a/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf +++ b/content/versions/SNAPSHOT/guides/ugodn/ugodn.pdf @@ -4,16 +4,16 @@ << /Title (DataNucleus Object Store) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213223001+00'00') -/ModDate (D:20180213223001+00'00') +/CreationDate (D:20180214104035+00'00') +/ModDate (D:20180214104035+00'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 14 0 R -/Outlines 204 0 R -/PageLabels 228 0 R +/Outlines 210 0 R +/PageLabels 235 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 842.89] /ViewerPreferences << /DisplayDocTitle true @@ -22,8 +22,8 @@ endobj endobj 3 0 obj << /Type /Pages -/Count 27 -/Kids [7 0 R 10 0 R 12 0 R 36 0 R 48 0 R 54 0 R 66 0 R 69 0 R 76 0 R 80 0 R 87 0 R 89 0 R 92 0 R 94 0 R 99 0 R 101 0 R 104 0 R 111 0 R 119 0 R 122 0 R 125 0 R 137 0 R 143 0 R 145 0 R 153 0 R 157 0 R 159 0 R] +/Count 28 +/Kids [7 0 R 10 0 R 12 0 R 36 0 R 48 0 R 54 0 R 66 0 R 69 0 R 76 0 R 80 0 R 87 0 R 89 0 R 92 0 R 94 0 R 99 0 R 101 0 R 104 0 R 111 0 R 119 0 R 122 0 R 125 0 R 137 0 R 143 0 R 145 0 R 153 0 R 157 0 R 159 0 R 163 0 R] >> endobj 4 0 obj @@ -80,15 +80,15 @@ endobj << /Type /Font /BaseFont /DJ+NotoSerif /Subtype /TrueType -/FontDescriptor 230 0 R +/FontDescriptor 237 0 R /FirstChar 32 /LastChar 255 -/Widths 232 0 R -/ToUnicode 231 0 R +/Widths 239 0 R +/ToUnicode 238 0 R >> endobj 9 0 obj -<< /Length 17636 +<< /Length 18457 >> stream q @@ -956,6 +956,46 @@ ET 0.000 0.000 0.000 SCN 0.000 0.000 0.000 scn +0.200 0.200 0.200 scn +0.200 0.200 0.200 SCN + +BT +60.24 363.775967 Td +/F1.0 10.5 Tf +<352e362e204a444f514c20616e642054696d657374616d7073> Tj +ET + +0.000 0.000 0.000 SCN +0.000 0.000 0.000 scn +0.200 0.200 0.200 scn +0.200 0.200 0.200 SCN + +BT +202.582243 363.775967 Td +/F1.0 10.5 Tf +<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj +ET + +0.000 0.000 0.000 SCN +0.000 0.000 0.000 scn + +BT +533.94125 363.775967 Td +/F1.0 5.25 Tf + Tj +ET + +0.200 0.200 0.200 scn +0.200 0.200 0.200 SCN + +BT +535.30099 363.775967 Td +/F1.0 10.5 Tf +<3235> Tj +ET + +0.000 0.000 0.000 SCN +0.000 0.000 0.000 scn Q endstream @@ -971,7 +1011,7 @@ endobj /F4.0 38 0 R >> >> -/Annots [160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R] +/Annots [164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R] >> endobj 11 0 obj @@ -1645,7 +1685,7 @@ endobj /F1.0 8 0 R /F3.1 18 0 R >> -/XObject << /Stamp1 203 0 R +/XObject << /Stamp1 209 0 R >> >> /Annots [17 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R] @@ -1667,11 +1707,11 @@ endobj << /Type /Font /BaseFont /DK+NotoSerif-Bold /Subtype /TrueType -/FontDescriptor 234 0 R +/FontDescriptor 241 0 R /FirstChar 32 /LastChar 255 -/Widths 236 0 R -/ToUnicode 235 0 R +/Widths 243 0 R +/ToUnicode 242 0 R >> endobj 17 0 obj @@ -1689,11 +1729,11 @@ endobj << /Type /Font /BaseFont /DL+FontAwesome /Subtype /TrueType -/FontDescriptor 238 0 R +/FontDescriptor 245 0 R /FirstChar 32 /LastChar 255 -/Widths 240 0 R -/ToUnicode 239 0 R +/Widths 247 0 R +/ToUnicode 246 0 R >> endobj 19 0 obj @@ -3181,7 +3221,7 @@ endobj /F4.0 38 0 R /F5.0 43 0 R >> -/XObject << /Stamp1 203 0 R +/XObject << /Stamp1 209 0 R >> >> /Annots [39 0 R 40 0 R 44 0 R 45 0 R 46 0 R] @@ -3194,11 +3234,11 @@ endobj << /Type /Font /BaseFont /DM+mplus1mn-regular /Subtype /TrueType -/FontDescriptor 242 0 R +/FontDescriptor 249 0 R /FirstChar 32 /LastChar 255 -/Widths 244 0 R -/ToUnicode 243 0 R +/Widths 251 0 R +/ToUnicode 250 0 R >> endobj 39 0 obj @@ -3233,11 +3273,11 @@ endobj << /Type /Font /BaseFont /DN+NotoSerif-Italic /Subtype /TrueType -/FontDescr
[6/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/htg.pdf -- diff --git a/content/versions/SNAPSHOT/guides/htg.pdf b/content/versions/SNAPSHOT/guides/htg.pdf index e177a38..67f7399 100644 --- a/content/versions/SNAPSHOT/guides/htg.pdf +++ b/content/versions/SNAPSHOT/guides/htg.pdf @@ -4,16 +4,16 @@ << /Title (Hints & Tips Guide) /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0) -/CreationDate (D:20180213222703+00'00') -/ModDate (D:20180213222703+00'00') +/CreationDate (D:20180214103729+00'00') +/ModDate (D:20180214103729+00'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 18 0 R -/Outlines 472 0 R -/PageLabels 520 0 R +/Outlines 478 0 R +/PageLabels 527 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 842.89] /ViewerPreferences << /DisplayDocTitle true @@ -22,8 +22,8 @@ endobj endobj 3 0 obj << /Type /Pages -/Count 57 -/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 113 0 R 115 0 R 127 0 R 132 0 R 138 0 R 140 0 R 146 0 R 154 0 R 161 0 R 167 0 R 170 0 R 181 0 R 185 0 R 187 0 R 195 0 R 199 0 R 201 0 R 203 0 R 211 0 R 213 0 R 219 0 R 226 0 R 237 0 R 244 0 R 254 0 R 260 0 R 264 0 R 275 0 R 283 0 R 285 0 R 292 0 R 296 0 R 301 0 R 304 0 R 313 0 R 315 0 R 322 0 R 326 0 R 329 0 R 344 0 R 346 0 R 361 0 R 372 0 R] +/Count 58 +/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 31 0 R 36 0 R 41 0 R 47 0 R 53 0 R 62 0 R 70 0 R 80 0 R 98 0 R 113 0 R 115 0 R 127 0 R 132 0 R 138 0 R 140 0 R 146 0 R 154 0 R 161 0 R 167 0 R 170 0 R 181 0 R 185 0 R 187 0 R 195 0 R 199 0 R 201 0 R 205 0 R 207 0 R 215 0 R 217 0 R 223 0 R 230 0 R 241 0 R 248 0 R 258 0 R 264 0 R 269 0 R 279 0 R 287 0 R 289 0 R 296 0 R 300 0 R 305 0 R 308 0 R 317 0 R 319 0 R 326 0 R 330 0 R 333 0 R 348 0 R 350 0 R 365 0 R 376 0 R] >> endobj 4 0 obj @@ -80,11 +80,11 @@ endobj << /Type /Font /BaseFont /AQ+NotoSerif /Subtype /TrueType -/FontDescriptor 522 0 R +/FontDescriptor 529 0 R /FirstChar 32 /LastChar 255 -/Widths 524 0 R -/ToUnicode 523 0 R +/Widths 531 0 R +/ToUnicode 530 0 R >> endobj 9 0 obj @@ -1029,9 +1029,9 @@ ET 0.200 0.200 0.200 SCN BT -48.24 326.815963 Td +60.24 326.815963 Td /F1.0 10.5 Tf -<352e205365637572697479> Tj +<342e362e204a444f514c20616e642054696d657374616d7073> Tj ET 0.000 0.000 0.000 SCN @@ -1040,9 +1040,9 @@ ET 0.200 0.200 0.200 SCN BT -106.381247 326.815963 Td +202.582243 326.815963 Td /F1.0 10.5 Tf -<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj +<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj ET 0.000 0.000 0.000 SCN @@ -1060,7 +1060,7 @@ ET BT 535.30099 326.815963 Td /F1.0 10.5 Tf -<3239> Tj +<3238> Tj ET 0.000 0.000 0.000 SCN @@ -1069,9 +1069,9 @@ ET 0.200 0.200 0.200 SCN BT -60.24 308.33596 Td +48.24 308.33596 Td /F1.0 10.5 Tf -[<352e312e2042> 20.01953125 <7970617373696e67207365637572697479>] TJ +<352e205365637572697479> Tj ET 0.000 0.000 0.000 SCN @@ -1080,9 +1080,9 @@ ET 0.200 0.200 0.200 SCN BT -175.859746 308.33596 Td +106.381247 308.33596 Td /F1.0 10.5 Tf -<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj +<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj ET 0.000 0.000 0.000 SCN @@ -1100,7 +1100,7 @@ ET BT 535.30099 308.33596 Td /F1.0 10.5 Tf -<3239> Tj +<3330> Tj ET 0.000 0.000 0.000 SCN @@ -,7 +,7 @@ ET BT 60.24 289.85596 Td /F1.0 10.5 Tf -<352e322e2052756e2d6173> Tj +[<352e312e2042> 20.01953125 <7970617373696e67207365637572697479>] TJ ET 0.000 0.000 0.000 SCN @@ -1120,9 +1120,9 @@ ET 0.200 0.200 0.200 SCN BT -117.070243 289.85596 Td +175.859746 289.85596 Td /F1.0 10.5 Tf -<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e2
[5/9] isis-site git commit: ISIS-1813: adds release notes for 1.16.1
http://git-wip-us.apache.org/repos/asf/isis-site/blob/87081dfe/content/versions/SNAPSHOT/guides/rgant/rgant.html
--
diff --git a/content/versions/SNAPSHOT/guides/rgant/rgant.html
b/content/versions/SNAPSHOT/guides/rgant/rgant.html
index 3bf4b88..0ada4aa 100644
--- a/content/versions/SNAPSHOT/guides/rgant/rgant.html
+++ b/content/versions/SNAPSHOT/guides/rgant/rgant.html
@@ -2368,7 +2368,7 @@ table.CodeRay td.code>pre{padding:0}
- 3.2. command()
+ 3.2. Command Persistence and
Processing
https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc"";> Edit
Toggle Dropdown
@@ -2380,138 +2380,1168 @@ table.CodeRay td.code>pre{padding:0}
- The @Action(command=â¦â) attribute (and the
related @Action(commandXxx=â¦â) attributes) allows an action
invocation to be made into a concrete object such that it can be inspected and
persisted. The primary use case for this are to support the deferring the
execution of the action such that it can be invoked in the background, and to
replay commands in a master/slave configuration.
+ Every action invocation (and property edit for that matter) is
automatically reified into a concrete Command object. The
@Action(command=â¦â, commandXxx=â¦â) attributes provide
hints for the persistence of that Command object, and the
subsequent processing of that persisted command. The primary use cases for this
are to support the deferring the execution of the action such that it can be
invoked in the background, and to replay commands in a master/slave
configuration.
- The annotation works with (and is influenced by the behaviour of)
a number of domain services:
-
-
-
-CommandContext
-CommandService
-BackgroundService
and
-BackgroundCommandService
-
-
-
- Each action invocation is reified by the CommandContext
service into a Command object, capturing details of the target
object, the action, the parameter arguments, the user, a timestamp and so
on.
-
-
- If an appropriate CommandService is configured (for
example using (non-ASF) http://platform.incode.org/modules/spi/command/spi-command.html";>Incode
Platformâs command module), then the Command itself is
persisted.
-
-
- By default, actions are invoked in directly in the thread of the
invocation. If there is an implementation of
BackgroundCommandService (as the (non-ASF) http://platform.incode.org"; target="_blank">Incode Platform's command
module does provide), then this means in turn that the
BackgroundService can be used by the domain object code to
programmatically create background Commands.
-
-
-
-
-
-
-
-
- If background Commands are used, then an
external scheduler, using headless
access, must also be configured.
-
-
-
-
-
-
- The command() attribute determines whether the
action invocation should be reified into a Command object (by the
CommandContext
service).
-
-
- The default is AS_CONFIGURED, meaning that the configuration property
isis.services.command.actions is used to determine whether the
action invocation is reified:
-
-
-
-all
-
- all action invocations are reified
-
-ignoreSafe (or
ignoreQueryOnly)
-
- invocations of actions with safe (read-only) semantics are
ignored, but actions which may modify data are not ignored
-
-none
-
- no action invocations are reified.
-
-
-
-
- If there is no configuration property in
isis.properties then all action invocations are reified into
Commands.
-
-
-
-
-
-
-
-
- Note: Command reification does not necessarily
imply that Command objects will be persisted; that depends on
whether there is a CommandService
configured that will persist said Commands.
-
-
-
-
-
-
- This default can be overridden on an action-by-action basis; if
command() is set to ENABLED then the action is
reified irrespective of the configured value; if set to DISABLED
then the action invocation is NOT reified irrespective of the configured
[isis] branch master updated (de41037 -> 1b19e6e)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/isis.git. from de41037 ISIS-1844 further unchecked casts made explicit add a56f19d ISIS-1848: ensures that FreeStandingList does not incorrectly return java.lang.Object's specId, and adds new metamodel validator to detect this situation in future. add 128e144 ISIS-1837: adds metamodel validator to check "module extent". add b6bb1c7 Merge branch 'ISIS-1848' into maint-1.16.1 add 33bd9fd ISIS-1851: refine the algorithm for dynamically hiding property groups with 'nothing' in them add 1f9dba5 ISIS-1825: uses thread local to pass rendering context up to the scalar panel so that it, in turn, can correctly report on where it is being rendered. add 00fe078 ISIS-1569: adds CommandService2 as an extension add e866c71 ISIS-1569: by way of tidy-up, just removes unused injected ClockService from CommandServiceDefault add f2da845 ISIS-1831: adds a guard in exception handler of a RuntimeException (REST API) to avoid throwing an NPE there. add 2e4e9b9 ISIS-1569: removes CommandService2, not required after all. add 27156fe ISIS-1569: extends cmd-1.3.xsd to introduce a new CommandsDto (note the plural) as a sequence of CommandDto's add 099bbd6 ISIS-1569: adds a convenience Util class for ContentMappingService to remove boilerplate in subclass implementations (parsing the acceptable media types). add e1283fa ISIS-1569: defines CommandWithDto as an optional interface for Command SPI implementations to have their Command's implement (translatable into a CommandDto) along with out-of-the-box ContentMapingService to convert these into CommandsDto structure. add da6ece6 ISIS-1569: extends cmd and ixn schemas to allow userData to be specified, and moves the new CommandsDto into the new version of cmd.xsd also. add a5eb0d8 ISIS-1569: adds guard to ensure that BackgroundCommand#startedAt is always populated. add dda922c ISIS-1835: catches any type of exception in order to report a problem (an NPE was being thrown if the file wasn't present, rather than an IOException) add 0c2a2a0 ISIS-1569: adds in 'REPLAYABLE' as a new Command#ExecuteIn add ad841f9 ISIS-1836: removes chance of an NPE in the RO mapper for an exception (which was in turn resulting in a 500 rather than 422 when invoked an action with an incorrect parameter argument). add 001ed09 ISIS-1569: undeprecates Command#getStartedAt and Command#getCompletedAt add 24dcfa5 ISIS-1569: adds timings to CommandsDto, so less verbose and easier to read XML add 9020b72 ISIS-1569: updates to XSDs, make sure the version defaultsb are correct. add 50fa124 ISIS-1569: removes unused and accidentally committed element in cmd-1.4.xsd add a868fa9 ISIS-1569: updates XSDs for docs, and adds in the historical previous versions also. add 82ef3b8 ISIS-1569: updates docs for CommandService and cmd schema add 1cdd64a ISIS-1569: updates docs for ContentMappingService, default implementations for Command(s)Dto add b56a68e ISIS-1853: extends CommandDtoUtils to support colleciton args, and similarly AbstractIsisSessionTemplate. add 6e96761 ISIS-1569: introduces a new ExecuteIn#EXCLUDED add 2cf72b4 ISIS-1569: extends BackgroundCommandExecution so that stops execution of replayable commands once at least one has failed. add f504860 ISIS-1569: fixes logic for background command execution, to stop replaying if hit exception add 48ea481 ISIS-1569: adds support for @Action(commandWithDtoProcessor=...) and @Property(commandWithDtoProcessor=) add dfe09c4 ISIS-1569: various fixes for ContentMappingService (while manual testing of replication) add 0329099 ISIS-1569: simplies BackgroundCommandExecution so can be subclassed with different "OnExecutionPolicy" modes add ce192de ISIS-1569: renames MetaModelService5 API from commandDtoProcessorFor() to commandWithDtoProcessorFor() add 19dfb53 ISIS-1569: fixes issue to fail-fast. add 20458aa ISIS-1822: fixes NPE if encounters non-existent action in menubars.layout.xml add 85ef278 ISIS-1569: also catches exception when attempt to commit. add 9996eab ISIS-1569: renames CommandWithDtoProcessor to CommandDtoProcessor ... add 344dcba Merge branch 'ISIS-1569-replay-commands' into maint-1.16.1 add a821fa2 ISIS-1569: removes usage of deprecated annotations in Command iterface add 6330ef2 ISIS-1826 and ISIS-1856: adds Automatic-Module-Name to manifest, adds git SCM-Revision to manifest, also generates git.properties and adds to jar add 6c200e3 ISIS-1856: updates incorrect in (parent) core's pom.xml add 6889738 ISIS-1826 and ISIS-1856: changes property names a little add ee78604 ISIS-1569: extends BackgroundCommandExecution
[isis] 02/02: ISIS-1810: fixes compile issues arising from merge
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1b19e6e5dd9799d8247223b50ddc574628e244b3
Author: Dan Haywood
AuthorDate: Wed Feb 14 13:09:46 2018 +
ISIS-1810: fixes compile issues arising from merge
---
.../_rgsvc_metadata-api_MetamodelService.adoc | 10 +++
.../apache/isis/applib/annotation/InvokeOn.java| 10 ---
.../command/CommandFacetForActionAnnotation.java | 2 +-
.../command/CommandFacetForPropertyAnnotation.java | 2 +-
...onParameterDefaultsAndChoicesPostProcessor.java | 5 ++--
.../MetaModelValidatorToCheckModuleExtent.java | 6 ++---
.../runtime/headless/IsisSystemBootstrapper.java | 4 +--
.../background/CommandExecutorServiceDefault.java | 31 +++---
.../collection/AssociatedWithActionsHelper.java| 4 +--
9 files changed, 30 insertions(+), 44 deletions(-)
diff --git
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
index 361e468..243fe2d 100644
---
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
+++
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc
@@ -1,12 +1,12 @@
[[_rgsvc_metadata-api_MetamodelService]]
-= `MetaModelService5`
+= `MetaModelService`
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by
applicable law or ag [...]
:_basedir: ../../
:_imagesdir: images/
-The `MetaModelService5` service (and its various supertypes) provides access
to a number of aspects of Apache Isis' internal metamodel.
+The `MetaModelService` service provides access to a number of aspects of
Apache Isis' internal metamodel.
[[_rgsvc_metadata-api_MetamodelService_api]]
@@ -17,13 +17,12 @@ The API defined by the service is:
[source,java]
-public interface MetaModelService4 {
+public interface MetaModelService {
Class fromObjectType(String objectType); // <1>
String toObjectType(Class domainType); // <2>
void rebuild(Class domainType); // <3>
List export();// <4>
-// introduced in MetaModelService2
enum Sort { // <5>
VIEW_MODEL, JDO_ENTITY, DOMAIN_SERVICE,
MIXIN, VALUE, COLLECTION, UNKNOWN;
@@ -35,15 +34,12 @@ public interface MetaModelService4 {
Sort sortOf(Class domainType); // <6>
Sort sortOf(Bookmark bookmark);
-// introduced in MetaModelService3
Sort sortOf(Class domainType, Mode mode);
Sort sortOf(Bookmark bookmark, Mode mode);
-// introduced in MetaModelService4
AppManifest getAppManifest(); // <7>
AppManifest2 getAppManifest2();
-// introduced in MetaModelService5
CommandDtoProcessor commandDtoProcessorFor( // <8>
String memberIdentifier);
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
index 72dfed6..8f6f4de 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
@@ -63,14 +63,4 @@ public enum InvokeOn {
@Deprecated
NOT_SPECIFIED;
-@Deprecated
-public static Bulk.AppliesTo from(final InvokeOn invokeOn) {
-if(invokeOn == null) return null;
-if(invokeOn == OBJECT_AND_COLLECTION) return
Bulk.AppliesTo.BULK_AND_REGULAR;
-if(invokeOn == COLLECTION_ONLY) return Bulk.AppliesTo.BULK_ONLY;
-if(invokeOn == OBJECT_ONLY) return Bulk.AppliesTo.REGULAR_ONLY;
-// shouldn't happen
-throw new IllegalArgumentException("Unrecognized appliesTo: " +
invokeOn);
-}
-
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
index 85577a8..c873ac4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/C
[isis] branch ISIS-1569-replay-commands deleted (was 9996eab)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch ISIS-1569-replay-commands in repository https://gitbox.apache.org/repos/asf/isis.git. was 9996eab ISIS-1569: renames CommandWithDtoProcessor to CommandDtoProcessor ... The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 01/02: ISIS-1852 allow local thread variable propagation to any child threads
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-1852_parallel_stream_patch
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e29b26f535079e051b3d84f6a148dfff9c4bd7bc
Author: Andi Huber
AuthorDate: Mon Jan 29 15:06:27 2018 +0100
ISIS-1852 allow local thread variable propagation to any child threads
---
.../core/runtime/services/ServiceInstantiator.java | 6 +-
.../runtime/services/ServiceInstantiatorTest.java | 281 -
2 files changed, 167 insertions(+), 120 deletions(-)
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 2b6591b..77adb02 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -157,11 +157,15 @@ public final class ServiceInstantiator {
final T newInstance = proxySubclass.newInstance();
final ProxyObject proxyObject = (ProxyObject) newInstance;
proxyObject.setHandler(new MethodHandler() {
-private ThreadLocal serviceByThread = new ThreadLocal<>();
+ // Allow serviceByThread to be propagated from the thread that
starts the request
+ // to any child-threads, hence InheritableThreadLocal.
+ private InheritableThreadLocal serviceByThread = new
InheritableThreadLocal<>();
@Override
public Object invoke(final Object proxied, final Method
proxyMethod, final Method proxiedMethod, final Object[] args) throws Throwable {
+ System.out.println("invoke: "+proxyMethod.getName()+"
"+this);
+
cacheMethodsIfNecessary(cls);
if(proxyMethod.getName().equals("__isis_startRequest")) {
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index 3237b51..5b39423 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -16,134 +16,177 @@
*/
package org.apache.isis.core.runtime.services;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAdder;
+
import javax.enterprise.context.RequestScoped;
+
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+public class ServiceInstantiatorTest {
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+ @Rule
+ public JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-public class ServiceInstantiatorTest {
+ private ServiceInstantiator serviceInstantiator;
+
+ @JUnitRuleMockery2.Ignoring
+ @Mock
+ private ServicesInjector mockServiceInjector;
+
+ @Before
+ public void setUp() throws Exception {
+
+ serviceInstantiator = new ServiceInstantiator();
+ serviceInstantiator.setConfiguration(new
IsisConfigurationDefault());
+ }
+
+ @Test
+ public void singleton() {
+ SingletonCalculator calculator =
serviceInstantiator.createInstance(SingletonCalculator.class);
+ assertThat(calculator.add(3,4), is(7));
+ }
+
+ @Test
+ public void requestScoped_instantiate() {
+ AccumulatingCalculator calculator =
serviceInstantiator.createInstance(AccumulatingCalculator.class);
+ assertThat(calculator instanceof RequestScopedService,
is(true));
+ }
+
+ @Test
+ public void requestScoped_justOneThread() {
+ AccumulatingCalculator calculator =
serviceInstantiator.createInstance(AccumulatingCalculator.class);
+ try {
+
((RequestScopedService)calculator).__isis_startReques
[isis] 02/02: ISIS-1852 testcase backported to JDK 7
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-1852_parallel_stream_patch
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3706fa92cf0d3668a0a18be21b759f585c187692
Author: Andi Huber
AuthorDate: Tue Jan 30 07:10:05 2018 +0100
ISIS-1852 testcase backported to JDK 7
---
.../runtime/services/ServiceInstantiatorTest.java | 38 +-
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index 5b39423..d12766e 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.LongAdder;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.context.RequestScoped;
@@ -139,34 +139,40 @@ public class ServiceInstantiatorTest {
final AccumulatingCalculator calculator =
serviceInstantiator.createInstance(AccumulatingCalculator.class);
- final LongAdder counter = new LongAdder();
-
+ final AtomicInteger counter = new AtomicInteger();
+
final int n = 100;
final int nThreads = 8;
final ExecutorService execService =
Executors.newFixedThreadPool(nThreads);
// initialize the request scoped calculator on current thread
('main')
((RequestScopedService)calculator).__isis_startRequest(mockServiceInjector);
-
+
for(int i=1;i<=n;++i) {
final int j=i;
- execService.submit(()->{
- try {
-
- // access the request scoped calculator
on a child thread of 'main'
- calculator.add(j);
- counter.add(calculator.getTotal());
-
- } catch (Exception e) {
- System.err.println(e.getMessage());
- }
+
+ execService.submit(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+
+ // access the request scoped
calculator on a child thread of 'main'
+ calculator.add(j);
+
counter.addAndGet(calculator.getTotal());
+
+ } catch (Exception e) {
+
System.err.println(e.getMessage());
+ }
+ }
});
+
}
-
+
execService.shutdown();
execService.awaitTermination(10, TimeUnit.SECONDS);
-
+
((RequestScopedService)calculator).__isis_endRequest();
assertThat(counter.intValue(), is(n*(n+1)/2));
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] branch ISIS-1852_parallel_stream_patch updated (7a70623 -> 3706fa9)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch ISIS-1852_parallel_stream_patch in repository https://gitbox.apache.org/repos/asf/isis.git. discard 7a70623 ISIS-1852 testcase backported to JDK 7 discard 5d0d989 ISIS-1852 allow local thread variable propagation to any child threads add 1f9dba5 ISIS-1825: uses thread local to pass rendering context up to the scalar panel so that it, in turn, can correctly report on where it is being rendered. add 00fe078 ISIS-1569: adds CommandService2 as an extension add e866c71 ISIS-1569: by way of tidy-up, just removes unused injected ClockService from CommandServiceDefault add f2da845 ISIS-1831: adds a guard in exception handler of a RuntimeException (REST API) to avoid throwing an NPE there. add 2e4e9b9 ISIS-1569: removes CommandService2, not required after all. add 27156fe ISIS-1569: extends cmd-1.3.xsd to introduce a new CommandsDto (note the plural) as a sequence of CommandDto's add 099bbd6 ISIS-1569: adds a convenience Util class for ContentMappingService to remove boilerplate in subclass implementations (parsing the acceptable media types). add e1283fa ISIS-1569: defines CommandWithDto as an optional interface for Command SPI implementations to have their Command's implement (translatable into a CommandDto) along with out-of-the-box ContentMapingService to convert these into CommandsDto structure. add da6ece6 ISIS-1569: extends cmd and ixn schemas to allow userData to be specified, and moves the new CommandsDto into the new version of cmd.xsd also. add a5eb0d8 ISIS-1569: adds guard to ensure that BackgroundCommand#startedAt is always populated. add dda922c ISIS-1835: catches any type of exception in order to report a problem (an NPE was being thrown if the file wasn't present, rather than an IOException) add 0c2a2a0 ISIS-1569: adds in 'REPLAYABLE' as a new Command#ExecuteIn add ad841f9 ISIS-1836: removes chance of an NPE in the RO mapper for an exception (which was in turn resulting in a 500 rather than 422 when invoked an action with an incorrect parameter argument). add 001ed09 ISIS-1569: undeprecates Command#getStartedAt and Command#getCompletedAt add 24dcfa5 ISIS-1569: adds timings to CommandsDto, so less verbose and easier to read XML add 9020b72 ISIS-1569: updates to XSDs, make sure the version defaultsb are correct. add 50fa124 ISIS-1569: removes unused and accidentally committed element in cmd-1.4.xsd add a868fa9 ISIS-1569: updates XSDs for docs, and adds in the historical previous versions also. add 82ef3b8 ISIS-1569: updates docs for CommandService and cmd schema add 1cdd64a ISIS-1569: updates docs for ContentMappingService, default implementations for Command(s)Dto add b56a68e ISIS-1853: extends CommandDtoUtils to support colleciton args, and similarly AbstractIsisSessionTemplate. add 6e96761 ISIS-1569: introduces a new ExecuteIn#EXCLUDED add 2cf72b4 ISIS-1569: extends BackgroundCommandExecution so that stops execution of replayable commands once at least one has failed. add f504860 ISIS-1569: fixes logic for background command execution, to stop replaying if hit exception add 48ea481 ISIS-1569: adds support for @Action(commandWithDtoProcessor=...) and @Property(commandWithDtoProcessor=) add dfe09c4 ISIS-1569: various fixes for ContentMappingService (while manual testing of replication) add 0329099 ISIS-1569: simplies BackgroundCommandExecution so can be subclassed with different "OnExecutionPolicy" modes add ce192de ISIS-1569: renames MetaModelService5 API from commandDtoProcessorFor() to commandWithDtoProcessorFor() add 19dfb53 ISIS-1569: fixes issue to fail-fast. add 20458aa ISIS-1822: fixes NPE if encounters non-existent action in menubars.layout.xml add 85ef278 ISIS-1569: also catches exception when attempt to commit. add 9996eab ISIS-1569: renames CommandWithDtoProcessor to CommandDtoProcessor ... add 344dcba Merge branch 'ISIS-1569-replay-commands' into maint-1.16.1 add a821fa2 ISIS-1569: removes usage of deprecated annotations in Command iterface add 6330ef2 ISIS-1826 and ISIS-1856: adds Automatic-Module-Name to manifest, adds git SCM-Revision to manifest, also generates git.properties and adds to jar add 6c200e3 ISIS-1856: updates incorrect in (parent) core's pom.xml add 6889738 ISIS-1826 and ISIS-1856: changes property names a little add ee78604 ISIS-1569: extends BackgroundCommandExecution to allow commands to be run via the sudoservice (switching user) add c430881 ISIS-1849 - fixes documentation issues add aee0b0d ISIS-1833: reinstates mandatory marker for parameters add 6588395 ISIS-1857: adds div class=clearfix to force the help block add a2df1fd ISIS-1813: adds -parameters' compiler argum
[isis] 03/06: Merge remote-tracking branch 'origin/ISIS-1846_internal_utils'
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit e989ad937057a074023042691a0b65df036740b1 Merge: c149771 8ebd313 Author: Dan Haywood AuthorDate: Wed Feb 14 13:59:38 2018 + Merge remote-tracking branch 'origin/ISIS-1846_internal_utils' # Conflicts: # core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java # core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java # core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java core/applib/pom.xml| 20 +- .../java/org/apache/isis/applib/AppManifest.java | 120 +- .../apache/isis/applib/AppManifestAbstract.java| 3 +- .../org/apache/isis/applib/IsisApplibModule.java | 5 +- .../org/apache/isis/applib/ModuleAbstract.java | 4 +- .../fixturescripts/BuilderScriptAbstract.java | 4 +- .../applib/fixturescripts/ExecutionParameters.java | 6 +- .../applib/fixturescripts/FixtureResultList.java | 4 +- .../isis/applib/fixturescripts/FixtureScript.java | 41 ++-- .../isis/applib/fixturescripts/FixtureScripts.java | 3 + .../isis/applib/fixturescripts/StringUtil.java | 79 --- .../Streams.java => internal/_Constants.java} | 42 ++-- .../apache/isis/applib/internal/base/_Casts.java} | 34 +-- .../isis/applib/internal/base/_NullSafe.java} | 74 +-- .../apache/isis/applib/internal/base/_Strings.java | 232 .../internal/base/_Strings_NaturalNames.java | 94 .../internal/base/_Strings_SplitIterator.java | 73 +++ .../Casts.java => internal/base/package-info.java} | 21 +- .../applib/internal/compare/_Comparators.java} | 52 +++-- .../compare/_Comparators_SequenceCompare.java} | 53 +++-- .../applib/internal/compare/package-info.java} | 20 +- .../isis/applib/internal/context/_Context.java | 151 + .../applib/internal/context/package-info.java} | 20 +- .../applib/internal/exceptions/_Exceptions.java| 85 +++ .../applib/internal/exceptions/package-info.java} | 20 +- .../apache/isis/applib/internal/package-info.java} | 20 +- .../isis/applib/internal/reflection/_Reflect.java | 83 +++ .../internal/reflection/_Reflect_Discovery.java| 85 +++ .../internal/reflection/_Reflect_Manifest.java | 147 + .../applib/internal/reflection/package-info.java} | 20 +- .../layout/component/CollectionLayoutData.java | 3 +- .../isis/applib/layout/component/FieldSet.java | 2 +- .../applib/layout/grid/bootstrap3/BS3ClearFix.java | 1 + .../layout/grid/bootstrap3/BS3ElementAbstract.java | 1 + .../applib/layout/grid/bootstrap3/BS3Grid.java | 2 +- .../isis/applib/layout/grid/bootstrap3/BS3Tab.java | 4 +- .../applib/layout/menubars/MenuBarsAbstract.java | 1 + .../applib/layout/menubars/bootstrap3/BS3Menu.java | 5 - .../layout/menubars/bootstrap3/BS3MenuBars.java| 5 + .../java/org/apache/isis/applib/query/Query.java | 2 +- .../services/appfeat/ApplicationMemberType.java| 15 +- .../isis/applib/services/bookmark/Bookmark.java| 5 +- .../ClassDiscoveryServiceUsingReflections.java | 35 +-- .../isis/applib/services/dto/DtoMappingHelper.java | 6 +- .../services/eventbus/AbstractDomainEvent.java | 15 ++ .../exceprecog/ExceptionRecognizerAbstract.java| 57 - .../exceprecog/ExceptionRecognizerForType.java | 1 + ...rType.java => ExceptionRecognizerForType2.java} | 63 +++--- ...xceptionRecognizerForJDODataStoreException.java | 4 +- ...traintViolationForeignKeyNoActionException.java | 17 +- ...ionRecognizerForJDOObjectNotFoundException.java | 5 +- ...yConstraintViolationUniqueOrIndexException.java | 17 +- .../isis/applib/services/jaxb/JaxbService.java | 10 +- .../queryresultscache/QueryResultsCache.java | 4 +- .../services/repository/RepositoryService.java | 26 ++- .../isis/applib/spec/AbstractSpecification2.java | 4 +- .../java/org/apache/isis/applib/util/Enums.java| 40 +--- .../java/org/apache/isis/applib/util/JaxbUtil.java | 4 +- .../apache/isis/applib/util/ObjectContracts.java | 6 +- .../org/apache/isis/applib/util/TitleBuffer.java | 8 +- .../apache/isis/schema/utils/CommonDtoUtils.java | 20 +- .../isis/schema/utils/InteractionDtoUtils.java | 19 +- .../isis/schema/utils/MemberExecutionDtoUtils.java | 4 +- .../isis/applib/internal/base/NullSafeTest.java| 116 ++ .../isis/applib/internal/base/StringsTest.java | 243 + .../applib/internal/compare/ComparatorsTest.java | 158 ++ ...t.java => ExceptionRecognizerForType2Test.java} | 29 ++- .../exceprecog/ExceptionRecognizerGeneralTest.java | 32 ++- .../core/commons/exception
[isis] 05/06: ISIS-1846: reinstates reflections as a non-optional compile-time dependency, since required for both compile and runtime.
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit e0cb0853671a803c5356ef5ea8e1a884ddfebe78 Author: Dan Haywood AuthorDate: Wed Feb 14 14:27:19 2018 + ISIS-1846: reinstates reflections as a non-optional compile-time dependency, since required for both compile and runtime. --- core/applib/pom.xml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/applib/pom.xml b/core/applib/pom.xml index 596f0a9..2d84f74 100644 --- a/core/applib/pom.xml +++ b/core/applib/pom.xml @@ -122,7 +122,6 @@ org.axonframework axon-core -true @@ -166,9 +165,11 @@ org.reflections reflections - -true + +false -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 01/06: ISIS-1852: fixes unit test
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0d749cec1c964b903150988d5e1457bda65f185e
Author: Dan Haywood
AuthorDate: Wed Feb 14 13:56:23 2018 +
ISIS-1852: fixes unit test
the algorithm was wrong, I think
---
.../core/runtime/services/ServiceInstantiator.java | 2 +-
.../runtime/services/ServiceInstantiatorTest.java | 47 --
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 77adb02..1643c2d 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -160,7 +160,7 @@ public final class ServiceInstantiator {
// Allow serviceByThread to be propagated from the thread that
starts the request
// to any child-threads, hence InheritableThreadLocal.
private InheritableThreadLocal serviceByThread = new
InheritableThreadLocal<>();
-
+
@Override
public Object invoke(final Object proxied, final Method
proxyMethod, final Method proxiedMethod, final Object[] args) throws Throwable {
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index d12766e..6bf03e7 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -16,26 +16,30 @@
*/
package org.apache.isis.core.runtime.services;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.context.RequestScoped;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import com.google.common.collect.Lists;
+
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class ServiceInstantiatorTest {
@Rule
@@ -139,7 +143,8 @@ public class ServiceInstantiatorTest {
final AccumulatingCalculator calculator =
serviceInstantiator.createInstance(AccumulatingCalculator.class);
- final AtomicInteger counter = new AtomicInteger();
+
+ final List interimTotals =
Collections.synchronizedList(Lists.newArrayList());
final int n = 100;
final int nThreads = 8;
@@ -151,21 +156,17 @@ public class ServiceInstantiatorTest {
for(int i=1;i<=n;++i) {
final int j=i;
- execService.submit(new Runnable() {
-
- @Override
- public void run() {
- try {
+ execService.submit(() -> {
+try {
- // access the request scoped
calculator on a child thread of 'main'
- calculator.add(j);
-
counter.addAndGet(calculator.getTotal());
+// access the request scoped calculator on a child thread
of 'main'
+calculator.add(j);
+interimTotals.add(calculator.getTotal());
- } catch (Exception e) {
-
System.err.println(e.getMessage());
- }
- }
- });
+} catch (Exception e) {
+System.err.println(e.getMessage());
+}
+});
}
@@ -175,7 +176,9 @@ public
[isis] 06/06: ISIS-1852: removes debug System.out.println
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 96a2a78533369b9f8cc2e8eb63a32e3420336ef1
Author: Dan Haywood
AuthorDate: Wed Feb 14 14:33:17 2018 +
ISIS-1852: removes debug System.out.println
---
.../java/org/apache/isis/core/runtime/services/ServiceInstantiator.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 1643c2d..421f17a 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -164,8 +164,6 @@ public final class ServiceInstantiator {
@Override
public Object invoke(final Object proxied, final Method
proxyMethod, final Method proxiedMethod, final Object[] args) throws Throwable {
- System.out.println("invoke: "+proxyMethod.getName()+"
"+this);
-
cacheMethodsIfNecessary(cls);
if(proxyMethod.getName().equals("__isis_startRequest")) {
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 04/06: ISIS-1846: fixes unit test (had accidentally changed contract)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c1d0732604857ebf0d9496914e737d824617e1e0
Author: Dan Haywood
AuthorDate: Wed Feb 14 14:26:44 2018 +
ISIS-1846: fixes unit test (had accidentally changed contract)
---
.../models/LowestCommonSuperclassClosureTest.java | 26 +-
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git
a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
index 523bf37..4114cda 100644
---
a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
+++
b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
@@ -19,14 +19,14 @@
package org.apache.isis.viewer.wicket.model.models;
-import static org.junit.Assert.assertThat;
-
+import java.util.Arrays;
import java.util.List;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.junit.Test;
-import com.google.common.collect.Lists;
+import org.apache.isis.core.commons.matchers.IsisMatchers;
+
+import static org.junit.Assert.assertThat;
public class LowestCommonSuperclassClosureTest {
@@ -37,30 +37,26 @@ public class LowestCommonSuperclassClosureTest {
static class Lion extends Mammal {}
@Test
-public void nothingInCommon() throws Exception {
-assertLowestCommonOfListIs(listOf(Animal.class, Mineral.class,
Vegetable.class), Object.class);
+public void nothingInCommon() {
+assertLowestCommonOfListIs(Arrays.asList(new Animal(), new Mineral(),
new Vegetable()), Object.class);
}
@Test
-public void superclassInCommon() throws Exception {
-assertLowestCommonOfListIs(listOf(Animal.class, Mammal.class),
Animal.class);
+public void superclassInCommon() {
+assertLowestCommonOfListIs(Arrays.asList(new Animal(), new Mammal()),
Animal.class);
}
@Test
-public void subclassInCommon() throws Exception {
-assertLowestCommonOfListIs(listOf(Lion.class, Lion.class), Lion.class);
+public void subclassInCommon() {
+assertLowestCommonOfListIs(Arrays.asList(new Lion(), new Lion()),
Lion.class);
}
-private static void assertLowestCommonOfListIs(List> list,
Class expected) {
+private static void assertLowestCommonOfListIs(List list, Class
expected) {
EntityCollectionModel.LowestCommonSuperclassFinder finder =
new
EntityCollectionModel.LowestCommonSuperclassFinder();
finder.searchThrough(list);
assertThat(finder.getLowestCommonSuperclass(),
IsisMatchers.classEqualTo(expected));
}
-private static List> listOf(Class... classes) {
-return Lists.newArrayList(classes);
-}
-
}
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 02/06: Merge branch 'ISIS-1852_parallel_stream_patch'
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit c1497719fa8276b0d5b8ac2a83771beabf821e39 Merge: 1b19e6e 0d749ce Author: Dan Haywood AuthorDate: Wed Feb 14 13:58:14 2018 + Merge branch 'ISIS-1852_parallel_stream_patch' .../core/runtime/services/ServiceInstantiator.java | 8 +- .../runtime/services/ServiceInstantiatorTest.java | 278 - 2 files changed, 171 insertions(+), 115 deletions(-) -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch master updated (1b19e6e -> 96a2a78)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/isis.git. from 1b19e6e ISIS-1810: fixes compile issues arising from merge add e29b26f ISIS-1852 allow local thread variable propagation to any child threads add 3706fa9 ISIS-1852 testcase backported to JDK 7 new 0d749ce ISIS-1852: fixes unit test new c149771 Merge branch 'ISIS-1852_parallel_stream_patch' add b958267 ISIS-1846 beginning with consolidation of internal utilities add c16086d Merge branch 'master' into ISIS-1846_internal_utils add c407760 ISIS-1846 consolidate utilities add 3ccfd33 ISIS-1846 deduplicate uses of asNaturalName2 and other add 44af17e ISIS-1846 deprecate StringPredicates and StringFunctions, refactoring any references to use the new $String utility class add 0622780 ISIS-1846 use mixin naming convention for package private support classes add bc59167 ISIS-1846 add missing license header add b6f8293 ISIS-1846 StringOperator: improved name for composing method add debea9f ISIS-1846 consolidate comparator algorithms into $Comparators add 47790a6 ISIS-1846 refactoring: less heap pollution on sequence compare add 25f8b31 ISIS-1846 underscore(_) instead of dollar($) prefix for internal classes add 7ba8fd6 ISIS-1845 fix EventBusServiceDefaultTest NPE add 8b865d6 ISIS-1845 fix all tests in ObjectReflectorDefaultTest_object add 4a90358 ISIS-1846 test cases added for new utility classes add 954c03d ISIS-1827 refactoring out some guava predicate usages yet without breaking API add c32e448 ISIS-1827 cleanup public API java-doc in RepositoryService add 890cff5 ISIS-1827 reflect API changes in RepositoryServiceInternalDefault add 03823d7 ISIS-1827 guava free drop-in replacement for all ExceptionRecognizers add 6631872 ISIS-1827 reflect applib changes in ExceptionRecognizerDocDefault add 77b179b ISIS-1846 add capitalize to new _String utility + tests, cleanup Enums add 463947d ISIS-1846 fix Enums copy paste error add 62c3f3b ISIS-1827 added tests for all ExceptionRecognizers to reflect applib additions add dd3029c ISIS-1827 mark some unused public static guava functions deprecated add 7613ee7 ISIS-1846 consolidate uses of capitalize add 996cf2980 ISIS-1846 another occurrence of capitalize consolidated add a5931f6 ISIS-1846 clarify corner cases for string splitting + tests add 70a5f0d ISIS-1846 introduces _Constants (internal API) add 286b2c5 ISIS-1846 consolidate uses of constants 'emptyObjects' + 'emptyClasses' add c09cffb ISIS-1846 make constants final add 3b9aded ISIS-1841 replace uses of deprecated Nullable with Java's Optional add 8b19f8a ISIS-1841 Nullable, Closure, IterableExtensions removed (after refactoring, no longer needed), tests removed or adapted add 9c2514c ISIS-1841 remove unused setter, that does nothing anyway add fe219d0 ISIS-1846 add _Exceptions to internal API add 7d5b538 ISIS-1841 cleanup some compiler warnings add 8e8b5f1 ISIS-1841 refactoring switch statements add 7743f0b ISIS-1846 java-doc: simplify warnings for internal API use add 3bb3683 ISIS-1846 major refactoring: introduces _Reflect (internal API) add da7b587 ISIS-1846 minor refactoring: introduces _Context (internal API) add 5dd9f73 ISIS-1846 improve java-doc add 71101fc ISIS-1846 put empty string array also in _Constants for convenience add 66cd1f2 ISIS-1846 java-doc improved add 62725eb ISIS-1846 added reviewer notes and questions add 8ebd313 ISIS-1846 thread-safe (atomic) writes to _Context (singleton-store) new e989ad9 Merge remote-tracking branch 'origin/ISIS-1846_internal_utils' new c1d0732 ISIS-1846: fixes unit test (had accidentally changed contract) new e0cb085 ISIS-1846: reinstates reflections as a non-optional compile-time dependency, since required for both compile and runtime. new 96a2a78 ISIS-1852: removes debug System.out.println The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/applib/pom.xml| 23 +- .../java/org/apache/isis/applib/AppManifest.java | 120 + .../apache/isis/applib/AppManifestAbstract.java| 3 +- .../org/apache/isis/applib/IsisApplibModule.java | 5 +- .../org/apache/isis/applib/ModuleAbstract.java | 4 +- .../fixturescripts/BuilderScriptAbstract.java | 4 +- .../applib/fixturescripts/ExecutionParameters.java | 6 +- .../applib/fixturescripts/FixtureResultList.java | 4 +- .../isis/applib/fixturescripts/FixtureScript.java
[isis] branch master updated: ISIS-1852: removes debug System.out.println
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 39a6039 ISIS-1852: removes debug System.out.println
new c05e5ca Merge branch 'ISIS-1852_parallel_stream_patch'
39a6039 is described below
commit 39a60398a58190433fb2e1ca57ea94ad095b7e7c
Author: Dan Haywood
AuthorDate: Wed Feb 14 14:33:17 2018 +
ISIS-1852: removes debug System.out.println
---
.../java/org/apache/isis/core/runtime/services/ServiceInstantiator.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 1643c2d..421f17a 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -164,8 +164,6 @@ public final class ServiceInstantiator {
@Override
public Object invoke(final Object proxied, final Method
proxyMethod, final Method proxiedMethod, final Object[] args) throws Throwable {
- System.out.println("invoke: "+proxyMethod.getName()+"
"+this);
-
cacheMethodsIfNecessary(cls);
if(proxyMethod.getName().equals("__isis_startRequest")) {
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] branch ISIS-1846_internal_utils deleted (was 8ebd313)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch ISIS-1846_internal_utils in repository https://gitbox.apache.org/repos/asf/isis.git. was 8ebd313 ISIS-1846 thread-safe (atomic) writes to _Context (singleton-store) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch ISIS-1852_parallel_stream_patch updated (3706fa9 -> 39a6039)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch ISIS-1852_parallel_stream_patch in repository https://gitbox.apache.org/repos/asf/isis.git. from 3706fa9 ISIS-1852 testcase backported to JDK 7 add 0d749ce ISIS-1852: fixes unit test add 39a6039 ISIS-1852: removes debug System.out.println No new revisions were added by this update. Summary of changes: .../core/runtime/services/ServiceInstantiator.java | 4 +- .../runtime/services/ServiceInstantiatorTest.java | 47 -- 2 files changed, 26 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch release-1.16.0-RC1 deleted (was 2e2ac1f)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch release-1.16.0-RC1 in repository https://gitbox.apache.org/repos/asf/isis.git. was 2e2ac1f ISIS-1465: fixes property in hellworld app. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] branch ISIS-1852_parallel_stream_patch updated: ISIS-1852: reworks unit test, again
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-1852_parallel_stream_patch
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to
refs/heads/ISIS-1852_parallel_stream_patch by this push:
new 3e3ad2b ISIS-1852: reworks unit test, again
3e3ad2b is described below
commit 3e3ad2bb1b8abb605abf71e66ace47ed7b30605c
Author: Dan Haywood
AuthorDate: Wed Feb 14 15:13:52 2018 +
ISIS-1852: reworks unit test, again
---
.../runtime/services/ServiceInstantiatorTest.java | 37 +++---
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
index 6bf03e7..0d777c9 100644
---
a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
+++
b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/ServiceInstantiatorTest.java
@@ -18,6 +18,7 @@ package org.apache.isis.core.runtime.services;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
@@ -38,6 +39,7 @@ import
org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
public class ServiceInstantiatorTest {
@@ -140,28 +142,29 @@ public class ServiceInstantiatorTest {
@Test
public void requestScoped_childThreads() throws InterruptedException {
- final AccumulatingCalculator calculator =
-
serviceInstantiator.createInstance(AccumulatingCalculator.class);
+ final Consumer consumer =
serviceInstantiator.createInstance(Consumer.class);
-
- final List interimTotals =
Collections.synchronizedList(Lists.newArrayList());
+ final List allTheNumbers =
Collections.synchronizedList(Lists.newArrayList());
final int n = 100;
+ for (int i = 0; i < n; i++) {
+ allTheNumbers.add(i);
+ }
+
final int nThreads = 8;
final ExecutorService execService =
Executors.newFixedThreadPool(nThreads);
// initialize the request scoped calculator on current thread
('main')
-
((RequestScopedService)calculator).__isis_startRequest(mockServiceInjector);
+
((RequestScopedService)consumer).__isis_startRequest(mockServiceInjector);
- for(int i=1;i<=n;++i) {
+ for (int i = 0; i < n; i++) {
final int j=i;
execService.submit(() -> {
try {
// access the request scoped calculator on a child thread
of 'main'
-calculator.add(j);
-interimTotals.add(calculator.getTotal());
+consumer.consume(allTheNumbers, j);
} catch (Exception e) {
System.err.println(e.getMessage());
@@ -174,11 +177,9 @@ public class ServiceInstantiatorTest {
execService.awaitTermination(10, TimeUnit.SECONDS);
- ((RequestScopedService)calculator).__isis_endRequest();
+ ((RequestScopedService)consumer).__isis_endRequest();
- assertThat(interimTotals.size(), is(n));
- final Integer maxTotal = Collections.max(interimTotals);
- assertThat(maxTotal, is(n*(n+1)/2));
+ assertFalse(allTheNumbers.stream().anyMatch(Objects::nonNull));
}
public static class SingletonCalculator {
@@ -198,4 +199,16 @@ public class ServiceInstantiatorTest {
return total;
}
}
+
+ @RequestScoped
+ public static class Consumer {
+ public void consume(final List queue, final int slot) {
+ synchronized (queue) {
+ final Integer integer = queue.get(slot);
+ if(integer != null) {
+ queue.set(slot, null);
+ }
+ }
+ }
+ }
}
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 02/13: ISIS-1740 refactored method names, added javadoc
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit efdd48115b7f8237be2756248c2cfa532054d6c1
Author: Andi Huber
AuthorDate: Fri Oct 27 16:03:36 2017 +0200
ISIS-1740 refactored method names, added javadoc
---
.../model/models/whereami/WhereAmIModel.java | 28 ++
.../models/whereami/WhereAmIModelDefault.java | 24 +--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 4 ++--
3 files changed, 38 insertions(+), 18 deletions(-)
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
index 7ecfba0..fdc11f2 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
@@ -23,16 +23,36 @@ import java.util.stream.Stream;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
+/**
+ * Represents a navigable chain of parent nodes starting at the current node.
+ *
+ * @author a.hu...@corax.at
+ *
+ * @since 2.0.0
+ *
+ */
public interface WhereAmIModel {
- public static WhereAmIModel of(EntityModel endOfChain) {
- return new WhereAmIModelDefault(endOfChain);
+ public static WhereAmIModel of(EntityModel startOfChain) {
+ return new WhereAmIModelDefault(startOfChain);
}
+ /**
+* The navigable parent chain requires a minimum length of 2 in order
to be shown.
+* @return whether the where-am-I hint should be shown or hidden
+*/
public boolean isShowWhereAmI();
- public Stream streamParentChain();
+ /**
+* Streams the linked nodes of this model's navigable parent chain in
reverse order.
+* @return reversed order stream of linked parent nodes, which does not
include the start node
+*/
+ public Stream streamParentChainReversed();
- public EntityModel getEndOfChain();
+ /**
+*
+* @return the immutable start node of the navigable parent chain
+*/
+ public EntityModel getStartOfChain();
}
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index b3f6679..955c2db 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -28,32 +28,32 @@ import
org.apache.isis.viewer.wicket.model.models.EntityModel;
class WhereAmIModelDefault implements WhereAmIModel {
- private final List chainOfParents = new ArrayList<>();
- private final EntityModel endOfChain;
+ private final List reversedChainOfParents = new ArrayList<>();
+ private final EntityModel startOfChain;
- public WhereAmIModelDefault(EntityModel endOfChain) {
- this.endOfChain = endOfChain;
+ public WhereAmIModelDefault(EntityModel startOfChain) {
+ this.startOfChain = startOfChain;
- final Object startPojo = endOfChain.getObject().getObject();
+ final Object startPojo = startOfChain.getObject().getObject();
ParentChain.caching()
.streamReversedParentChainOf(startPojo)
- .forEach(chainOfParents::add);
+ .forEach(reversedChainOfParents::add);
}
@Override
- public EntityModel getEndOfChain() {
- return endOfChain;
+ public EntityModel getStartOfChain() {
+ return startOfChain;
}
@Override
public boolean isShowWhereAmI() {
- return !chainOfParents.isEmpty();
+ return !reversedChainOfParents.isEmpty();
}
@Override
- public Stream streamParentChain() {
- return chainOfParents.stream()
+ public Stream streamParentChainReversed() {
+ return reversedChainOfParents.stream()
.map(this::toEntityModel);
}
@@ -61,7 +61,7 @@ class WhereAmIModelDefault implements WhereAmIModel {
private EntityModel toEntityModel(Object domainObject) {
return new EntityModel(
- endOfChain.getPersistenceSession()
+ startOfChain.getPersistenceSession()
.ada
[isis] 06/13: ISIS-1817 + ISIS-1818 added missing assignment + clarify comments
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1155e89564761b6a94e2f02637f0044d9e9cabc8
Author: Andi Huber
AuthorDate: Mon Jan 15 09:08:29 2018 +0100
ISIS-1817 + ISIS-1818 added missing assignment + clarify comments
---
.../model/models/whereami/WhereAmIModelDefault.java | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index ff06907..9b335ba 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -72,7 +72,7 @@ class WhereAmIModelDefault implements WhereAmIModel {
@Override
public Stream streamParentChainReversed() {
if(!isWhereAmIEnabled)
- return Stream.empty(); // unexpected call, we could log
a warning
+ return Stream.empty(); //[ahuber] unexpected call, we
could log a warning
return reversedChainOfParents.stream()
.map(this::toEntityModel);
@@ -89,11 +89,20 @@ class WhereAmIModelDefault implements WhereAmIModel {
private void overrideFromConfigIfNew(IsisConfiguration configuration) {
//[ahuber] without evidence that this significantly improves
performance,
- // we use the smart update idiom here ...
- final int newConfigHash =
System.identityHashCode(configuration);
+ // (skipping 2 hash-table lookups) we use the smart update
idiom here ...
+ //
+ // Note: Updates are expected to occur only once per
application life-cycle,
+ // however this class might be loaded by a class-loader, that
endures multiple
+ // application life-cycles. Chances of hash-collisions are
simply neglected.
+
+ // that's the hash of the object (we don't care about the
actual config values)
+ // assuming that, we get a new (immutable) config instance each
app's life-cycle:
+ final int newConfigHash =
System.identityHashCode(configuration);
if(newConfigHash == configHash)
return;
+ configHash = newConfigHash;
+
isWhereAmIEnabled = configuration.getBoolean(
CONFIG_KEY_IS_WHERE_AM_I_FEATURE_ENABLED,
IS_WHERE_AM_I_FEATURE_ENABLED_DEFAULT);
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 13/13: Merge branch 'ISIS-1852_parallel_stream_patch'
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit fb552d3523e11c6383b93401c5a744e064411f85 Merge: 6ee4202 3e3ad2b Author: Dan Haywood AuthorDate: Wed Feb 14 15:14:05 2018 + Merge branch 'ISIS-1852_parallel_stream_patch' .../runtime/services/ServiceInstantiatorTest.java | 37 +++--- 1 file changed, 25 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 09/13: ISIS-1740 Refactoring and consolidating invocation exception handling + introducing MethodHandles to speed up reflective invocation
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2fc93a23eff85b8f5530bbf6dee0e0f7d07a19f6
Author: Andi Huber
AuthorDate: Mon Jan 15 14:06:44 2018 +0100
ISIS-1740 Refactoring and consolidating invocation exception handling
+ introducing MethodHandles to speed up reflective invocation
---
.../isis/core/commons/lang/MethodExtensions.java | 14 +--
.../core/commons/lang/ThrowableExtensions.java | 62 ---
.../isis/core/commons/reflection/Reflect.java | 44 ++--
.../isis/core/metamodel/facets/Annotations.java| 114 +++--
...ctionInvocationFacetForDomainEventAbstract.java | 54 +-
5 files changed, 196 insertions(+), 92 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
index fb95bf9..7215a47 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
@@ -19,12 +19,9 @@
package org.apache.isis.core.commons.lang;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-
public class MethodExtensions {
private MethodExtensions() {
@@ -45,14 +42,9 @@ public class MethodExtensions {
try {
Object[] defaultAnyPrimitive =
defaultAnyPrimitive(method.getParameterTypes(), arguments);
return method.invoke(object, defaultAnyPrimitive);
-} catch (final IllegalArgumentException e) {
-throw e;
-} catch (final InvocationTargetException e) {
-ThrowableExtensions.throwWithinIsisException(e, "Exception
executing " + method);
-return null;
-} catch (final IllegalAccessException e) {
-throw new MetaModelException("illegal access of " + method, e);
-}
+} catch (Exception e) {
+ return ThrowableExtensions.handleInvocationException(e,
method.getName());
+ }
}
private static Object[] defaultAnyPrimitive(Class[] parameterTypes,
Object[] arguments) {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
index 70cf875..855ba1d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
@@ -19,26 +19,64 @@
package org.apache.isis.core.commons.lang;
+import java.lang.invoke.WrongMethodTypeException;
import java.lang.reflect.InvocationTargetException;
+import java.util.function.Consumer;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
+import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
public final class ThrowableExtensions {
-public static void throwWithinIsisException(final
InvocationTargetException e, final String error) {
-final Throwable targetException = e.getTargetException();
-if (targetException instanceof RecoverableException) {
-// an application exception from the domain code is re-thrown as an
-// IsisException with same semantics
-// TODO: should probably be using ApplicationException here
-throw new IsisApplicationException(error, targetException);
+ public static Object handleInvocationException(
+ final Throwable e,
+ final String memberName) {
+ return handleInvocationException(e, memberName, null);
+ }
+
+public static Object handleInvocationException(
+ final Throwable e,
+ final String memberName,
+ final Consumer recovery) {
+
+ if(e instanceof InvocationTargetException) {
+ return
handleInvocationException(((InvocationTargetException) e).getTargetException(),
memberName, recovery);
+ }
+ if(e instanceof WrongMethodTypeException) {
+ throw new MetaModelException("Wrong method type access
of " + memberName, e);
+ }
+ if(e instanceof IllegalAccessException) {
+ throw new ReflectiveActionException("Illegal access of
" + memberName, e);
+ }
+ if(e instanceof IllegalStateException) {
+throw new ReflectiveActionException( String.format(
+"IllegalS
[isis] 12/13: Merge branch 'ISIS-1740-where-am-i'
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit 6ee4202247019250c000dc2bf6faded9c4ea2fb2 Merge: c05e5ca cc2f5d0 Author: Dan Haywood AuthorDate: Wed Feb 14 15:13:20 2018 + Merge branch 'ISIS-1740-where-am-i' .../org/apache/isis/applib/annotation/Parent.java | 34 .../isis/core/commons/lang/MethodExtensions.java | 14 +- .../core/commons/lang/ThrowableExtensions.java | 62 +-- .../isis/core/commons/reflection/Reflect.java | 202 + .../isis/core/metamodel/facets/Annotations.java| 199 +++- ...ctionInvocationFacetForDomainEventAbstract.java | 54 +++--- .../object/navparent/NavigableParentFacet.java}| 26 +++ .../navparent/NavigableParentFacetAbstract.java} | 18 ++ .../NavigableParentAnnotationFacetFactory.java | 168 + .../method/NavigableParentFacetMethod.java | 54 ++ .../method/NavigableParentFacetMethodFactory.java | 67 +++ .../core/metamodel/spec/ObjectSpecification.java | 12 ++ .../specimpl/ObjectSpecificationAbstract.java | 12 ++ .../core/metamodel/util/pchain/ParentChain.java| 84 + .../metamodel/util/pchain/ParentChainDefault.java | 49 + .../dflt/ProgrammingModelFacetsJava5.java | 4 + .../NavigableParentFacetMethodFactoryTest.java | 70 +++ .../navparent/NavigableParentFacetMethodTest.java | 83 + .../NavigableParentAnnotationFacetFactoryTest.java | 120 .../annotation/NavigableParentTestSamples.java | 49 + .../testspec/ObjectSpecificationStub.java | 5 + .../model/models/whereami/WhereAmIModel.java | 65 +++ .../models/whereami/WhereAmIModelDefault.java | 116 .../viewer/wicket/ui/pages/entity/EntityPage.css | 29 +++ .../viewer/wicket/ui/pages/entity/EntityPage.html | 7 +- .../viewer/wicket/ui/pages/entity/EntityPage.java | 53 +- 26 files changed, 1552 insertions(+), 104 deletions(-) -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.
[isis] 05/13: ISIS-1817 + ISIS-1818 allow configuration of where-am-i feature
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 08ce1a64f305287be398f610db5f734c685fda29
Author: Andi Huber
AuthorDate: Fri Jan 12 18:30:07 2018 +0100
ISIS-1817 + ISIS-1818 allow configuration of where-am-i feature
---
.../core/metamodel/util/pchain/ParentChain.java| 20 ---
.../model/models/whereami/WhereAmIModel.java | 7
.../models/whereami/WhereAmIModelDefault.java | 41 --
3 files changed, 61 insertions(+), 7 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
index 8f9471c..80a1724 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
@@ -35,6 +35,7 @@ import
org.apache.isis.core.metamodel.spec.ObjectSpecification;
* startNode --@Parent--> node2 --@Parent--> node3 ...
*
* @author ahu...@apache.org
+ * @since 2.0.0
*
*/
public interface ParentChain {
@@ -51,23 +52,32 @@ public interface ParentChain {
public Object parentOf(Object node);
/**
-* Returns a Stream of nodes that are chained together by parent
references.
-* The startNode is excluded from the Stream.
+* Returns a Stream of nodes that are chained together by parent
references.
+* The {@code startNode} is excluded from the Stream.
+* The chain stops either because there is no more resolvable
parent,
+* or we reached the {@code maxChainLength},
+* or we reached a node that is already part of the chain.
+*
* @param startNode
+* @param maxChainLength maximum length of the chain returned
* @return
*/
- public default Stream streamParentChainOf(Object startNode){
+ public default Stream streamParentChainOf(Object startNode, int
maxChainLength){
final Set chain = new LinkedHashSet<>();
Object next = startNode;
+ chain.add(startNode); // for infinite loop detection
+
while((next = parentOf(next))!=null) {
- final boolean doContinue = chain.add(next);
+ final boolean doContinue = chain.add(next); // stops if
the we get to a node we already traversed before
if(!doContinue)
break;
+ if(chain.size()>=maxChainLength)
+ break;
}
- return chain.stream();
+ return chain.stream().skip(1);
}
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
index 7d4a8ce..9de0c22 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModel.java
@@ -33,6 +33,13 @@ import
org.apache.isis.viewer.wicket.model.models.EntityModel;
*/
public interface WhereAmIModel {
+ public final static String CONFIG_KEY_IS_WHERE_AM_I_FEATURE_ENABLED =
"isis.viewer.whereAmI.enabled";
+ public final static String CONFIG_KEY_MAX_NAVIGABLE_PARENT_CHAIN_LENGTH
= "isis.viewer.whereAmI.maxParentChainLength";
+
+ public final static boolean IS_WHERE_AM_I_FEATURE_ENABLED_DEFAULT =
true;
+ public final static int MAX_NAVIGABLE_PARENT_CHAIN_LENGTH_DEFAULT = 64;
+
+
public static WhereAmIModel of(EntityModel startOfChain) {
return new WhereAmIModelDefault(startOfChain);
}
diff --git
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index 042595f..ff06907 100644
---
a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++
b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -22,27 +22,40 @@ package org.apache.isis.viewer.wicket.model.models.whereami;
import java.util.LinkedList;
import java.util.stream.Stream;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamo
[isis] 11/13: ISIS-1740: fixes merge issues (NullSafe moved to applib and renamed)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cc2f5d0736d1db38b189397dbb35a1f14e964712
Author: Dan Haywood
AuthorDate: Wed Feb 14 15:12:56 2018 +
ISIS-1740: fixes merge issues (NullSafe moved to applib and renamed)
---
.../navparent/annotation/NavigableParentAnnotationFacetFactory.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index 585228a..3ebb7b8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.applib.annotation.Parent;
+import org.apache.isis.applib.internal.base._NullSafe;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.NullSafe;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -66,7 +66,7 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
final List> evaluators =
Annotations.firstEvaluatorsInHierarchyHaving(cls,
Parent.class);
-if (NullSafe.isEmpty(evaluators)) {
+if (_NullSafe.isEmpty(evaluators)) {
return; // no parent resolvable
} else if (evaluators.size()>1) {
// code should not be reached, since case should be handled by
meta-data validation
@@ -114,7 +114,7 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
final List> evaluators =
Annotations.firstEvaluatorsInHierarchyHaving(cls, Parent.class);
-if (NullSafe.isEmpty(evaluators)) {
+if (_NullSafe.isEmpty(evaluators)) {
return true; // no conflict, continue validation
processing
} else if (evaluators.size()>1) {
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 10/13: ISIS-1816 Refactoring names + simplify
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 412606959ec63729a5d6451a519d86a3ad2708c7
Author: Andi Huber
AuthorDate: Mon Jan 15 14:08:35 2018 +0100
ISIS-1816 Refactoring names + simplify
---
.../NavigableParentAnnotationFacetFactory.java | 46 +++---
.../method/NavigableParentFacetMethod.java | 18 +
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index 7921bda..585228a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -19,15 +19,12 @@
package org.apache.isis.core.metamodel.facets.object.navparent.annotation;
-import java.beans.IntrospectionException;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
import org.apache.isis.applib.annotation.Parent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.NullSafe;
-import org.apache.isis.core.commons.reflection.Reflect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -67,7 +64,7 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
// resolve the current domain-object's navigable parent.
final List> evaluators =
- Annotations.findFirstInHierarchyHaving(cls,
Parent.class);
+ Annotations.firstEvaluatorsInHierarchyHaving(cls,
Parent.class);
if (NullSafe.isEmpty(evaluators)) {
return; // no parent resolvable
@@ -85,13 +82,11 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
// we have a @Parent annotated method
method = ((Annotations.MethodEvaluator)
parentEvaluator).getMethod();
} else if(parentEvaluator instanceof Annotations.FieldEvaluator) {
- // we have a @Parent annotated field (occurs if one uses
lombok's @Getter on a field)
- final Field field = ((Annotations.FieldEvaluator)
parentEvaluator).getField();
- try {
- method = Reflect.getGetter(cls,
field.getName());
- } catch (IntrospectionException e) {
- return; // no parent resolvable
- }
+ // we have a @Parent annotated field (useful if one uses
lombok's @Getter on a field)
+ method = ((Annotations.FieldEvaluator)
parentEvaluator).getGetter(cls).orElse(null);
+ if(method==null)
+ return; // code should not be reached, since case
should be handled by meta-data validation
+
} else {
return; // no parent resolvable
}
@@ -117,10 +112,10 @@ public class NavigableParentAnnotationFacetFactory
extends FacetFactoryAbstract
final Class cls = objectSpec.getCorrespondingClass();
final List> evaluators =
- Annotations.findFirstInHierarchyHaving(cls,
Parent.class);
+
Annotations.firstEvaluatorsInHierarchyHaving(cls, Parent.class);
if (NullSafe.isEmpty(evaluators)) {
- return true; // no conflict
+ return true; // no conflict, continue validation
processing
} else if (evaluators.size()>1) {
validationFailures.add(
@@ -128,9 +123,32 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
+ "contains multiple annotations '@%s', while at
most one is allowed.",
objectSpec.getIdentifier().getClassName(),
Parent.class.getName());
+
+ return true; // continue validation processing
+}
+
+final Annotations.Evaluator parentEvaluator =
evaluators.get(0);
+
+if(parentEvaluator instanceof Annotations.FieldEvaluator) {
+ // we have a @Parent annotated field (useful if one
uses lombok's @Getter on a fie
[isis] 07/13: ISIS-1816 refactoring Annotations + implement hierarchy search
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0645ecde12e94d416bf858387eeca960cb0bc60a
Author: Andi Huber
AuthorDate: Mon Jan 15 11:15:35 2018 +0100
ISIS-1816 refactoring Annotations + implement hierarchy search
---
.../isis/core/metamodel/facets/Annotations.java| 103 -
1 file changed, 80 insertions(+), 23 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
index 5a4a45e..3d24c77 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
@@ -26,13 +26,13 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
import javax.validation.constraints.Pattern;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.google.common.collect.Lists;
-
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -43,6 +43,8 @@ import org.apache.isis.core.commons.lang.ThrowableExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import com.google.common.collect.Lists;
+
public final class Annotations {
private Annotations() {}
@@ -352,48 +354,103 @@ public final class Annotations {
/**
* Searches for all no-arg methods or fields with a specified title,
returning an
- * {@link Evaluator} object that wraps either. Will search up hierarchy
also.
+ * {@link Evaluator} object that wraps either. Will search up hierarchy
also,
+ * including implemented interfaces.
*/
public static List> getEvaluators(
final Class cls,
final Class annotationClass) {
-List> evaluators = Lists.newArrayList();
-appendEvaluators(cls, annotationClass, evaluators);
+final List> evaluators = Lists.newArrayList();
+visitEvaluators(cls, annotationClass, evaluators::add);
+
+// search implemented interfaces
+final Class[] interfaces = cls.getInterfaces();
+for (final Class iface : interfaces) {
+ visitEvaluators(iface, annotationClass, evaluators::add);
+}
+
return evaluators;
}
+
+/**
+ * Starting from the current class {@code cls}, we search down the
inheritance
+ * hierarchy (super class, super super class, ...), until we find
+ * the first class that has at least a field or no-arg method with {@code
annotationClass} annotation.
+ *
+ * In this hierarchy traversal, implemented interfaces are not processed.
+ * @param cls
+ * @param annotationClass
+ * @return list of {@link Evaluator} that wraps each annotated member
found on the class where
+ * the search stopped, null otherwise
+ *
+ * @since 2.0.0
+ */
+public static List>
findFirstInHierarchyHaving(
+final Class cls,
+final Class annotationClass) {
+
+final List> evaluators = Lists.newArrayList();
+visitEvaluatorsWhile(cls, annotationClass, __->evaluators.isEmpty(),
evaluators::add);
+
+ return evaluators;
+}
-private static void appendEvaluators(
+private static void visitEvaluators(
+ final Class cls,
+final Class annotationClass,
+final Consumer> visitor) {
+ visitEvaluatorsWhile(cls, annotationClass, __->true, visitor);
+}
+
+private static void visitEvaluatorsWhile(
final Class cls,
final Class annotationClass,
-final List> evaluators) {
+Predicate> filter,
+final Consumer> visitor) {
+
+ if(!filter.test(cls))
+ return; // stop visitation
+
+ collectMethodEvaluators(cls, annotationClass, visitor);
+ collectFieldEvaluators(cls, annotationClass, visitor);
+
+// search super-classes
+final Class superclass = cls.getSuperclass();
+if (superclass != null) {
+ visitEvaluatorsWhile(superclass, annotationClass, filter,
visitor);
+}
-for (Method method : cls.getDeclaredMethods()) {
+}
+
+@SuppressWarnings({ "rawtypes", "unchecked" })
+ private static void collectMethodEvaluators(
+final Class cls,
+final Class annotationClass,
+final Consumer> action
[isis] 03/13: ISIS-1740 new Facet: NavigableParentFacet + major rework to integrate with Isis' meta-model
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 266a4e9964e5483b53456895641f49c1a580fcab
Author: Andi Huber
AuthorDate: Fri Jan 12 16:11:31 2018 +0100
ISIS-1740 new Facet: NavigableParentFacet + major rework to integrate
with Isis' meta-model
---
.../services/navparent/NavigableParentService.java | 20 +++
.../isis/core/commons/reflection/Reflect.java | 174 +
.../isis/core/metamodel/facets/Annotations.java| 2 +-
.../object/navparent/NavigableParentFacet.java | 44 ++
.../navparent/NavigableParentFacetAbstract.java| 36 +
.../NavigableParentAnnotationFacetFactory.java | 163 +++
.../method/NavigableParentFacetMethod.java | 68
.../method/NavigableParentFacetMethodFactory.java | 64
.../core/metamodel/spec/ObjectSpecification.java | 12 ++
.../specimpl/ObjectSpecificationAbstract.java | 12 ++
.../core/metamodel/util/pchain/ParentChain.java| 63 +++-
...ingParentChain.java => ParentChainDefault.java} | 43 ++---
.../metamodel/util/pchain/SimpleParentChain.java | 75 -
.../isis/core/metamodel/util/pchain/SoftCache.java | 124 ---
.../dflt/ProgrammingModelFacetsJava5.java | 4 +
.../NavigableParentFacetMethodFactoryTest.java | 70 +
.../navparent/NavigableParentFacetMethodTest.java | 83 ++
.../NavigableParentAnnotationFacetFactoryTest.java | 120 ++
.../annotation/NavigableParentTestSamples.java | 49 ++
.../testspec/ObjectSpecificationStub.java | 5 +
.../model/models/whereami/WhereAmIModel.java | 2 +-
.../models/whereami/WhereAmIModelDefault.java | 18 ++-
22 files changed, 968 insertions(+), 283 deletions(-)
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
b/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
new file mode 100644
index 000..129122a
--- /dev/null
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
@@ -0,0 +1,20 @@
+package org.apache.isis.applib.services.navparent;
+
+import org.apache.isis.applib.annotation.Programmatic;
+
+/**
+ *
+ * @author ahu...@apache.org
+ * @since 2.0.0
+ */
+public interface NavigableParentService {
+
+/**
+ * Return the navigable parent (a domain-object or a domain-view-model) of
the object,
+ * used to build a navigable parent chain as required by the 'where-am-I'
feature.
+ *
+ */
+@Programmatic
+public Object navigableParentOf(Object domainObject);
+
+}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/commons/reflection/Reflect.java
b/core/metamodel/src/main/java/org/apache/isis/core/commons/reflection/Reflect.java
new file mode 100644
index 000..59bc1c8
--- /dev/null
+++
b/core/metamodel/src/main/java/org/apache/isis/core/commons/reflection/Reflect.java
@@ -0,0 +1,174 @@
+/*
+ * 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.reflection;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+/**
+ *
+ * Provides shortcuts for common java.lang.reflect idioms.
+ *
+ * @author ahu...@apache.org
+ * @since 2.0.0
+ *
+ */
+public class Reflect {
+
+ public static Object[] emptyObjects = {};
+ public static Class[] emptyClasses = {};
+
+ // -- CLASS REFLECTION
+
+ /**
+* Returns declared methods of this class/interface and all super
classes/interfaces.
+* @param type
+* @return
+*/
+ public stati
[isis] 04/13: ISIS-1740 NavigableParentService never used, so removed
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6fc4c5b70019f223e6020feb4c5d8e50cd9ae380
Author: Andi Huber
AuthorDate: Fri Jan 12 16:42:03 2018 +0100
ISIS-1740 NavigableParentService never used, so removed
---
.../services/navparent/NavigableParentService.java | 20
1 file changed, 20 deletions(-)
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
b/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
deleted file mode 100644
index 129122a..000
---
a/core/applib/src/main/java/org/apache/isis/applib/services/navparent/NavigableParentService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.apache.isis.applib.services.navparent;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-/**
- *
- * @author ahu...@apache.org
- * @since 2.0.0
- */
-public interface NavigableParentService {
-
-/**
- * Return the navigable parent (a domain-object or a domain-view-model) of
the object,
- * used to build a navigable parent chain as required by the 'where-am-I'
feature.
- *
- */
-@Programmatic
-public Object navigableParentOf(Object domainObject);
-
-}
--
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.
[isis] 08/13: ISIS-1816 impl. navigable parent resolving behavior according to spec
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f338b8b0a907f3581041644abe2f093542b09c88
Author: Andi Huber
AuthorDate: Mon Jan 15 11:16:31 2018 +0100
ISIS-1816 impl. navigable parent resolving behavior according to spec
---
.../NavigableParentAnnotationFacetFactory.java | 77 +-
.../method/NavigableParentFacetMethodFactory.java | 3 +
.../dflt/ProgrammingModelFacetsJava5.java | 2 +-
3 files changed, 36 insertions(+), 46 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index f3b2102..7921bda 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Parent;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.lang.NullSafe;
import org.apache.isis.core.commons.reflection.Reflect;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -33,9 +34,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import
org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
-import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import
org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -44,6 +43,8 @@ import
org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVis
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
/**
+ * For detailed behavioral specification see
+ * https://issues.apache.org/jira/browse/ISIS-1816";>ISIS-1816.
*
* @author ahu...@apache.org
* @since 2.0.0
@@ -51,9 +52,6 @@ import
org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
*/
public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract implements MetaModelValidatorRefiner {
-private static final String NAVIGABLE_PARENT_METHOD_NAME = "parent";
-
-
public NavigableParentAnnotationFacetFactory() {
super(FeatureType.OBJECTS_ONLY);
}
@@ -63,10 +61,18 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
final Class cls = processClassContext.getCls();
final FacetHolder facetHolder = processClassContext.getFacetHolder();
-final List> evaluators =
Annotations.getEvaluators(cls, Parent.class);
-if (evaluators.isEmpty()) {
-return;
+// Starting from the current domain-object class, we search down the
object
+// inheritance hierarchy (super class, super super class, ...), until
we find
+// the first class that has a @Parent annotation. That's the one we
use to
+// resolve the current domain-object's navigable parent.
+
+final List> evaluators =
+ Annotations.findFirstInHierarchyHaving(cls,
Parent.class);
+
+if (NullSafe.isEmpty(evaluators)) {
+return; // no parent resolvable
} else if (evaluators.size()>1) {
+ // code should not be reached, since case should be handled by
meta-data validation
throw new RuntimeException("unable to determine navigable
parent due to ambiguity");
}
@@ -84,10 +90,10 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
try {
method = Reflect.getGetter(cls,
field.getName());
} catch (IntrospectionException e) {
- return;
+ return; // no parent resolvable
}
} else {
- return;
+ return; // no parent resolvable
}
try {
@@ -99,59 +105,40 @@ public class NavigableParentAnnotationFacetFactory extends
FacetFactoryAbstract
/**
- * Violation if there is a class that has b
[isis] 01/13: ISIS-1740 initial commit of prototype
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e92b4db2846cce03959b7bf7e7f5c31c705e1476
Author: Andi Huber
AuthorDate: Fri Oct 27 15:34:55 2017 +0200
ISIS-1740 initial commit of prototype
---
.../org/apache/isis/applib/annotation/Parent.java | 34 ++
.../metamodel/util/pchain/CachingParentChain.java | 66 +++
.../core/metamodel/util/pchain/ParentChain.java| 99
.../metamodel/util/pchain/SimpleParentChain.java | 75 +
.../isis/core/metamodel/util/pchain/SoftCache.java | 124 +
.../model/models/whereami/WhereAmIModel.java | 38 +++
.../models/whereami/WhereAmIModelDefault.java | 68 +++
.../viewer/wicket/ui/pages/entity/EntityPage.css | 29 +
.../viewer/wicket/ui/pages/entity/EntityPage.html | 7 +-
.../viewer/wicket/ui/pages/entity/EntityPage.java | 53 -
10 files changed, 587 insertions(+), 6 deletions(-)
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Parent.java
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Parent.java
new file mode 100644
index 000..6e4a7d8
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Parent.java
@@ -0,0 +1,34 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Tells the framework which method or field to use in order to construct a
navigable chain of
+ * parent domain object instances. This annotation can only be used once per
class declaration.
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface Parent {
+}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/CachingParentChain.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/CachingParentChain.java
new file mode 100644
index 000..630e928
--- /dev/null
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/CachingParentChain.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.metamodel.util.pchain;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+
+class CachingParentChain extends SimpleParentChain {
+
+ private final SoftCache, MethodHandle> cache = new
SoftCache<>();
+
+ @Override
+ public Object parentOf(Object node) {
+ if(node==null)
+ return null;
+
+ final MethodHandle mh = cache.computeIfAbsent(node.getClass(),
+ key->{
+ try {
+ return methodHandleOf(node);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ return null;
+ }
+ });
+
+ if(m
[isis] branch master updated (c05e5ca -> fb552d3)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from c05e5ca Merge branch 'ISIS-1852_parallel_stream_patch'
new e92b4db ISIS-1740 initial commit of prototype
new efdd481 ISIS-1740 refactored method names, added javadoc
new 266a4e9 ISIS-1740 new Facet: NavigableParentFacet + major rework to
integrate with Isis' meta-model
new 6fc4c5b ISIS-1740 NavigableParentService never used, so removed
new 08ce1a6 ISIS-1817 + ISIS-1818 allow configuration of where-am-i
feature
new 1155e89 ISIS-1817 + ISIS-1818 added missing assignment + clarify
comments
new 0645ecd ISIS-1816 refactoring Annotations + implement hierarchy search
new f338b8b ISIS-1816 impl. navigable parent resolving behavior according
to spec
new 2fc93a2 ISIS-1740 Refactoring and consolidating invocation exception
handling + introducing MethodHandles to speed up reflective invocation
new 4126069 ISIS-1816 Refactoring names + simplify
new cc2f5d0 ISIS-1740: fixes merge issues (NullSafe moved to applib and
renamed)
new 6ee4202 Merge branch 'ISIS-1740-where-am-i'
add 3e3ad2b ISIS-1852: reworks unit test, again
new fb552d3 Merge branch 'ISIS-1852_parallel_stream_patch'
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/isis/applib/annotation/Parent.java | 34
.../isis/core/commons/lang/MethodExtensions.java | 14 +-
.../core/commons/lang/ThrowableExtensions.java | 62 +--
.../isis/core/commons/reflection/Reflect.java | 202 +
.../isis/core/metamodel/facets/Annotations.java| 199 +++-
...ctionInvocationFacetForDomainEventAbstract.java | 54 +++---
.../navparent/NavigableParentFacet.java} | 25 ++-
.../navparent/NavigableParentFacetAbstract.java} | 8 +-
.../NavigableParentAnnotationFacetFactory.java | 168 +
.../method/NavigableParentFacetMethod.java}| 44 +++--
.../method/NavigableParentFacetMethodFactory.java} | 28 ++-
.../core/metamodel/spec/ObjectSpecification.java | 12 ++
.../specimpl/ObjectSpecificationAbstract.java | 12 ++
.../core/metamodel/util/pchain/ParentChain.java| 84 +
.../metamodel/util/pchain/ParentChainDefault.java | 49 +
.../dflt/ProgrammingModelFacetsJava5.java | 4 +
.../NavigableParentFacetMethodFactoryTest.java}| 37 ++--
.../NavigableParentFacetMethodTest.java} | 39 ++--
.../NavigableParentAnnotationFacetFactoryTest.java | 120
.../annotation/NavigableParentTestSamples.java | 49 +
.../testspec/ObjectSpecificationStub.java | 5 +
.../runtime/services/ServiceInstantiatorTest.java | 37 ++--
.../model/models/whereami/WhereAmIModel.java | 65 +++
.../models/whereami/WhereAmIModelDefault.java | 116
.../viewer/wicket/ui/pages/entity/EntityPage.css | 29 +++
.../viewer/wicket/ui/pages/entity/EntityPage.html | 7 +-
.../viewer/wicket/ui/pages/entity/EntityPage.java | 53 +-
27 files changed, 1365 insertions(+), 191 deletions(-)
create mode 100644
core/applib/src/main/java/org/apache/isis/applib/annotation/Parent.java
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/commons/reflection/Reflect.java
copy
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{actions/defaults/ActionDefaultsFacet.java
=> object/navparent/NavigableParentFacet.java} (60%)
copy
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/{collections/modify/CollectionAddToFacetAbstract.java
=> object/navparent/NavigableParentFacetAbstract.java} (80%)
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
copy
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/{domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java
=> navparent/method/NavigableParentFacetMethod.java} (54%)
copy
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/{icon/method/IconFacetMethodFactory.java
=> navparent/method/NavigableParentFacetMethodFactory.java} (65%)
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChain.java
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/pchain/ParentChainDefault.java
copy
core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/{ident/icon/IconFacetMethodFactoryTest.java
=> navparent/NavigableParentFacetMethodFactoryTest.java} (67%)
copy
core/metamodel/src/test/java
[isis] 01/01: ISIS-1779 Transition to JAX-RS 2.0 Client API removed dependency on deprecated resteasy client api
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-1779-jax-rs-2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 72f34526c4880bca27376178b22c9aed4939ca54
Author: Andi Huber
AuthorDate: Sun Nov 19 15:20:44 2017 +0100
ISIS-1779 Transition to JAX-RS 2.0 Client API
removed dependency on deprecated resteasy client api
---
core/applib/pom.xml| 9 +-
core/pom.xml | 18 ++-
.../core/runtime/system/context/IsisContext.java | 13 ++-
.../persistence/PersistenceSessionFactory.java | 40 +++
.../apache/isis/viewer/legacy/ClientExecutor.java | 123 +
.../ClientRequest.java}| 36 +++---
.../ClientRequestFactory.java} | 45
.../apache/isis/viewer/legacy/RestEasyLegacy.java | 89 +++
.../restfulobjects/applib/LinkRepresentation.java | 3 +-
.../restfulobjects/applib/RestfulHttpMethod.java | 2 +-
.../applib/client/ClientRequestConfigurer.java | 15 +--
.../applib/client/RestfulClient.java | 32 ++
.../applib/client/RestfulRequest.java | 10 +-
.../applib/client/RestfulResponse.java | 2 +
.../applib/domainobjects/DomainObjectResource.java | 30 +++--
.../domainobjects/DomainServiceResource.java | 14 +--
.../applib/domaintypes/DomainTypeResource.java | 19 ++--
.../applib/homepage/HomePageResource.java | 12 +-
.../restfulobjects/applib/user/UserResource.java | 6 +-
.../restfulobjects/applib/util/JsonMapper.java | 6 +-
.../applib/version/VersionResource.java| 3 +-
.../viewer/restfulobjects/rendering/Responses.java | 22 +++-
.../conneg/IsisPrettyPrintingProcessor.java| 2 +-
.../PreProcessInterceptorForIsisSession.java | 12 +-
24 files changed, 403 insertions(+), 160 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 7bf2b9b..c33e221 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -74,10 +74,17 @@
org.apache.geronimo.specs
geronimo-jcdi_1.0_spec
+
+
+
+ org.jboss.resteasy
+ jaxrs-api
+
+
org.axonframework
diff --git a/core/pom.xml b/core/pom.xml
index c5cdc8d..ebd504f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -134,7 +134,12 @@
2.3.4
0.2.7
-3.0.24.Final
+
+
+
+
+
+4.0.0.Beta1
9.4.3.v20170317
@@ -180,7 +185,11 @@
1.4.7
+
+3.0.12.Final
+
@@ -1947,11 +1956,18 @@ ${license.additional-notes}
${geronimo-jcdi_1.0_spec.version}
+
+
+ org.jboss.resteasy
+ jaxrs-api
+ ${jboss-jaxrs-api.version}
+
diff --git
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 059914b..17ebab6 100644
---
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -19,14 +19,15 @@
package org.apache.isis.core.runtime.system.context;
+import org.apache.log4j.BasicConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.core.commons.exceptions.IsisException;
import
org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
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.session.IsisSessionFactoryBuilder;
-import org.apache.log4j.BasicConfigurator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Simply a static field holding the {@link IsisSessionFactory} singleton, and
convenience methods to obtain the
@@ -87,10 +88,10 @@ public final class IsisContext {
}
/**
-* life-cycle exit point
+* Marks the end of this IsisContext's life-cycle.
*
* Destroys this context and clears any state associated with it.
-* It marks the end of IsisContext's life-cycle. Subsequent calls have
no effect.
+* Subsequent calls have no effect.
*
*/
public static void destroy() {
@@ -127,7 +128,7 @@ public final class IsisContext {
/**
* TODO [andi-huber] not sure if required, initial idea was to force
log4j
-* re-configuration on a un
[isis] branch ISIS-1779-jax-rs-2 updated (fd8670e -> 72f3452)
This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a change to branch ISIS-1779-jax-rs-2 in repository https://gitbox.apache.org/repos/asf/isis.git. discard fd8670e ISIS-1779 Transition to JAX-RS 2.0 Client API removed dependency on deprecated resteasy client api discard b7497fe Merge branch 'ISIS-1744-update-to-dn-515' into dev/2.0.0-M2 discard ad6426f ISIS-1744: removes work-around code for prior to DN 5.1.5 discard d8709d1 ISIS-1744: updates to DN 5.1.5 discard efff23e ISIS-1767: fixes dependency convergence issue with com.sun.mail discard 8cce64e Merge branch 'ISIS-1767-jee-7' into dev/2.0.0-M2 discard 32df2f1 ISIS-1756 remove reflective access to DN's EnhancementHelper since we've got a dedicated method instead discard 549bb71 ISIS-1756 on shutdown purge any state associated with the current web-app classloader discard 237ef69 ISIS-1755 veto ExceptionRecognizer on CDI scan discard 5ea0f0c ISIS-1754 proper DN class-loading discard 80a977f ISIS-1775 added license discard 2bbcfbd ISIS-1775 Honor web-app's context path when configuring swagger. discard 01f32e4 ISIS-1755 TomEE requires Service Providers to be public classes discard 2914ee2 ISIS-1754 context aware class-loading for Isis discard de01fbd ISIS-1756 utilize IsisWicketApplication's life-cycle instead of providing a life-cycle CDI Bean discard 9661bc4 ISIS-1756 prevent SQLException on schema creation if config is missing discard 4285449 ISIS-1756 - fix typo discard 150f7c1 ISIS-1755 JEE 7+ allow coexistence of CDI and Isis' ServiceInjector discard 21f780f ISIS-1756 JEE 7+ Isis App life-cycling discard 8674bdb ISIS-1767 JEE 7+ added dependency on javaee-api to core/runtime discard 0a15e71 Merge branch 'dev/2.0.0/ISIS-1276-dn-5-1' into dev/2.0.0-M2 discard fbd8ee1 ISIS-1728: uses typesafe queries for helloworld discard 13c70c2 ISIS-1726: generalizes the logic that searches for @PersistenceCapable entities, to also take into account meta-annotations. discard 380398c ISIS-1727: uses lambda in IsisSessionFactoryBuilder discard 9fafe95 ISIS-1725: requires that an AppManifest is supplied (used to obtain list of entities). discard 223957e ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib discard c6be1eb ISIS-1723: removes jdo applib's Auditable interface and @Auditable annotation discard ed5f61f ISIS-1276: fixes algorithm for lookup of datastore id's, at least discard 14179e1 ISIS-1276: fixes compile issues in metamodel and runtime discard b1ff901 ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery discard a0da312 ISIS-1276: updates core to compile under JDK 1.8 only discard 126c8e8 ISIS-1276: updates references for datanucleus. add 6214c42 ISIS-1465: adds/refines scripts for cleaning up git tags add 46b98af fixes verification instructions for running simpleapp add 7512f2a [maven-release-plugin] prepare release isis-1.16.0 add e14326b [maven-release-plugin] prepare for next development iteration add 806c110 ISIS-1465: updates simpleapp to use 1.16.0 add 63c3152 ISIS-1465: recreating simpleapp archetype add 68a849f [maven-release-plugin] prepare release simpleapp-archetype-1.16.0 add c889c0f [maven-release-plugin] prepare for next development iteration add 0cca70d ISIS-1465: updates helloworld app to use 1.16.0 add 2a0b21f ISIS-1465: recreating helloworld archetype add 67546fa [maven-release-plugin] prepare release helloworld-archetype-1.16.0 add 8032c28 [maven-release-plugin] prepare for next development iteration add 2e2ac1f ISIS-1465: fixes property in hellworld app. add dac3f43 ISIS-1465: minor fix for release script add ce18748 Merge branch 'release-1.16.0-RC1' add 22589dc ISIS-1465: updates to website/docs add 64e4609 ISIS-1465: further updates to website publish process add 5ffc8fc ISIS-1465: further tweak to docs add 66e719e ISIS-1465: improves the publish script add 186e5b9 Merge branch 'dev/2.0.0-M1' add 1a43c29 ISIS-1276: updates references for datanucleus. add 89e40d5 ISIS-1276: updates core to compile under JDK 1.8 only add 9fde3bd ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery add 7ef159c ISIS-1276: fixes compile issues in metamodel and runtime add 51feff4 ISIS-1276: fixes algorithm for lookup of datastore id's, at least add fe5a844 ISIS-1723: removes jdo applib's Auditable interface and @Auditable annotation add 6de02b1 ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib add ed89008 ISIS-1725: requires that an AppManifest is supplied (used to obtain list of entities). add ae46188 ISIS-1727: uses lambda in IsisSessionFactoryBuilder add d92e8e6 ISIS-1726: generalizes the logic that searches for @PersistenceCapable entities,
