You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/07 08:05:08 UTC

[isis] branch v2 updated (59acb36 -> 161a97d)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 59acb36  ISIS-2165: updates lockdown for helloworld & simpleapp
     new 6aacf26  ISIS-2165: updates to lockdown for helloworld
     new 161a97d  ISIS-2173: uses a SpringApplicationRunListener to let us see whats silently failing

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:
 .../boot/LoggingSpringApplicationRunListener.java  | 55 ++++++++++++++++++++++
 .../src/main/resources/META-INF/spring.factories   |  1 +
 .../LockDownMavenDeps_Test.list.approved.txt       | 15 +++---
 .../LockDownMavenDeps_Test.tree.approved.txt       | 31 ++++++------
 4 files changed, 82 insertions(+), 20 deletions(-)
 create mode 100644 core/runtime/src/main/java/org/apache/isis/runtime/boot/LoggingSpringApplicationRunListener.java
 create mode 100644 core/runtime/src/main/resources/META-INF/spring.factories


[isis] 01/02: ISIS-2165: updates to lockdown for helloworld

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 6aacf2608fd729de27dc3a7404ee8acfdcd62210
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 7 08:04:11 2019 +0000

    ISIS-2165: updates to lockdown for helloworld
---
 .../LockDownMavenDeps_Test.list.approved.txt       | 15 ++++++-----
 .../LockDownMavenDeps_Test.tree.approved.txt       | 31 ++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt b/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
index 42f862b..044586b 100644
--- a/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
+++ b/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.list.approved.txt
@@ -4,13 +4,13 @@
    cglib:cglib:jar:3.2.8:test
    com.approvaltests:approvaltests-util:jar:2.0.0:test
    com.approvaltests:approvaltests:jar:2.0.0:test
-   com.fasterxml.jackson.core:jackson-annotations:jar:2.9.8:compile
-   com.fasterxml.jackson.core:jackson-core:jar:2.9.8:compile
-   com.fasterxml.jackson.core:jackson-databind:jar:2.9.8:compile
+   com.fasterxml.jackson.core:jackson-annotations:jar:2.10.0:compile
+   com.fasterxml.jackson.core:jackson-core:jar:2.10.0:compile
+   com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
    com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.9.5:compile
    com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.10.0:compile
    com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
-   com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.9.8:compile
+   com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.10.0:compile
    com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.10.0:compile
    com.fasterxml:classmate:jar:1.3.4:compile
    com.github.openjson:openjson:jar:1.0.10:compile
@@ -40,10 +40,10 @@
    io.swagger:swagger-annotations:jar:1.5.21:compile
    io.swagger:swagger-core:jar:1.5.21:compile
    io.swagger:swagger-models:jar:1.5.21:compile
-   jakarta.activation:jakarta.activation-api:jar:1.2.1:test
+   jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
    jakarta.annotation:jakarta.annotation-api:jar:1.3.5:compile
    jakarta.validation:jakarta.validation-api:jar:2.0.1:compile
-   jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2:test
+   jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2:compile
    javax.activation:activation:jar:1.1:compile
    javax.inject:javax.inject:jar:1:compile
    javax.json.bind:javax.json.bind-api:jar:1.0:compile
@@ -167,6 +167,8 @@
    org.skyscreamer:jsonassert:jar:1.5.0:test
    org.slf4j:jul-to-slf4j:jar:1.7.28:compile
    org.slf4j:slf4j-api:jar:1.7.26:compile
+   org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.0.RELEASE:compile
+   org.springframework.boot:spring-boot-actuator:jar:2.2.0.RELEASE:compile
    org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
    org.springframework.boot:spring-boot-starter-json:jar:2.2.0.RELEASE:compile
    org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.0.RELEASE:compile
@@ -183,6 +185,7 @@
    org.springframework:spring-context:jar:5.2.0.RELEASE:compile
    org.springframework:spring-core:jar:5.2.0.RELEASE:compile
    org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
+   org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
    org.springframework:spring-test:jar:5.2.0.RELEASE:test
    org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
    org.springframework:spring-web:jar:5.2.0.RELEASE:compile
