You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/05/17 21:12:45 UTC

[isis] branch 2112_SpringBoot updated: ISIS-2112: fixing the 'demo-app'

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

ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/2112_SpringBoot by this push:
     new d8be4a2  ISIS-2112: fixing the 'demo-app'
d8be4a2 is described below

commit d8be4a26fe27b289a8bf9e2914154b68c27f7467
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 17 23:12:40 2019 +0200

    ISIS-2112: fixing the 'demo-app'
    
    - successfully deploys on tomcat
    - main menu and viewmodels seem to work
    - however, eventbus and mementos don't work yet
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
 .../metamodel/services/ServiceInjectorDefault.java | 10 +++--
 .../services/message/MessageServiceDefault.java    |  6 +--
 example/application/demo/pom.xml                   | 44 +++++++++++++++++++--
 .../main/java/domainapp/application/DemoApp.java}  | 13 +------
 .../domainapp/application/DemoAppManifest.java     | 45 ++++++++++++++++++++--
 ...sis.properties => isis-non-changing.properties} |  5 +--
 .../src/main/java/domainapp/utils/DemoUtils.java   |  2 +-
 .../demo/src/main/webapp/WEB-INF/isis.properties   | 24 +++++++++---
 .../org.apache.isis.core.commons.config.AppConfig  |  1 -
 .../java/domainapp/application/HelloWorldApp.java  |  9 -----
 10 files changed, 113 insertions(+), 46 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index 11a3e70..e2fcdff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -120,12 +120,14 @@ public class ServiceInjectorDefault implements ServiceInjector {
         }
         
         val beans = serviceRegistry.select(typeToBeInjected, field.getAnnotations());
-        if(beans.isCardinalityOne()) {
-            val bean = beans.getSingleton().get();
-            invokeInjectorField(field, targetPojo, bean);    
-        } else {
+        
+        if(beans.isEmpty()) {
             onNotResolvable.accept(new InjectionPoint(field));
+            return;
         }
+        
+        val bean = beans.getFirst().get();
+        invokeInjectorField(field, targetPojo, bean);
 
     }
     
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
index 7d75d8b..019cc4e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
@@ -18,18 +18,18 @@
  */
 package org.apache.isis.core.runtime.services.message;
 
-import javax.annotation.Priority;
 import javax.inject.Singleton;
 
+import org.springframework.context.annotation.Primary;
+
 import org.apache.isis.applib.RecoverableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.commons.ioc.PriorityConstants;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.core.security.authentication.MessageBroker;
 
