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 2020/01/10 18:35:32 UTC
[isis] 07/14: ISIS-2259: updates packages for core-webspringboot
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 95b84ba1b84de9f9ead9fa6d87b09e440ecfc9f5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:55:44 2020 +0000
ISIS-2259: updates packages for core-webspringboot
---
core/pom.xml | 2 +-
.../core/webapp/{IsisModuleWebapp.java => IsisModuleCoreWebapp.java} | 2 +-
core/{webboot-springboot => webspringboot}/pom.xml | 0
core/{webboot-springboot => webspringboot}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/webboot-springboot/nav.adoc | 0
.../src/main/doc/modules/webboot-springboot/pages/about.adoc | 0
.../src/main/doc/modules/webboot-springboot/partials/module-nav.adoc | 0
.../apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java} | 4 ++--
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_headless.java | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java | 4 ++--
.../apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java | 4 ++--
.../org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java | 4 ++--
.../java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java | 4 ++--
.../isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java | 4 ++--
.../apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java | 4 ++--
.../viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java | 4 ++--
.../org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java | 4 ++--
18 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 77b57ed..0da70c9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1847,7 +1847,7 @@
<module>runtime</module>
<module>runtimeservices</module>
<module>webapp</module>
- <module>webboot-springboot</module>
+ <module>webspringboot</module>
<module>unittestsupport</module>
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
index 19c3ff6..0d95e1d 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
@@ -43,6 +43,6 @@ import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
IsisWebAppContextInitializer.class,
})
-public class IsisModuleWebapp {
+public class IsisModuleCoreWebapp {
}
diff --git a/core/webboot-springboot/pom.xml b/core/webspringboot/pom.xml
similarity index 100%
rename from core/webboot-springboot/pom.xml
rename to core/webspringboot/pom.xml
diff --git a/core/webboot-springboot/src/main/doc/antora.yml b/core/webspringboot/src/main/doc/antora.yml
similarity index 100%
rename from core/webboot-springboot/src/main/doc/antora.yml
rename to core/webspringboot/src/main/doc/antora.yml
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/nav.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/pages/about.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
diff --git a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java b/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
similarity index 93%
rename from core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
rename to core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
index c4a9e41..939a349 100644
--- a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
+++ b/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webboot.springboot;
+package org.apache.isis.core.webspringboot;
import javax.inject.Singleton;
@@ -36,7 +36,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
// modules
IsisModuleCoreRuntimeServices.class,
})
-public class IsisModuleSpringBoot implements ApplicationContextAware {
+public class IsisModuleCoreWebSpringBoot implements ApplicationContextAware {
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 8130b27..aadac64 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -47,7 +47,7 @@ import org.apache.isis.valuetypes.asciidoc.ui.IsisModuleValAsciidocUi;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
import demoapp.dom.DemoModule;
import demoapp.utils.LibraryPreloadingService;
@@ -83,7 +83,7 @@ public class DemoApp extends SpringBootServletInitializer {
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
IsisModuleWicketViewer.class,
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 11d1cb0..218e563 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -39,11 +39,11 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleIncModelMetaModel.class // @Model support
})
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index 81a0773..95df259 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -29,11 +29,11 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
IsisModuleTstFixturesApplib.class
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 075336e..9b7ade7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -35,11 +35,11 @@ import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationSer
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityShiro.class,
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index ad4455a..a1710cb 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
@@ -36,7 +36,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Import({
// modules
IsisModuleCoreRuntimeServices.class,
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
// @Service's
AuthenticatorKeycloak.class,
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 6057631..b109c0e 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
@@ -36,7 +36,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Import({
// modules
IsisModuleCoreRuntimeServices.class,
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
// @Service's
AuthenticatorShiro.class,
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
index 56e4272..bfe311e 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
- IsisModuleWebapp.class
+ IsisModuleCoreWebapp.class
})
@ComponentScan
public class IsisModuleTestingH2ConsoleUi {
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
index 70be418..5a6471e 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
- IsisModuleWebapp.class
+ IsisModuleCoreWebapp.class
})
@ComponentScan
public class IsisModuleExtHsqldbMgr {
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
index f8a5ae6..a7cef34 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceSe
import org.apache.isis.viewer.restfulobjects.viewer.resources.SwaggerSpecResource;
import org.apache.isis.viewer.restfulobjects.viewer.resources.UserResourceServerside;
import org.apache.isis.viewer.restfulobjects.viewer.resources.VersionResourceServerside;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
*
@@ -45,7 +45,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
IsisModuleRestfulObjectsRendering.class,
// @Component's
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
index 05683d0..85ce320 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
@@ -3,12 +3,12 @@ package org.apache.isis.viewer.wicket.model;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
// modules
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
})
public class IsisModuleWicketModel {
}