You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2023/01/25 11:05:23 UTC
[isis] branch spring6 updated (f23fedb00b -> 56a9d5d8d3)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from f23fedb00b Merge remote-tracking branch 'origin/master' into spring6
add 350bd2c7da ISIS-3328: factor out the doc stuff into its own dedicated module
new 56a9d5d8d3 Merge remote-tracking branch 'origin/master' into spring6
The 1 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:
bom/pom.xml | 9 +++++++
.../runtimeservices/src/main/java/module-info.java | 1 -
.../CausewayModuleCoreRuntimeServices.java | 4 ----
examples/demo/domain/pom.xml | 4 ++++
.../main/java/demoapp/dom/DemoModuleCommon.java | 2 ++
.../src/main/java/demoapp/dom/menubars.layout.xml | 2 +-
.../core/docgen}/pom.xml | 28 +++++++++++++---------
.../docgen/CausewayModuleExtDocgen.java} | 13 ++++++----
.../extensions/docgen/help}/DefaultHelpVm.java | 6 ++---
.../docgen/help}/DefaultHelpVm.layout.xml | 0
.../docgen/help}/DocumentationService.java | 4 +++-
.../docgen/help}/DocumentationServiceDefault.java | 6 ++---
.../extensions/docgen/menu}/DocumentationMenu.java | 7 +++---
extensions/pom.xml | 1 +
14 files changed, 56 insertions(+), 31 deletions(-)
copy {testing/archtestsupport => extensions/core/docgen}/pom.xml (58%)
copy extensions/{security/secman/encryption-jbcrypt/src/main/java/org/apache/causeway/extensions/secman/encryption/jbcrypt/CausewayModuleExtSecmanEncryptionJbcrypt.java => core/docgen/src/main/java/org/apache/causeway/extensions/docgen/CausewayModuleExtDocgen.java} (69%)
rename {core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui => extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help}/DefaultHelpVm.java (91%)
rename {core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui => extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help}/DefaultHelpVm.layout.xml (100%)
rename {core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui => extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help}/DocumentationService.java (90%)
rename {core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui => extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help}/DocumentationServiceDefault.java (98%)
rename {core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/helpui => extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu}/DocumentationMenu.java (91%)
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 56a9d5d8d3da1f14440438572b3ae9a66ad719a9
Merge: f23fedb00b 350bd2c7da
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 25 12:05:17 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
bom/pom.xml | 9 +++++
.../runtimeservices/src/main/java/module-info.java | 1 -
.../CausewayModuleCoreRuntimeServices.java | 4 ---
examples/demo/domain/pom.xml | 4 +++
.../main/java/demoapp/dom/DemoModuleCommon.java | 2 ++
.../src/main/java/demoapp/dom/menubars.layout.xml | 2 +-
extensions/core/docgen/pom.xml | 40 ++++++++++++++++++++++
.../extensions/docgen/CausewayModuleExtDocgen.java | 26 ++++++++------
.../extensions/docgen/help}/DefaultHelpVm.java | 6 ++--
.../docgen/help}/DefaultHelpVm.layout.xml | 0
.../docgen/help}/DocumentationService.java | 4 ++-
.../docgen/help}/DocumentationServiceDefault.java | 6 ++--
.../extensions/docgen/menu}/DocumentationMenu.java | 7 ++--
extensions/pom.xml | 1 +
14 files changed, 86 insertions(+), 26 deletions(-)
diff --cc bom/pom.xml
index 7dc247973d,1720305b1d..174e6039d4
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -798,6 -790,15 +798,15 @@@ It is therefore a copy of org.apache:ap
<type>jar</type>
<scope>compile</scope>
</dependency>
+
+ <!-- org.apache.causeway.extensions (docgen) -->
+ <dependency>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions-docgen</artifactId>
- <version>2.0.0-SNAPSHOT</version>
++ <version>3.0.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
<!-- org.apache.causeway.extensions (excel) -->
<dependency>
diff --cc extensions/core/docgen/pom.xml
index 0000000000,7a5316d456..de03b3aee5
mode 000000,100644..100644
--- a/extensions/core/docgen/pom.xml
+++ b/extensions/core/docgen/pom.xml
@@@ -1,0 -1,40 +1,40 @@@
+ <?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
++ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>causeway-extensions-docgen</artifactId>
+ <name>Apache Causeway Ext - Docgen</name>
+
+ <description>
+ Provides a set of code mining features that can help building documentation for your application.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-core-metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes-asciidoc-applib</artifactId>
+ </dependency>
+ </dependencies>
+
+ </project>
diff --cc extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
index 15860043b9,7294b520a0..512ee6885b
--- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
+++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/help/DefaultHelpVm.java
@@@ -16,10 -16,10 +16,10 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.causeway.core.runtimeservices.helpui;
+ package org.apache.causeway.extensions.docgen.help;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.ViewModel;
import org.apache.causeway.applib.annotation.DomainObject;
diff --cc extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
index b72d8d056f,83b92a5719..06eff442bc
--- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
+++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/menu/DocumentationMenu.java
@@@ -16,10 -16,10 +16,10 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.causeway.core.runtimeservices.helpui;
+ package org.apache.causeway.extensions.docgen.menu;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Action;