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/09/29 18:06:50 UTC
[isis] branch v2 updated: ISIS-2158: fixes demo-app launch
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new a6526eb ISIS-2158: fixes demo-app launch
a6526eb is described below
commit a6526ebbeb6c48cf0ba52ae4828892231f23eed6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Sep 29 20:06:42 2019 +0200
ISIS-2158: fixes demo-app launch
- Spring bean discovery did refuse to provision the app context, because
there were 2 beans with the same name 'DemoItem'. This is the desired
behavior!
- to explicitly assign unique bean names one can use the @Named
annotation
---
.../src/main/java/domainapp/application/DemoAppManifest.java | 9 ++-------
.../demo/src/main/java/domainapp/dom/actions/assoc/DemoItem.java | 6 +++++-
.../src/main/java/domainapp/dom/actions/depargs/DemoItem.java | 5 ++++-
.../main/java/domainapp/application/HelloWorldAppManifest.java | 6 ------
.../src/main/java/domainapp/conf/SimpleAppConfiguration.java | 6 ------
5 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/examples/apps/demo/src/main/java/domainapp/application/DemoAppManifest.java b/examples/apps/demo/src/main/java/domainapp/application/DemoAppManifest.java
index 4d59df0..bdca113 100644
--- a/examples/apps/demo/src/main/java/domainapp/application/DemoAppManifest.java
+++ b/examples/apps/demo/src/main/java/domainapp/application/DemoAppManifest.java
@@ -22,16 +22,13 @@ 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.IsisPresets;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.extensions.fixtures.IsisBootFixtures;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
@@ -78,10 +75,8 @@ import domainapp.utils.LibraryPreloadingService;
@ComponentScan(
basePackageClasses= {
DemoModule.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
- })
+ }
+)
public class DemoAppManifest {
@Bean @Singleton
diff --git a/examples/apps/demo/src/main/java/domainapp/dom/actions/assoc/DemoItem.java b/examples/apps/demo/src/main/java/domainapp/dom/actions/assoc/DemoItem.java
index 8753533..b20043b 100644
--- a/examples/apps/demo/src/main/java/domainapp/dom/actions/assoc/DemoItem.java
+++ b/examples/apps/demo/src/main/java/domainapp/dom/actions/assoc/DemoItem.java
@@ -18,6 +18,8 @@
*/
package domainapp.dom.actions.assoc;
+import javax.inject.Named;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
@@ -29,7 +31,9 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-@DomainObject(nature=Nature.INMEMORY_ENTITY)
+
+@DomainObject(nature=Nature.INMEMORY_ENTITY)
+@Named("assoc.DemoItem")
@NoArgsConstructor
@AllArgsConstructor(staticName="of")
public class DemoItem {
diff --git a/examples/apps/demo/src/main/java/domainapp/dom/actions/depargs/DemoItem.java b/examples/apps/demo/src/main/java/domainapp/dom/actions/depargs/DemoItem.java
index 8413084..2ad07b0 100644
--- a/examples/apps/demo/src/main/java/domainapp/dom/actions/depargs/DemoItem.java
+++ b/examples/apps/demo/src/main/java/domainapp/dom/actions/depargs/DemoItem.java
@@ -18,6 +18,8 @@
*/
package domainapp.dom.actions.depargs;
+import javax.inject.Named;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
@@ -29,7 +31,8 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-@DomainObject(nature=Nature.INMEMORY_ENTITY)
+@DomainObject(nature=Nature.INMEMORY_ENTITY)
+@Named("depargs.DemoItem")
@NoArgsConstructor
@AllArgsConstructor(staticName="of")
public class DemoItem {
diff --git a/examples/apps/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/examples/apps/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index 342caff..d3afff0 100644
--- a/examples/apps/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/examples/apps/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -22,16 +22,13 @@ 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.IsisPresets;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
@@ -62,9 +59,6 @@ import domainapp.dom.HelloWorldModule;
@ComponentScan(
basePackageClasses= {
HelloWorldModule.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class HelloWorldAppManifest {
diff --git a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java b/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
index cdd2be0..a907e4f 100644
--- a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
+++ b/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
@@ -22,16 +22,13 @@ 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.IsisPresets;
-import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.extensions.fixtures.IsisBootFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
@@ -68,9 +65,6 @@ import domainapp.modules.simple.SimpleModule;
basePackageClasses= {
DomainAppApplicationModule.class,
SimpleModule.class
- },
- includeFilters= {
- @Filter(type = FilterType.CUSTOM, classes= {IsisBeanScanInterceptorForSpring.class})
})
public class SimpleAppConfiguration {