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:46 UTC
[isis] 08/09: ISIS-2208: moves hsqldbmgrmenu from runtime-services
to isis extensions
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: .