-@Singleton @Priority(PriorityConstants.PRIORITY_BELOW_DEFAULT)
+@Singleton @Primary
 public class MessageServiceDefault implements MessageService {
 
     @Override
diff --git a/example/application/demo/pom.xml b/example/application/demo/pom.xml
index a340526..a967ffe 100644
--- a/example/application/demo/pom.xml
+++ b/example/application/demo/pom.xml
@@ -49,6 +49,27 @@
 	</properties>
 
 	<dependencies>
+	
+		<!-- SPRING -->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<version>${spring-boot.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<version>${spring-boot.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- ISIS API -->
 		<dependency>
@@ -100,10 +121,15 @@
 			</dependency>
 
 		<!-- OTHER DEPENDENCIES -->
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.hsqldb</groupId> -->
+<!-- 			<artifactId>hsqldb</artifactId> -->
+<!-- 			</dependency> -->
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -139,6 +165,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.github.jnr</groupId>
+			<artifactId>jnr-posix</artifactId>
+			<version>3.0.49</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.jnr</groupId>
+			<artifactId>jnr-enxio</artifactId>
+			<version>0.20</version>
+		</dependency>
 
 	</dependencies>
 
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java b/example/application/demo/src/main/java/domainapp/application/DemoApp.java
similarity index 67%
copy from example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java
copy to example/application/demo/src/main/java/domainapp/application/DemoApp.java
index 1810802..243f164 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java
+++ b/example/application/demo/src/main/java/domainapp/application/DemoApp.java
@@ -20,18 +20,9 @@ package domainapp.application;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.ComponentScan.Filter;
 
-import org.apache.isis.applib.IsisApplibModule;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
-import org.apache.isis.core.metamodel.IsisMetamodelModule;
-import org.apache.isis.core.runtime.IsisRuntimeModule;
-import org.apache.isis.core.runtime.services.IsisRuntimeServicesModule;
-import org.apache.isis.core.wrapper.IsisWrapperModule;
 import org.apache.isis.runtime.spring.IsisBoot;
 
 /**
@@ -41,8 +32,8 @@ import org.apache.isis.runtime.spring.IsisBoot;
 @Import({
     IsisBoot.class,
     FixtureScriptsDefault.class,
-    HelloWorldAppManifest.class,
+    DemoAppManifest.class,
 })
-public class HelloWorldApp extends SpringBootServletInitializer {
+public class DemoApp extends SpringBootServletInitializer {
 
 }
diff --git a/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java b/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
index fcf99b4..e4b2276 100644
--- a/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
+++ b/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
@@ -18,16 +18,53 @@
  */
 package domainapp.application;
 
+import javax.inject.Singleton;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+import org.springframework.core.io.ClassPathResource;
+
+import org.apache.isis.config.Presets;
+import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
+import org.apache.isis.config.beans.WebAppConfigBean;
+import org.apache.isis.security.shiro.IsisSecurityBootUsingShiro;
+import org.apache.isis.viewer.wicket.viewer.IsisWebWicketBoot;
+
+import domainapp.dom.DemoModule;
 
 /**
- * Bootstrap the application.
+ * Makes the integral parts of the 'hello world' web application.
  */
 @Configuration
-@PropertySource("isis.properties")
+@PropertySources({
+    @PropertySource("classpath:/domainapp/application/isis-non-changing.properties"),
+    @PropertySource(name=Presets.H2InMemory, factory = Presets.Factory.class, value = { "" }),
+    @PropertySource(name=Presets.NoTranslations, factory = Presets.Factory.class, value = { "" }),
+})
+@Import({
+    IsisWebWicketBoot.class,
+    IsisSecurityBootUsingShiro.class
+})
+@ComponentScan(
+        basePackageClasses= {
+                DemoModule.class
+        },
+        includeFilters= {
+                @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
+        })
 public class DemoAppManifest {
-
-    //TODO[2112] add missing producers
+    
+   @Bean @Singleton
+   public WebAppConfigBean webAppConfigBean() {
+       return WebAppConfigBean.builder()
+               .menubarsLayoutXml(new ClassPathResource("menubars.layout.xml", this.getClass()))
+               .build();
+   }
 
 }
diff --git a/example/application/demo/src/main/java/domainapp/application/isis.properties b/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
similarity index 95%
rename from example/application/demo/src/main/java/domainapp/application/isis.properties
rename to example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
index f5fcec2..04b4952 100644
--- a/example/application/demo/src/main/java/domainapp/application/isis.properties
+++ b/example/application/demo/src/main/java/domainapp/application/isis-non-changing.properties
@@ -15,9 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-
-isis.appManifest=domainapp.application.DemoAppManifest
-
 isis.reflector.validator.allowDeprecated=false
 isis.reflector.validator.noParamsOnly=true
 isis.reflector.validator.explicitObjectType=false
@@ -59,7 +56,7 @@ isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
 isis.viewer.wicket.maxTitleLengthInParentedTables=0
 
 
-isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
+#isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
 isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
 isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
 
diff --git a/example/application/demo/src/main/java/domainapp/utils/DemoUtils.java b/example/application/demo/src/main/java/domainapp/utils/DemoUtils.java
index 4071ebf..05f9aeb 100644
--- a/example/application/demo/src/main/java/domainapp/utils/DemoUtils.java
+++ b/example/application/demo/src/main/java/domainapp/utils/DemoUtils.java
@@ -35,7 +35,7 @@ public class DemoUtils {
     }
 
     public static String asciidocToHtml(String adoc) {
-        if(adoc==null) {
+        if(asciidoctor==null) {
             asciidoctor = Asciidoctor.Factory.create();
             options = defaultOptions();
         }
diff --git a/example/application/demo/src/main/webapp/WEB-INF/isis.properties b/example/application/demo/src/main/webapp/WEB-INF/isis.properties
index 55bbd14..ef82241 100644
--- a/example/application/demo/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/demo/src/main/webapp/WEB-INF/isis.properties
@@ -16,16 +16,30 @@
 #  under the License.
 
 
+#
+# The properties listed in this file vary between dev/test/prod.
+# All remaining properties (which are static and don't vary between dev/test/prod)
+# are loaded in programmatically by the AppManifest, see isis-non-changing.properties
+#
+
+isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
 
 
+
+#################################################################################
 #
-# Specify the modules (= entities + services) and other components that make up
-# this application.
+# JDBC connection details
+# (also update the pom.xml to reference the appropriate JDBC driver)
 #
+#################################################################################
+
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
 
-isis.appManifest=domainapp.application.DemoAppManifest
 
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.h2.Driver
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:h2:mem:test
 isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
 isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
diff --git a/example/application/helloworld/src/main/java/META-INF/services/org.apache.isis.core.commons.config.AppConfig b/example/application/helloworld/src/main/java/META-INF/services/org.apache.isis.core.commons.config.AppConfig
deleted file mode 100644
index 1756fe8..0000000
--- a/example/application/helloworld/src/main/java/META-INF/services/org.apache.isis.core.commons.config.AppConfig
+++ /dev/null
@@ -1 +0,0 @@
-domainapp.application.HelloWorldAppManifest
\ No newline at end of file
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java
index 1810802..959d41d 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldApp.java
@@ -20,18 +20,9 @@ package domainapp.application;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.ComponentScan.Filter;
 
-import org.apache.isis.applib.IsisApplibModule;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
-import org.apache.isis.core.metamodel.IsisMetamodelModule;
-import org.apache.isis.core.runtime.IsisRuntimeModule;
-import org.apache.isis.core.runtime.services.IsisRuntimeServicesModule;
-import org.apache.isis.core.wrapper.IsisWrapperModule;
 import org.apache.isis.runtime.spring.IsisBoot;
 
 /**