diff --git a/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt b/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
index 0c3e0ff..6d64a3f 100644
--- a/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
+++ b/examples/apps/helloworld/src/test/java/domainapp/dom/impl/lockdown/LockDownMavenDeps_Test.tree.approved.txt
@@ -2,14 +2,10 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 +- org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:2.0.0-M3-SNAPSHOT:compile
 |  +- org.springframework.boot:spring-boot-starter-web:jar:2.2.0.RELEASE:compile
 |  |  +- org.springframework.boot:spring-boot-starter:jar:2.2.0.RELEASE:compile
-|  |  |  +- org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
-|  |  |  +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
 |  |  |  +- jakarta.annotation:jakarta.annotation-api:jar:1.3.5:compile
-|  |  |  +- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
 |  |  |  \- org.yaml:snakeyaml:jar:1.25:runtime
 |  |  +- org.springframework.boot:spring-boot-starter-json:jar:2.2.0.RELEASE:compile
 |  |  |  +- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.10.0:compile
-|  |  |  +- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
 |  |  |  \- com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.10.0:compile
 |  |  +- org.springframework.boot:spring-boot-starter-tomcat:jar:2.2.0.RELEASE:compile
 |  |  |  +- org.apache.tomcat.embed:tomcat-embed-core:jar:9.0.27:compile
@@ -21,10 +17,7 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 |  |  |     +- org.jboss.logging:jboss-logging:jar:3.3.2.Final:compile
 |  |  |     \- com.fasterxml:classmate:jar:1.3.4:compile
 |  |  +- org.springframework:spring-web:jar:5.2.0.RELEASE:compile
-|  |  |  \- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
 |  |  \- org.springframework:spring-webmvc:jar:5.2.0.RELEASE:compile
-|  |     +- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
-|  |     \- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
 |  +- org.apache.isis.core:isis-applib:jar:2.0.0-M3-SNAPSHOT:compile
 |  |  \- org.apache.isis.core:isis-schema:jar:2.0.0-M3-SNAPSHOT:compile
 |  |     \- joda-time:joda-time:jar:2.9.4:compile
@@ -88,7 +81,6 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 |     |     \- javax.activation:activation:jar:1.1:compile
 |     +- com.google.code.findbugs:annotations:jar:2.0.1:compile
 |     +- org.projectlombok:lombok:jar:1.18.10:provided (version selected from constraint [1.18,))
-|     +- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
 |     +- org.springframework:spring-tx:jar:5.2.0.RELEASE:compile
 |     +- org.springframework.boot:spring-boot-starter-log4j2:jar:2.2.0.RELEASE:compile
 |     |  +- org.apache.logging.log4j:log4j-slf4j-impl:jar:2.12.1:compile
@@ -137,10 +129,12 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 |  |  +- net.jcip:jcip-annotations:jar:1.0:compile
 |  |  \- javax.json.bind:javax.json.bind-api:jar:1.0:compile
 |  +- commons-logging:commons-logging:jar:1.2:compile
-|  +- com.fasterxml.jackson.core:jackson-core:jar:2.9.8:compile
-|  +- com.fasterxml.jackson.core:jackson-databind:jar:2.9.8:compile
-|  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.9.8:compile
-|  \- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.9.8:compile
+|  +- com.fasterxml.jackson.core:jackson-core:jar:2.10.0:compile
+|  +- com.fasterxml.jackson.core:jackson-databind:jar:2.10.0:compile
+|  +- com.fasterxml.jackson.core:jackson-annotations:jar:2.10.0:compile
+|  \- com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.10.0:compile
+|     +- jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2:compile
+|     \- jakarta.activation:jakarta.activation-api:jar:1.2.1:compile
 +- org.apache.isis.core:isis-security-shiro:jar:2.0.0-M3-SNAPSHOT:compile
 |  +- org.apache.isis.core:isis-runtime-web:jar:2.0.0-M3-SNAPSHOT:compile
 |  +- org.apache.shiro:shiro-core:jar:1.4.1:compile
@@ -164,8 +158,6 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 |  |  |  +- com.jayway.jsonpath:json-path:jar:2.4.0:test
 |  |  |  |  \- net.minidev:json-smart:jar:2.3:test
 |  |  |  |     \- net.minidev:accessors-smart:jar:1.2:test
-|  |  |  +- jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2:test
-|  |  |  |  \- jakarta.activation:jakarta.activation-api:jar:1.2.1:test
 |  |  |  +- org.junit.jupiter:junit-jupiter:jar:5.5.2:test
 |  |  |  |  \- org.junit.jupiter:junit-jupiter-params:jar:5.5.2:test
 |  |  |  +- org.mockito:mockito-junit-jupiter:jar:3.1.0:test
