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/12/07 12:02:08 UTC
[isis-app-simpleapp] 01/05: ISIS-2215: updates to packages
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-app-simpleapp.git
commit 9a6a3516a04df2d5b71890185374c3cf54003553
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 07:05:29 2019 +0000
ISIS-2215: updates to packages
---
.../domainapp/modules/simple/SimpleModule.java | 3 +--
.../integtests/SimpleModuleIntegTestAbstract.java | 16 +++++------
.../src/main/java/domainapp/webapp/SimpleApp.java | 31 +++++++++++-----------
.../webapp/application/ApplicationModule.java | 3 +--
webapp/src/main/resources/shiro.ini | 4 +--
.../integtests/ApplicationIntegTestAbstract.java | 16 +++++------
6 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 8315be4..fd99bd3 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -9,8 +9,7 @@ import org.apache.isis.extensions.fixtures.modules.Module;
import domainapp.modules.simple.dom.impl.SimpleObject;
-@Configuration
-@ComponentScan
+@org.apache.isis.applib.annotation.Module
public class SimpleModule implements Module {
@Override
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 04d48bf..849ec7d 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -3,11 +3,11 @@ package domainapp.modules.simple.integtests;
import domainapp.modules.simple.SimpleModule;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -27,10 +27,10 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleExtFixtures.class,
SimpleModule.class
})
public static class AppManifest {
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 817206a..a107752 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -3,13 +3,13 @@ package domainapp.webapp;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.h2console.dom.IsisExtH2ConsoleModule;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.shiro.IsisBootSecurityShiro;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisBootViewerRestfulObjects;
-import org.apache.isis.viewer.wicket.viewer.IsisBootViewerWicket;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.extensions.h2console.dom.IsisModuleExtH2Console;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
+import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -30,16 +30,17 @@ public class SimpleApp extends SpringBootServletInitializer {
@PropertySources({
@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.DebugDiscovery),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityShiro.class,
- IsisBootDataNucleus.class,
- IsisBootViewerRestfulObjects.class,
- IsisBootViewerWicket.class,
-
- IsisExtFixturesModule.class,
- IsisExtH2ConsoleModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleSecurityShiro.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleRestfulObjectsViewer.class,
+ IsisModuleWicketViewer.class,
+
+ IsisModuleExtFixtures.class,
+ IsisModuleExtH2Console.class,
ApplicationModule.class,
DomainAppDemo.class // register this fixture
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index d5c0535..b68faef 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -7,9 +7,8 @@ import org.springframework.context.annotation.Import;
import domainapp.modules.simple.SimpleModule;
-@Configuration
+@org.apache.isis.applib.annotation.Module
@Import(SimpleModule.class)
-@ComponentScan
public class ApplicationModule implements Module {
}
diff --git a/webapp/src/main/resources/shiro.ini b/webapp/src/main/resources/shiro.ini
index 22ff9e9..7588caa 100644
--- a/webapp/src/main/resources/shiro.ini
+++ b/webapp/src/main/resources/shiro.ini
@@ -1,14 +1,14 @@
[main]
-contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
+contextFactory = org.apache.isis.security.shiro.realm.ldap.IsisLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = CRAM-MD5
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.isis.security.shiro.IsisLdapRealm
+ldapRealm = org.apache.isis.security.shiro.realm.ldap.IsisLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 06db9ea..d7b1c22 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -3,11 +3,11 @@ package domainapp.webapp.integtests;
import domainapp.webapp.application.ApplicationModule;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -28,10 +28,10 @@ public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAb
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootDataNucleus.class,
- IsisBootSecurityBypass.class,
- IsisExtFixturesModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleExtFixtures.class,
ApplicationModule.class
})
public static class AppManifest {