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/04 12:12:38 UTC
[isis] branch master updated (6107c84 -> ad4f87d)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 6107c84 ISIS-2158: fixes demo/smoketests not compiling
new 4eb693f ISIS-2148: removes helloworld and simpleapp from top-level pom.xml
new cf635ca ISIS-2205: removes IsisWrapperModule - redundant
new cd26af9 ISIS-2205: converts IsisXxxModule into Spring @Configurations
new ca635cc ISIS-2205: deletes PropertyResource from applib, doesn't seem to be used anymore
new ced36e4 ISIS-2205: removes redundant basePackageClasses= for ComponentScan of IsisBootViewerXxx
new 84727b1 ISIS-2205: ensures all classes in runtime-web are in the org.apache.isis.webapp package.
new 032a490 ISIS-2208: moves h2 console into new isis extension
new cff3908 ISIS-2208: moves hsqldbmgrmenu from runtime-services to isis extensions
new ad4f87d ISIS-2205: fixes bad paths for Antora
The 9 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:
.../isis-configurations-and-modules.pptx | Bin 48673 -> 48551 bytes
.../modules/ROOT/partials/component-nav.adoc | 2 +
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site-other.yml | 9 +++
core/applib/pom.xml | 7 --
.../org/apache/isis/applib/IsisApplibModule.java | 7 +-
.../org/apache/isis/applib/PropertyResource.java | 73 ---------------------
.../apache/isis/metamodel/IsisMetamodelModule.java | 18 +++--
.../services/IsisRuntimeServicesModule.java | 14 +++-
.../services/wrapper/IsisWrapperModule.java | 23 -------
.../org/apache/isis/runtime/spring/IsisBoot.java | 24 ++-----
.../org/apache/isis/webapp/IsisBootWebApp.java | 6 --
.../wormhole}/AuthenticationSessionWormhole.java | 2 +-
core/runtime/pom.xml | 1 -
.../org/apache/isis/runtime/IsisRuntimeModule.java | 12 +++-
.../isis/security/keycloak/KeycloakFilter.java | 2 +-
.../IsisBootViewerRestfulObjects.java | 6 +-
.../viewer/wicket/viewer/IsisBootViewerWicket.java | 5 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 5 +-
.../testdomain/bootstrapping/builtin-IsisBoot.list | 2 +-
.../bootstrapping/builtin-domain-services.list | 2 +-
.../bootstrapping/builtin-singleton.list | 2 +-
.../{core/spring => persistence/h2console}/pom.xml | 18 +++--
.../h2console}/src/main/doc/antora.yml | 0
.../main/doc/modules/h2console}/_attributes.adoc | 0
.../doc/modules/h2console/attachments}/.gitkeep | 0
.../main/doc/modules/h2console/examples}/.gitkeep | 0
.../main/doc/modules/h2console}/images/.gitkeep | 0
.../src/main/doc/modules/h2console/nav.adoc | 2 +
.../doc/modules/h2console/pages}/_attributes.adoc | 0
.../main/doc/modules/h2console}/pages/about.adoc | 2 +-
.../modules/h2console}/partials/_attributes.adoc | 0
.../modules/h2console}/partials/module-nav.adoc | 0
.../h2console/IsisExtH2ConsoleModule.java | 22 ++-----
.../h2console/services}/H2ManagerMenu.java | 20 +++---
.../h2console/webmodule}/WebModuleH2Console.java | 2 +-
.../{core/spring => persistence/hsqldbmgr}/pom.xml | 18 +++--
.../hsqldbmgr}/src/main/doc/antora.yml | 0
.../main/doc/modules/hsqldbmgr}/_attributes.adoc | 0
.../doc/modules/hsqldbmgr/attachments}/.gitkeep | 0
.../main/doc/modules/hsqldbmgr/examples}/.gitkeep | 0
.../main/doc/modules/hsqldbmgr}/images/.gitkeep | 0
.../src/main/doc/modules/hsqldbmgr/nav.adoc | 2 +
.../doc/modules/hsqldbmgr/pages}/_attributes.adoc | 0
.../main/doc/modules/hsqldbmgr}/pages/about.adoc | 2 +-
.../modules/hsqldbmgr}/partials/_attributes.adoc | 0
.../modules/hsqldbmgr}/partials/module-nav.adoc | 0
.../hsqldbmgr/IsisExtHsqldbMgrModule.java | 20 ++----
.../hsqldbmgr/services}/HsqlDbManagerMenu.java | 18 +++--
extensions/pom.xml | 12 ++++
pom.xml | 3 -
site.yml | 11 +++-
53 files changed, 150 insertions(+), 228 deletions(-)
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/PropertyResource.java
delete mode 100644 core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java
rename core/runtime-web/src/main/java/org/apache/isis/{core/runtime/web => webapp/wormhole}/AuthenticationSessionWormhole.java (96%)
copy extensions/{core/spring => persistence/h2console}/pom.xml (73%)
copy extensions/{core/spring => persistence/h2console}/src/main/doc/antora.yml (100%)
copy {starters/src/main/doc/modules/simpleapp => extensions/persistence/h2console/src/main/doc/modules/h2console}/_attributes.adoc (100%)
copy {starters/src/main/doc/modules/helloworld/images => extensions/persistence/h2console/src/main/doc/modules/h2console/attachments}/.gitkeep (100%)
copy {starters/src/main/doc/modules/helloworld/images => extensions/persistence/h2console/src/main/doc/modules/h2console/examples}/.gitkeep (100%)
copy {starters/src/main/doc/modules/helloworld => extensions/persistence/h2console/src/main/doc/modules/h2console}/images/.gitkeep (100%)
create mode 100644 extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => extensions/persistence/h2console/src/main/doc/modules/h2console/pages}/_attributes.adoc (100%)
copy extensions/{core/spring/src/main/doc/modules/spring => persistence/h2console/src/main/doc/modules/h2console}/pages/about.adoc (98%)
copy {starters/src/main/doc/modules/simpleapp => extensions/persistence/h2console/src/main/doc/modules/h2console}/partials/_attributes.adoc (100%)
copy extensions/{core/spring/src/main/doc/modules/spring => persistence/h2console/src/main/doc/modules/h2console}/partials/module-nav.adoc (100%)
copy core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java => extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java (80%)
rename {core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console => extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services}/H2ManagerMenu.java (83%)
rename {core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console => extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule}/WebModuleH2Console.java (98%)
copy extensions/{core/spring => persistence/hsqldbmgr}/pom.xml (73%)
copy extensions/{core/spring => persistence/hsqldbmgr}/src/main/doc/antora.yml (100%)
copy {starters/src/main/doc/modules/simpleapp => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr}/_attributes.adoc (100%)
copy {starters/src/main/doc/modules/helloworld/images => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/attachments}/.gitkeep (100%)
copy {starters/src/main/doc/modules/helloworld/images => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/examples}/.gitkeep (100%)
copy {starters/src/main/doc/modules/helloworld => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr}/images/.gitkeep (100%)
create mode 100644 extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages}/_attributes.adoc (100%)
copy extensions/{core/spring/src/main/doc/modules/spring => persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr}/pages/about.adoc (97%)
copy {starters/src/main/doc/modules/simpleapp => extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr}/partials/_attributes.adoc (100%)
copy extensions/{core/spring/src/main/doc/modules/spring => persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr}/partials/module-nav.adoc (100%)
copy core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java => extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java (80%)
rename {core/runtime-services/src/main/java/org/apache/isis/runtime/services/hsqldb => extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services}/HsqlDbManagerMenu.java (89%)
[isis] 06/09: ISIS-2205: ensures all classes in runtime-web are in
the org.apache.isis.webapp package.
Posted by da...@apache.org.
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 84727b1e6d2b538f3d1e586061390e396cc1de4b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 10:58:29 2019 +0000
ISIS-2205: ensures all classes in runtime-web are in the org.apache.isis.webapp package.
---
.../web => webapp/wormhole}/AuthenticationSessionWormhole.java | 2 +-
.../main/java/org/apache/isis/security/keycloak/KeycloakFilter.java | 2 +-
.../viewer/integration/wicket/AuthenticatedWebSessionForIsis.java | 2 +-
.../components/actionmenu/serviceactions/TertiaryActionsPanel.java | 5 +----
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/runtime/web/AuthenticationSessionWormhole.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
similarity index 96%
rename from core/runtime-web/src/main/java/org/apache/isis/core/runtime/web/AuthenticationSessionWormhole.java
rename to core/runtime-web/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
index 28e07d1..fe37cf4 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/runtime/web/AuthenticationSessionWormhole.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.web;
+package org.apache.isis.webapp.wormhole;
import lombok.experimental.UtilityClass;
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
index 154f102..d6ec678 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
@@ -9,7 +9,7 @@ import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.core.runtime.web.AuthenticationSessionWormhole;
+import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.standard.SimpleSession;
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 8379f26..1a3546b 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.core.runtime.web.AuthenticationSessionWormhole;
+import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.AuthenticationRequestPassword;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index c9ac147..343d7fd 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -22,15 +22,12 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.core.runtime.web.AuthenticationSessionWormhole;
-import org.apache.isis.metamodel.commons.Wormhole;
+import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
[isis] 01/09: ISIS-2148: removes helloworld and simpleapp from
top-level pom.xml
Posted by da...@apache.org.
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 4eb693f4211df55ed86451a47af8216a3fe86c60
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 18:51:50 2019 +0000
ISIS-2148: removes helloworld and simpleapp from top-level pom.xml
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c2423d..7750e4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
<module>examples/demo</module>
<module>examples/smoketests</module>
-
- <module>starters/helloworld</module>
- <module>starters/simpleapp</module>
</modules>
<profiles>
[isis] 05/09: ISIS-2205: removes redundant basePackageClasses= for
ComponentScan of IsisBootViewerXxx
Posted by da...@apache.org.
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 ced36e48968d3334c1cfdaa1d83886e7312ef107
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 09:52:50 2019 +0000
ISIS-2205: removes redundant basePackageClasses= for ComponentScan of IsisBootViewerXxx
---
.../isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java | 6 +-----
.../org/apache/isis/viewer/wicket/viewer/IsisBootViewerWicket.java | 5 +----
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java
index eb084c3..85350ce 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisBootViewerRestfulObjects.java
@@ -33,11 +33,7 @@ import org.apache.isis.webapp.IsisBootWebApp;
@Import({
IsisBootWebApp.class
})
-@ComponentScan(
- basePackageClasses= {
- IsisBootViewerRestfulObjects.class,
- })
+@ComponentScan
public class IsisBootViewerRestfulObjects {
-
}
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootViewerWicket.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootViewerWicket.java
index 64750af..1a2d09a 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootViewerWicket.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisBootViewerWicket.java
@@ -35,10 +35,7 @@ import org.apache.isis.webapp.IsisBootWebApp;
IsisBootWebApp.class,
IsisWicketThemeSupportDefault.class
})
-@ComponentScan(
- basePackageClasses= {
- IsisBootViewerWicket.class,
- })
+@ComponentScan
public class IsisBootViewerWicket {
}
[isis] 02/09: ISIS-2205: removes IsisWrapperModule - redundant
Posted by da...@apache.org.
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 cf635ca14193e804f0a712276989079727f1b46c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 08:31:07 2019 +0000
ISIS-2205: removes IsisWrapperModule - redundant
---
.../services/wrapper/IsisWrapperModule.java | 23 ----------------------
.../org/apache/isis/runtime/spring/IsisBoot.java | 17 +++++++---------
2 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java
deleted file mode 100644
index 27484d6..0000000
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/IsisWrapperModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.runtime.services.wrapper;
-
-public final class IsisWrapperModule {
-
-}
diff --git a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
index 2e40215..631ab6f 100644
--- a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
+++ b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
@@ -20,6 +20,12 @@ package org.apache.isis.runtime.spring;
import javax.inject.Singleton;
+import org.apache.isis.applib.IsisApplibModule;
+import org.apache.isis.config.IsisConfigModule;
+import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.metamodel.IsisMetamodelModule;
+import org.apache.isis.runtime.IsisRuntimeModule;
+import org.apache.isis.runtime.services.IsisRuntimeServicesModule;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -30,14 +36,6 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.apache.isis.applib.IsisApplibModule;
-import org.apache.isis.config.IsisConfigModule;
-import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.metamodel.IsisMetamodelModule;
-import org.apache.isis.runtime.IsisRuntimeModule;
-import org.apache.isis.runtime.services.IsisRuntimeServicesModule;
-import org.apache.isis.runtime.services.wrapper.IsisWrapperModule;
-
@Configuration
@Import({
IsisBeanFactoryPostProcessorForSpring.class,
@@ -48,8 +46,7 @@ import org.apache.isis.runtime.services.wrapper.IsisWrapperModule;
IsisApplibModule.class,
IsisMetamodelModule.class,
IsisRuntimeModule.class,
- IsisRuntimeServicesModule.class,
- IsisWrapperModule.class
+ IsisRuntimeServicesModule.class
})
public class IsisBoot implements ApplicationContextAware {
[isis] 09/09: ISIS-2205: fixes bad paths for Antora
Posted by da...@apache.org.
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 ad4f87dcd6de91fa8285967ddb767776e7d8769f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 12:09:23 2019 +0000
ISIS-2205: fixes bad paths for Antora
* runtime-extensions -> runtime-spring
* core/h2console -> persistence/h2console
* core/hsqldbmgr -> persistence/hsqldbmgr
adds incubator/microprofile
---
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site-other.yml | 7 +++++--
site.yml | 9 ++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 7182426..94a29aa 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -31,7 +31,7 @@ content:
start_path: core/runtime/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/runtime-extensions/src/main/doc # core
+ start_path: core/runtime-spring/src/main/doc # core
branches: HEAD
- url: .
start_path: core/runtime-services/src/main/doc # core
diff --git a/antora/playbooks/site-other.yml b/antora/playbooks/site-other.yml
index 246e285..b35b741 100644
--- a/antora/playbooks/site-other.yml
+++ b/antora/playbooks/site-other.yml
@@ -24,6 +24,9 @@ content:
- url: .
start_path: incubator/core/model/src/main/doc # other
branches: HEAD
+ - url: .
+ start_path: incubator/core/microprofile/src/main/doc # other
+ branches: HEAD
# legacy
- url: .
@@ -41,10 +44,10 @@ content:
start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/core/h2console/src/main/doc # other
+ start_path: extensions/persistence/h2console/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/core/hsqldbmgr/src/main/doc # other
+ start_path: extensions/persistence/hsqldbmgr/src/main/doc # other
branches: HEAD
diff --git a/site.yml b/site.yml
index cb99d7e..d83720b 100644
--- a/site.yml
+++ b/site.yml
@@ -61,7 +61,7 @@ content:
start_path: core/runtime/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/runtime-extensions/src/main/doc # core
+ start_path: core/runtime-spring/src/main/doc # core
branches: HEAD
- url: .
start_path: core/runtime-services/src/main/doc # core
@@ -117,6 +117,9 @@ content:
- url: .
start_path: incubator/core/model/src/main/doc # other
branches: HEAD
+ - url: .
+ start_path: incubator/core/microprofile/src/main/doc # other
+ branches: HEAD
# legacy
- url: .
@@ -134,10 +137,10 @@ content:
start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/core/h2console/src/main/doc # other
+ start_path: extensions/persistence/h2console/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/core/hsqldbmgr/src/main/doc # other
+ start_path: extensions/persistence/hsqldbmgr/src/main/doc # other
branches: HEAD
- url: .
start_path: extensions/security/secman/src/main/doc # security secman
[isis] 03/09: ISIS-2205: converts IsisXxxModule into Spring
@Configurations
Posted by da...@apache.org.
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 cd26af96bae79f6bcb5906c23700c6efadf863fe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 09:14:16 2019 +0000
ISIS-2205: converts IsisXxxModule into Spring @Configurations
same as the IsisBootXxx classes
---
.../isis-configurations-and-modules.pptx | Bin 48673 -> 47861 bytes
.../org/apache/isis/applib/IsisApplibModule.java | 7 ++++---
.../apache/isis/metamodel/IsisMetamodelModule.java | 18 ++++++++++++++----
.../runtime/services/IsisRuntimeServicesModule.java | 14 +++++++++++++-
.../org/apache/isis/runtime/spring/IsisBoot.java | 9 +--------
core/runtime/pom.xml | 1 -
.../org/apache/isis/runtime/IsisRuntimeModule.java | 12 +++++++++++-
7 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index 99f1af7..b448bcd 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index a4a7f85..45533c7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -18,9 +18,11 @@
*/
package org.apache.isis.applib;
-import javax.xml.bind.annotation.XmlRootElement;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
-@XmlRootElement(name = "module")
+@Configuration
+@ComponentScan
public class IsisApplibModule {
// -- UI EVENT CLASSES
@@ -48,5 +50,4 @@ public class IsisApplibModule {
extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
index 3be0781..6810078 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisMetamodelModule.java
@@ -21,8 +21,18 @@ package org.apache.isis.metamodel;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class IsisMetamodelModule {
-
-
+import org.apache.isis.applib.IsisApplibModule;
+import org.apache.isis.config.IsisConfigModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+ IsisApplibModule.class,
+ IsisConfigModule.class,
+})
+@ComponentScan
+public class IsisMetamodelModule {
+
}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
index e648a5e..0c258a3 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisRuntimeServicesModule.java
@@ -18,6 +18,18 @@
*/
package org.apache.isis.runtime.services;
-public final class IsisRuntimeServicesModule {
+import org.apache.isis.config.IsisConfigModule;
+import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
+import org.apache.isis.runtime.IsisRuntimeModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+ IsisRuntimeModule.class,
+})
+@ComponentScan
+public class IsisRuntimeServicesModule {
}
diff --git a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
index 631ab6f..bebaa40 100644
--- a/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
+++ b/core/runtime-spring/src/main/java/org/apache/isis/runtime/spring/IsisBoot.java
@@ -39,15 +39,8 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@Configuration
@Import({
IsisBeanFactoryPostProcessorForSpring.class,
- IsisConfigModule.class,
+ IsisRuntimeServicesModule.class,
})
-@ComponentScan(
- basePackageClasses= {
- IsisApplibModule.class,
- IsisMetamodelModule.class,
- IsisRuntimeModule.class,
- IsisRuntimeServicesModule.class
- })
public class IsisBoot implements ApplicationContextAware {
@Override
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 6b52122..8731c7e 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -75,7 +75,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java b/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
index 1dfc124..ed7afd0 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/IsisRuntimeModule.java
@@ -18,6 +18,16 @@
*/
package org.apache.isis.runtime;
-public final class IsisRuntimeModule {
+import org.apache.isis.metamodel.IsisMetamodelModule;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+ IsisMetamodelModule.class,
+})
+@ComponentScan
+public class IsisRuntimeModule {
}
[isis] 08/09: ISIS-2208: moves hsqldbmgrmenu from runtime-services
to isis extensions
Posted by da...@apache.org.
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 cff3908354dc19d4c55e3ea71d719b3086cb097e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 11:10:08 2019 +0000
ISIS-2208: moves hsqldbmgrmenu from runtime-services to isis extensions
also:
- renames h2console antora module (copy-n-paste error)
---
.../modules/ROOT/partials/component-nav.adoc | 2 +
antora/playbooks/site-other.yml | 3 ++
core/applib/pom.xml | 7 ----
.../testdomain/bootstrapping/builtin-IsisBoot.list | 2 +-
.../bootstrapping/builtin-domain-services.list | 2 +-
.../bootstrapping/builtin-singleton.list | 2 +-
.../modules/{spring => h2console}/_attributes.adoc | 0
.../images => h2console/attachments}/.gitkeep | 0
.../{spring => h2console}/examples/.gitkeep | 0
.../attachments => h2console/images}/.gitkeep | 0
.../doc/modules/{spring => h2console}/nav.adoc | 0
.../partials => h2console/pages}/_attributes.adoc | 0
.../modules/{spring => h2console}/pages/about.adoc | 0
.../pages => h2console/partials}/_attributes.adoc | 0
.../{spring => h2console}/partials/module-nav.adoc | 0
extensions/persistence/hsqldbmgr/pom.xml | 47 ++++++++++++++++++++++
.../persistence/hsqldbmgr/src/main/doc/antora.yml | 2 +
.../main/doc/modules/hsqldbmgr}/_attributes.adoc | 0
.../doc/modules/hsqldbmgr/attachments}/.gitkeep | 0
.../main/doc/modules/hsqldbmgr/examples}/.gitkeep | 0
.../main/doc/modules/hsqldbmgr}/images/.gitkeep | 0
.../src/main/doc/modules/hsqldbmgr/nav.adoc | 2 +
.../doc/modules/hsqldbmgr/pages}/_attributes.adoc | 0
.../main/doc/modules/hsqldbmgr}/pages/about.adoc | 2 +-
.../modules/hsqldbmgr}/partials/_attributes.adoc | 0
.../modules/hsqldbmgr}/partials/module-nav.adoc | 0
.../hsqldbmgr/IsisExtHsqldbMgrModule.java | 33 +++++++++++++++
.../hsqldbmgr/services}/HsqlDbManagerMenu.java | 18 ++++-----
extensions/pom.xml | 6 +++
site.yml | 3 ++
30 files changed, 110 insertions(+), 21 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index 03e6fe1..4e78087 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,5 +1,7 @@
include::extensions:ROOT:partial$module-nav.adoc[]
include::extensions:spring:partial$module-nav.adoc[]
+include::extensions:h2console:partial$module-nav.adoc[]
+include::extensions:hsqldbmgr:partial$module-nav.adoc[]
//include::extensions:base:partial$module-nav.adoc[]
//include::extensions:excel:partial$module-nav.adoc[]
//include::extensions:fakedata:partial$module-nav.adoc[]
diff --git a/antora/playbooks/site-other.yml b/antora/playbooks/site-other.yml
index 65ab8c6..246e285 100644
--- a/antora/playbooks/site-other.yml
+++ b/antora/playbooks/site-other.yml
@@ -43,6 +43,9 @@ content:
- url: .
start_path: extensions/core/h2console/src/main/doc # other
branches: HEAD
+ - url: .
+ start_path: extensions/core/hsqldbmgr/src/main/doc # other
+ branches: HEAD
ui:
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2e8b59d..6209156 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -70,13 +70,6 @@
<artifactId>isis-schema</artifactId>
</dependency>
- <!-- HSQL-DB -->
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <optional>true</optional>
- </dependency>
-
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
index e332ba5..5c74a71 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
@@ -57,7 +57,7 @@ org.apache.isis.runtime.services.email.EmailServiceDefault
org.apache.isis.runtime.services.eventbus.EventBusServiceSpring
org.apache.isis.runtime.services.factory.FactoryServiceInternalDefault
org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault
-org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
+org.apache.isis.extensions.hsqldbmgr.services.HsqlDbManagerMenu
org.apache.isis.runtime.services.i18n.po.TranslationServicePo
org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index 7c922c1..99a194d 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -17,7 +17,7 @@ org.apache.isis.metamodel.services.user.UserServiceDefault$SudoServiceSpi
org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault
org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault
org.apache.isis.runtime.services.email.EmailServiceDefault
-org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
+org.apache.isis.extensions.hsqldbmgr.services.HsqlDbManagerMenu
org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
org.apache.isis.runtime.services.publish.PublishingServiceInternalDefault
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
index 0cafbdc..430045f 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
@@ -59,7 +59,7 @@ org.apache.isis.runtime.services.email.EmailServiceDefault
org.apache.isis.runtime.services.eventbus.EventBusServiceSpring
org.apache.isis.runtime.services.factory.FactoryServiceInternalDefault
org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault
-org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
+org.apache.isis.extensions.hsqldbmgr.services.HsqlDbManagerMenu
org.apache.isis.runtime.services.i18n.po.TranslationServicePo
org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/_attributes.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc
copy to extensions/persistence/h2console/src/main/doc/modules/h2console/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/h2console/attachments/.gitkeep
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep
copy to extensions/persistence/h2console/src/main/doc/modules/h2console/attachments/.gitkeep
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/examples/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/h2console/examples/.gitkeep
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/examples/.gitkeep
rename to extensions/persistence/h2console/src/main/doc/modules/h2console/examples/.gitkeep
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/attachments/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/h2console/images/.gitkeep
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/attachments/.gitkeep
rename to extensions/persistence/h2console/src/main/doc/modules/h2console/images/.gitkeep
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/nav.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/nav.adoc
rename to extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc
copy to extensions/persistence/h2console/src/main/doc/modules/h2console/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc
copy to extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/pages/_attributes.adoc
rename to extensions/persistence/h2console/src/main/doc/modules/h2console/partials/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc
copy to extensions/persistence/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/pom.xml b/extensions/persistence/hsqldbmgr/pom.xml
new file mode 100644
index 0000000..2ad005a
--- /dev/null
+++ b/extensions/persistence/hsqldbmgr/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-extensions-hsqldbmgr</artifactId>
+ <name>Apache Isis Ext - HSQLDB Manager</name>
+ <description>Menu and configuration to open up HSQLDB Manager</description>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.hsqldbmgr</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/hsqldbmgr</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml b/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
new file mode 100644
index 0000000..eeeeb1e
--- /dev/null
+++ b/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: extensions
+version: master
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc
rename to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/attachments/.gitkeep
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep
copy to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/attachments/.gitkeep
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/examples/.gitkeep
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep
copy to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/examples/.gitkeep
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/images/.gitkeep
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep
rename to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/images/.gitkeep
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc
new file mode 100644
index 0000000..206afc5
--- /dev/null
+++ b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc
@@ -0,0 +1,2 @@
+include::extensions:hsqldbmgr:partial$component-nav.adoc[]
+
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc
copy to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc
similarity index 97%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc
rename to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc
index 883c317..1d3616f 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc
+++ b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= HSQLDB Manager
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc
rename to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc
rename to extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java
new file mode 100644
index 0000000..c789093
--- /dev/null
+++ b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.extensions.hsqldbmgr;
+
+import org.apache.isis.webapp.IsisBootWebApp;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Import({
+ IsisBootWebApp.class
+})
+@ComponentScan
+public class IsisExtHsqldbMgrModule {
+
+}
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java
similarity index 89%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
rename to extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java
index cba508c..c0e649e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
+++ b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.hsqldb;
+package org.apache.isis.extensions.hsqldbmgr.services;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.isis.config.IsisConfiguration;
@@ -38,7 +37,7 @@ import org.apache.isis.commons.internal.context._Context;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "isisApplib.HsqlDbManagerMenu"
+ objectType = "isisExtHsqldbMgr.HsqlDbManagerMenu"
)
@DomainServiceLayout(
named = "Prototyping",
@@ -46,17 +45,17 @@ import org.apache.isis.commons.internal.context._Context;
)
public class HsqlDbManagerMenu {
+ private final IsisConfiguration isisConfiguration;
+ private final String url;
- @Inject IsisConfiguration isisConfiguration;
-
- private String url;
-
- @PostConstruct
- public void init() {
+ @Inject
+ public HsqlDbManagerMenu(IsisConfiguration isisConfiguration) {
+ this.isisConfiguration = isisConfiguration;
this.url = isisConfiguration.getPersistor().getDatanucleus().getImpl().getJavax().getJdo().getOption().getConnectionUrl();
}
+
public static class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<HsqlDbManagerMenu> { }
@Action(
@@ -83,5 +82,4 @@ public class HsqlDbManagerMenu {
return _Strings.isNullOrEmpty(url) || !url.contains("hsqldb:mem");
}
-
}
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 27978e6..97953a6 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -138,6 +138,11 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-hsqldbmgr</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -192,6 +197,7 @@
<modules>
<module>core/spring</module>
<module>persistence/h2console</module>
+ <module>persistence/hsqldbmgr</module>
<module>security/secman</module>
<module>testing/fixtures</module>
<module>testing/specsupport</module>
diff --git a/site.yml b/site.yml
index fe99e5e..cb99d7e 100644
--- a/site.yml
+++ b/site.yml
@@ -137,6 +137,9 @@ content:
start_path: extensions/core/h2console/src/main/doc # other
branches: HEAD
- url: .
+ start_path: extensions/core/hsqldbmgr/src/main/doc # other
+ branches: HEAD
+ - url: .
start_path: extensions/security/secman/src/main/doc # security secman
branches: HEAD
- url: .
[isis] 04/09: ISIS-2205: deletes PropertyResource from applib,
doesn't seem to be used anymore
Posted by da...@apache.org.
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 ca635ccbc24532a2d53e6e03483608a0cf79775d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 09:22:52 2019 +0000
ISIS-2205: deletes PropertyResource from applib, doesn't seem to be used anymore
---
.../org/apache/isis/applib/PropertyResource.java | 73 ----------------------
1 file changed, 73 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/PropertyResource.java b/core/applib/src/main/java/org/apache/isis/applib/PropertyResource.java
deleted file mode 100644
index 84af182..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/PropertyResource.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.applib;
-
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Properties;
-
-public final class PropertyResource {
- private final Class<?> resourceContext;
- private final String resourceName;
-
- /**
- * @since 2.0
- */
- public static PropertyResource ofClassContext(final Class<?> resourceContext, final String resourceName) {
- return new PropertyResource(resourceContext, resourceName);
- }
-
- PropertyResource(final Class<?> resourceContext, final String resourceName) {
- this.resourceContext = resourceContext;
- this.resourceName = resourceName;
- }
-
- /**
- * @since 2.0
- */
- public Class<?> getResourceContext() {
- return resourceContext;
- }
-
- /**
- * @since 2.0
- */
- public String getResourceName() {
- return resourceName;
- }
-
- void loadPropsInto(final Map<String, String> props) {
-
- final Properties properties = new Properties();
- try {
- try (final InputStream stream = resourceContext.getResourceAsStream(resourceName)) {
- properties.load(stream);
- for (Object key : properties.keySet()) {
- final Object value = properties.get(key);
- if (key instanceof String && value instanceof String) {
- props.put((String) key, (String) value);
- }
- }
- }
- } catch (Exception e) {
- throw new RuntimeException(
- String.format("Failed to load '%s' file relative to %s", getResourceName(), getResourceContext().getName()), e);
- }
- }
-}
[isis] 07/09: ISIS-2208: moves h2 console into new isis extension
Posted by da...@apache.org.
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 032a49016e518c459e158563c8604e69ce21cf09
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 10:59:05 2019 +0000
ISIS-2208: moves h2 console into new isis extension
---
.../isis-configurations-and-modules.pptx | Bin 47861 -> 48551 bytes
antora/playbooks/site-other.yml | 3 ++
.../org/apache/isis/webapp/IsisBootWebApp.java | 6 ---
extensions/persistence/h2console/pom.xml | 47 +++++++++++++++++++++
.../persistence/h2console/src/main/doc/antora.yml | 2 +
.../src/main/doc/modules/spring/_attributes.adoc | 6 +++
.../main/doc/modules/spring/attachments/.gitkeep | 0
.../src/main/doc/modules/spring/examples/.gitkeep | 0
.../src/main/doc/modules/spring/images/.gitkeep | 0
.../h2console/src/main/doc/modules/spring/nav.adoc | 2 +
.../main/doc/modules/spring/pages/_attributes.adoc | 4 ++
.../src/main/doc/modules/spring/pages/about.adoc | 6 +++
.../doc/modules/spring/partials/_attributes.adoc | 4 ++
.../doc/modules/spring/partials/module-nav.adoc | 3 ++
.../h2console/IsisExtH2ConsoleModule.java | 28 ++++--------
.../h2console/services}/H2ManagerMenu.java | 20 ++++-----
.../h2console/webmodule}/WebModuleH2Console.java | 2 +-
extensions/pom.xml | 6 +++
site.yml | 3 ++
19 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index b448bcd..b8086de 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/antora/playbooks/site-other.yml b/antora/playbooks/site-other.yml
index 9e11933..65ab8c6 100644
--- a/antora/playbooks/site-other.yml
+++ b/antora/playbooks/site-other.yml
@@ -40,6 +40,9 @@ content:
- url: .
start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
+ - url: .
+ start_path: extensions/core/h2console/src/main/doc # other
+ branches: HEAD
ui:
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
index 9dc4a2a..d7be97d 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
@@ -21,8 +21,6 @@ package org.apache.isis.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.modules.h2console.H2ManagerMenu;
-import org.apache.isis.webapp.modules.h2console.WebModuleH2Console;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
@@ -37,10 +35,6 @@ import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
// static html template preprocessing
WebModuleTemplateResources.class,
- // h2 console
- WebModuleH2Console.class,
- H2ManagerMenu.class,
-
})
public class IsisBootWebApp {
diff --git a/extensions/persistence/h2console/pom.xml b/extensions/persistence/h2console/pom.xml
new file mode 100644
index 0000000..40fec45
--- /dev/null
+++ b/extensions/persistence/h2console/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-extensions-h2console</artifactId>
+ <name>Apache Isis Ext - H2 Console</name>
+ <description>Menu and configuration to open up H2 Console</description>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.h2console</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/h2console</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/extensions/persistence/h2console/src/main/doc/antora.yml b/extensions/persistence/h2console/src/main/doc/antora.yml
new file mode 100644
index 0000000..eeeeb1e
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: extensions
+version: master
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc
new file mode 100644
index 0000000..43cb529
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/_attributes.adoc
@@ -0,0 +1,6 @@
+ifndef::env-site,env-github[]
+:attachmentsdir: {moduledir}/attachments
+:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
+endif::[]
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/attachments/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/spring/attachments/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/examples/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/spring/examples/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep b/extensions/persistence/h2console/src/main/doc/modules/spring/images/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/nav.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/nav.adoc
new file mode 100644
index 0000000..c6c7e34
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/nav.adoc
@@ -0,0 +1,2 @@
+include::extensions:h2console:partial$component-nav.adoc[]
+
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/pages/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/pages/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc
new file mode 100644
index 0000000..883c317
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/pages/about.adoc
@@ -0,0 +1,6 @@
+= H2 Console
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+include::_attributes.adoc[]
+
+TODO
+
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/partials/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc
new file mode 100644
index 0000000..35e1cca
--- /dev/null
+++ b/extensions/persistence/h2console/src/main/doc/modules/spring/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:spring:about.adoc[Spring (extension)]
+
+
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java
similarity index 59%
copy from core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
copy to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java
index 9dc4a2a..f4b6e1b 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/IsisBootWebApp.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java
@@ -16,32 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp;
+package org.apache.isis.extensions.h2console;
+import org.apache.isis.extensions.h2console.services.H2ManagerMenu;
+import org.apache.isis.extensions.h2console.webmodule.WebModuleH2Console;
+import org.apache.isis.webapp.IsisBootWebApp;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.modules.h2console.H2ManagerMenu;
-import org.apache.isis.webapp.modules.h2console.WebModuleH2Console;
-import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
-import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
-
@Configuration
@Import({
- IsisWebAppContextListener.class,
- IsisWebAppContextInitializer.class,
-
- // default modules
- WebModuleLogOnExceptionLogger.class,
-
- // static html template preprocessing
- WebModuleTemplateResources.class,
-
- // h2 console
- WebModuleH2Console.class,
- H2ManagerMenu.class,
-
+ IsisBootWebApp.class
})
-public class IsisBootWebApp {
+@ComponentScan
+public class IsisExtH2ConsoleModule {
}
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/H2ManagerMenu.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java
similarity index 83%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/H2ManagerMenu.java
rename to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java
index 0b80143..8f9f716 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/H2ManagerMenu.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.h2console;
+package org.apache.isis.extensions.h2console.services;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.isis.applib.IsisApplibModule;
@@ -32,10 +31,11 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.value.LocalResourcePath;
+import org.apache.isis.extensions.h2console.webmodule.WebModuleH2Console;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "isisApplib.H2ManagerMenu"
+ objectType = "isisExtH2Console.H2ManagerMenu"
)
@DomainServiceLayout(
named = "Prototyping",
@@ -43,15 +43,13 @@ import org.apache.isis.applib.value.LocalResourcePath;
)
public class H2ManagerMenu {
- @Inject private ServiceRegistry serviceRegistry;
+ private final ServiceRegistry serviceRegistry;
+ private final WebModuleH2Console webModule;
- private WebModuleH2Console webModule;
-
- @PostConstruct
- public void init() {
- webModule = serviceRegistry.select(WebModuleH2Console.class)
- .getFirst()
- .orElse(null);
+ @Inject
+ public H2ManagerMenu(final ServiceRegistry serviceRegistry, final WebModuleH2Console webModule) {
+ this.serviceRegistry = serviceRegistry;
+ this.webModule = webModule;
}
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java
similarity index 98%
rename from core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
rename to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java
index 8ab50cf..05521f7 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/h2console/WebModuleH2Console.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.h2console;
+package org.apache.isis.extensions.h2console.webmodule;
import javax.inject.Inject;
import javax.servlet.ServletContext;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index f01cc35..27978e6 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -133,6 +133,11 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-h2console</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -186,6 +191,7 @@
<modules>
<module>core/spring</module>
+ <module>persistence/h2console</module>
<module>security/secman</module>
<module>testing/fixtures</module>
<module>testing/specsupport</module>
diff --git a/site.yml b/site.yml
index a20a5df..fe99e5e 100644
--- a/site.yml
+++ b/site.yml
@@ -134,6 +134,9 @@ content:
start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
- url: .
+ start_path: extensions/core/h2console/src/main/doc # other
+ branches: HEAD
+ - url: .
start_path: extensions/security/secman/src/main/doc # security secman
branches: HEAD
- url: .