@@ -182,6 +174,17 @@ org.apache.isis.examples.apps:helloworld:jar:2.0.0-M3-SNAPSHOT
 |  \- org.hsqldb:hsqldb:jar:2.5.0:test
 +- com.approvaltests:approvaltests:jar:2.0.0:test
 |  \- com.approvaltests:approvaltests-util:jar:2.0.0:test
++- org.springframework.boot:spring-boot-actuator-autoconfigure:jar:2.2.0.RELEASE:compile
+|  +- org.springframework.boot:spring-boot-actuator:jar:2.2.0.RELEASE:compile
+|  |  \- org.springframework.boot:spring-boot:jar:2.2.0.RELEASE:compile
+|  +- org.springframework.boot:spring-boot-autoconfigure:jar:2.2.0.RELEASE:compile
+|  +- org.springframework:spring-core:jar:5.2.0.RELEASE:compile
+|  |  \- org.springframework:spring-jcl:jar:5.2.0.RELEASE:compile
+|  +- org.springframework:spring-context:jar:5.2.0.RELEASE:compile
+|  |  +- org.springframework:spring-aop:jar:5.2.0.RELEASE:compile
+|  |  +- org.springframework:spring-beans:jar:5.2.0.RELEASE:compile
+|  |  \- org.springframework:spring-expression:jar:5.2.0.RELEASE:compile
+|  \- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.10.0:compile
 +- org.jmock:jmock-junit4:jar:2.11.0:test
 |  +- junit:junit:jar:4.12:test
 |  +- org.jmock:jmock:jar:2.11.0:test


[isis] 02/02: ISIS-2173: uses a SpringApplicationRunListener to let us see whats silently failing

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 161a97d19c472189c144632d386fada6626be89f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 7 08:04:47 2019 +0000

    ISIS-2173: uses a SpringApplicationRunListener to let us see whats silently failing
---
 .../boot/LoggingSpringApplicationRunListener.java  | 55 ++++++++++++++++++++++
 .../src/main/resources/META-INF/spring.factories   |  1 +
 2 files changed, 56 insertions(+)

diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/boot/LoggingSpringApplicationRunListener.java b/core/runtime/src/main/java/org/apache/isis/runtime/boot/LoggingSpringApplicationRunListener.java
new file mode 100644
index 0000000..6388ecf
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/boot/LoggingSpringApplicationRunListener.java
@@ -0,0 +1,55 @@
+package org.apache.isis.runtime.boot;
+
+import lombok.extern.log4j.Log4j2;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplicationRunListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+@Log4j2
+public class LoggingSpringApplicationRunListener implements SpringApplicationRunListener {
+    private SpringApplication app;
+    private String[] args;
+
+    public LoggingSpringApplicationRunListener(SpringApplication app, String[] args){
+        this.app = app;
+        this.args = args;
+    }
+
+    @Override
+    public void starting() {
+        log.debug("starting");
+    }
+
+    @Override
+    public void environmentPrepared(ConfigurableEnvironment environment) {
+        log.debug("environmentPrepared");
+    }
+
+    @Override
+    public void contextPrepared(ConfigurableApplicationContext context) {
+        log.debug("contextPrepared");
+    }
+
+    @Override
+    public void contextLoaded(ConfigurableApplicationContext context) {
+        log.debug("contextLoaded");
+    }
+
+    @Override
+    public void started(ConfigurableApplicationContext context) {
+        log.debug("started");
+    }
+
+    @Override
+    public void running(ConfigurableApplicationContext context) {
+        log.debug("running");
+    }
+
+    @Override
+    public void failed(ConfigurableApplicationContext context, Throwable exception) {
+        log.error("failed", exception);
+    }
+
+}
\ No newline at end of file
diff --git a/core/runtime/src/main/resources/META-INF/spring.factories b/core/runtime/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..2c138d7
--- /dev/null
+++ b/core/runtime/src/main/resources/META-INF/spring.factories
@@ -0,0 +1 @@
+org.springframework.boot.SpringApplicationRunListener=org.apache.isis.runtime.boot.LoggingSpringApplicationRunListener