You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/09/20 13:45:25 UTC
[isis] branch master updated: ISIS-2222: updates doc examples and
generated config ref docs
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
The following commit(s) were added to refs/heads/master by this push:
new 0a64407 ISIS-2222: updates doc examples and generated config ref docs
0a64407 is described below
commit 0a6440732d7da7755dbf9995ae1ae4841cc61a8f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 20 14:20:31 2020 +0100
ISIS-2222: updates doc examples and generated config ref docs
---
antora/playbooks/site-extensions.yml | 3 -
antora/playbooks/site.yml | 3 -
.../applib-classes/examples/util/JaxbAdapters.java | 356 ---------------------
.../examples/util/schema/CommandDtoUtils.java | 8 +
.../command/spi/CommandServiceListener.java | 27 ++
.../conmap/ContentMappingServiceForCommandDto.java | 9 +-
.../services/registry/ServiceRegistry.java | 10 +-
.../config/pages/sections/isis.extensions.adoc | 51 ++-
.../modules/config/pages/sections/resteasy.adoc | 19 ++
.../model-annotation/adoc/modules/model/nav.adoc | 4 -
.../adoc/modules/model/pages/about.adoc | 5 -
.../adoc/modules/model/partials/module-nav.adoc | 7 -
scripts/ci/_adoc-gen-config.sh | 2 +-
13 files changed, 85 insertions(+), 419 deletions(-)
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index c4aef14..2a691f6 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -38,9 +38,6 @@ content:
branches: HEAD
- url: .
- start_path: extensions/core/model-annotation/adoc # extensions
- branches: HEAD
- - url: .
start_path: extensions/core/command-log/adoc # extensions
branches: HEAD
- url: .
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index b4473fb..a5c1bde 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -103,9 +103,6 @@ content:
branches: HEAD
- url: .
- start_path: extensions/core/model-annotation/adoc # extensions
- branches: HEAD
- - url: .
start_path: extensions/core/command-log/adoc # extensions
branches: HEAD
- url: .
diff --git a/api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbAdapters.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbAdapters.java
deleted file mode 100644
index a2479ac..0000000
--- a/api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbAdapters.java
+++ /dev/null
@@ -1,356 +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.util;
-
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.ZonedDateTime;
-import java.util.Base64;
-
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.apache.isis.applib.value.Blob;
-import org.apache.isis.applib.value.Clob;
-import org.apache.isis.applib.value.Markup;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
-
-/**
- * Provides JAXB XmlAdapters for Java built-in temporal types.
- * Others types might be added, if convenient.
- * <p>
- *
- * Example:<pre>
- * @XmlElement @XmlJavaTypeAdapter(JaxbAdapters.LocalDateAdapter.class)
- * @Getter @Setter private LocalDate javaLocalDate;
- * </pre>
- *
- *
- * @since 2.0
- */
-public final class JaxbAdapters {
-
- // -- BYTES
-
- /**
- * Uses compression. (thread-safe)
- */
- public static final class BytesAdapter extends XmlAdapter<String, byte[]> {
-
- @Override
- public byte[] unmarshal(String v) throws Exception {
- return _Bytes.ofCompressedUrlBase64.apply(_Strings.toBytes(v, StandardCharsets.UTF_8));
- }
-
- @Override
- public String marshal(byte[] v) throws Exception {
- return _Strings.ofBytes(_Bytes.asCompressedUrlBase64.apply(v), StandardCharsets.UTF_8);
- }
-
- }
-
- // -- MARKUP
-
- public static final class MarkupAdapter extends XmlAdapter<String, Markup> {
-
- /**
- * Is threadsafe, see <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Base64.Encoder.html">JDK8 javadocs</a>
- */
- private final Base64.Encoder encoder = Base64.getEncoder();
- /**
- * Is threadsafe, see <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Base64.Decoder.html">JDK8 javadocs</a>
- */
- private final Base64.Decoder decoder = Base64.getDecoder(); // is thread-safe ?
-
- @Override
- public Markup unmarshal(String v) throws Exception {
- if(v==null) {
- return null;
- }
- final String html = _Strings.ofBytes(decoder.decode(v), StandardCharsets.UTF_8);
- return new Markup(html);
- }
-
- @Override
- public String marshal(Markup v) throws Exception {
- if(v==null) {
- return null;
- }
- final String html = v.asHtml();
- return encoder.encodeToString(_Strings.toBytes(html, StandardCharsets.UTF_8));
- }
- }
-
- // -- BLOB
-
- /**
- * (thread-safe)
- * @implNote see also BlobValueSemanticsProvider
- */
- public static final class BlobAdapter extends XmlAdapter<String, Blob> {
-
- private final BytesAdapter bytesAdapter = new BytesAdapter(); // thread-safe
-
- @Override
- public Blob unmarshal(String data) throws Exception {
- if(data==null) {
- return null;
- }
- final int colonIdx = data.indexOf(':');
- final String name = data.substring(0, colonIdx);
- final int colon2Idx = data.indexOf(":", colonIdx+1);
- final String mimeTypeBase = data.substring(colonIdx+1, colon2Idx);
- final String payload = data.substring(colon2Idx+1);
- final byte[] bytes = bytesAdapter.unmarshal(payload);
- try {
- return new Blob(name, new MimeType(mimeTypeBase), bytes);
- } catch (MimeTypeParseException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public String marshal(Blob blob) throws Exception {
- if(blob==null) {
- return null;
- }
- return new StringBuilder()
- .append(blob.getName())
- .append(':')
- .append(blob.getMimeType().getBaseType())
- .append(':')
- .append(bytesAdapter.marshal(blob.getBytes()))
- .toString();
- }
-
- }
-
- // -- CLOB
-
- /**
- * (thread-safe)
- * @implNote see also ClobValueSemanticsProvider
- */
- public static final class ClobAdapter extends XmlAdapter<String, Clob> {
-
- private final BytesAdapter bytesAdapter = new BytesAdapter(); // thread-safe
-
- @Override
- public Clob unmarshal(String data) throws Exception {
- if(data==null) {
- return null;
- }
- final int colonIdx = data.indexOf(':');
- final String name = data.substring(0, colonIdx);
- final int colon2Idx = data.indexOf(":", colonIdx+1);
- final String mimeTypeBase = data.substring(colonIdx+1, colon2Idx);
- final String payload = data.substring(colon2Idx+1);
- final byte[] bytes = bytesAdapter.unmarshal(payload);
- try {
- return new Clob(name, new MimeType(mimeTypeBase), new String(bytes, StandardCharsets.UTF_8));
- } catch (MimeTypeParseException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public String marshal(Clob clob) throws Exception {
- if(clob==null) {
- return null;
- }
- return new StringBuilder()
- .append(clob.getName())
- .append(':')
- .append(clob.getMimeType().getBaseType())
- .append(':')
- .append(bytesAdapter.marshal(clob.getChars().toString().getBytes(StandardCharsets.UTF_8)))
- .toString();
- }
-
- }
-
-
-
- // -- TEMPORAL VALUE TYPES
-
- public static final class DateAdapter extends XmlAdapter<String, java.util.Date> {
-
- @Override
- public java.util.Date unmarshal(String v) throws Exception {
- return v!=null ? new java.util.Date(Long.parseLong(v)) : null;
- }
-
- @Override
- public String marshal(java.util.Date v) throws Exception {
- return v!=null ? Long.toString(v.getTime()) : null;
- }
-
- }
-
- public static final class SqlDateAdapter extends XmlAdapter<String, java.sql.Date> {
-
- @Override
- public java.sql.Date unmarshal(String v) throws Exception {
- return v!=null ? java.sql.Date.valueOf(v) : null;
- }
-
- @Override
- public String marshal(java.sql.Date v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class SqlTimestampAdapter extends XmlAdapter<String, java.sql.Timestamp> {
-
- @Override
- public java.sql.Timestamp unmarshal(String v) throws Exception {
- return v!=null ? new java.sql.Timestamp(Long.parseLong(v)) : null;
- }
-
- @Override
- public String marshal(java.sql.Timestamp v) throws Exception {
- return v!=null ? Long.toString(v.getTime()) : null;
- }
-
- }
-
- public static final class LocalTimeAdapter extends XmlAdapter<String, LocalTime> {
-
- @Override
- public LocalTime unmarshal(String v) throws Exception {
- return v!=null ? LocalTime.parse(v) : null;
- }
-
- @Override
- public String marshal(LocalTime v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class LocalDateAdapter extends XmlAdapter<String, LocalDate> {
-
- @Override
- public LocalDate unmarshal(String v) throws Exception {
- return v!=null ? LocalDate.parse(v) : null;
- }
-
- @Override
- public String marshal(LocalDate v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class LocalDateTimeAdapter extends XmlAdapter<String, LocalDateTime> {
-
- @Override
- public LocalDateTime unmarshal(String v) throws Exception {
- return v!=null ? LocalDateTime.parse(v) : null;
- }
-
- @Override
- public String marshal(LocalDateTime v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class OffsetTimeAdapter extends XmlAdapter<String, OffsetTime> {
-
- @Override
- public OffsetTime unmarshal(String v) throws Exception {
- return v!=null ? OffsetTime.parse(v) : null;
- }
-
- @Override
- public String marshal(OffsetTime v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class OffsetDateTimeAdapter extends XmlAdapter<String, OffsetDateTime> {
-
- @Override
- public OffsetDateTime unmarshal(String v) throws Exception {
- return v!=null ? OffsetDateTime.parse(v) : null;
- }
-
- @Override
- public String marshal(OffsetDateTime v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class ZonedDateTimeAdapter extends XmlAdapter<String, ZonedDateTime> {
-
- @Override
- public ZonedDateTime unmarshal(String v) throws Exception {
- return v!=null ? ZonedDateTime.parse(v) : null;
- }
-
- @Override
- public String marshal(ZonedDateTime v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class DurationAdapter extends XmlAdapter<String, Duration> {
-
- @Override
- public Duration unmarshal(String v) throws Exception {
- return v!=null ? Duration.parse(v) : null;
- }
-
- @Override
- public String marshal(Duration v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
- public static final class PeriodAdapter extends XmlAdapter<String, Period> {
-
- @Override
- public Period unmarshal(String v) throws Exception {
- return v!=null ? Period.parse(v) : null;
- }
-
- @Override
- public String marshal(Period v) throws Exception {
- return v!=null ? v.toString() : null;
- }
-
- }
-
-
-
-}
diff --git a/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java
index 635c12c..ea5e56f 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java
@@ -152,6 +152,14 @@ public final class CommandDtoUtils {
setUserData(dto, key, bookmark.toString());
}
+ public static void clearUserData(
+ final CommandDto dto, final String key) {
+ if(dto == null || key == null) {
+ return;
+ }
+ userDataFor(dto).getEntry().removeIf(x -> x.getKey().equals(key));
+ }
+
private static MapDto userDataFor(final CommandDto commandDto) {
MapDto userData = commandDto.getUserData();
if(userData == null) {
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandServiceListener.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandServiceListener.java
index 5d10793..ba6b727 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandServiceListener.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandServiceListener.java
@@ -18,8 +18,18 @@
*/
package org.apache.isis.applib.services.command.spi;
+import javax.inject.Named;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.command.Command;
+import lombok.extern.log4j.Log4j2;
+
/**
* SPI
*/
@@ -36,5 +46,22 @@ public interface CommandServiceListener {
*/
// tag::refguide[]
void onComplete(final Command command); // <.>
+
+ /**
+ * At least one implementation is required to satisfy injection point into
+ * {@link org.apache.isis.applib.services.command.CommandService}.
+ */
+ @Service
+ @Named("isisApplib.CommandServiceListenerNull")
+ @Order(OrderPrecedence.LATE)
+ @Qualifier("Null")
+ @Log4j2
+ public static class Null implements CommandServiceListener {
+
+ @Override
+ public void onComplete(Command command) {
+
+ }
+ }
}
// end::refguide[]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/commanddto/conmap/ContentMappingServiceForCommandDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
index 754db16..9fd3a67 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/commanddto/conmap/ContentMappingServiceForCommandDto.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.applib.services.commanddto.conmap;
-import java.sql.Timestamp;
import java.util.List;
import javax.inject.Inject;
@@ -31,18 +30,12 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
-import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.commanddto.HasCommandDto;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
-import org.apache.isis.applib.services.conmap.ContentMappingService;
import org.apache.isis.applib.services.commanddto.processor.spi.CommandDtoProcessorService;
+import org.apache.isis.applib.services.conmap.ContentMappingService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.applib.util.schema.CommandDtoUtils;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.cmd.v2.CommandDto;
-import org.apache.isis.schema.common.v2.PeriodDto;
import lombok.val;
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
index e94e27e..29d8f52 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
@@ -31,7 +31,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Reduction;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.commons.internal.ioc._ManagedBeanAdapter;
import org.apache.isis.commons.internal.reflection._Reflect;
import lombok.val;
@@ -76,7 +76,7 @@ public interface ServiceRegistry {
* Streams all registered bean adapters implementing the requested type.
*/
// tag::refguide[]
- default Stream<ManagedBeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType) {
+ default Stream<_ManagedBeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType) {
// end::refguide[]
return streamRegisteredBeans()
@@ -91,7 +91,7 @@ public interface ServiceRegistry {
* Returns all bean adapters that have been registered.
*/
// tag::refguide[]
- Stream<ManagedBeanAdapter> streamRegisteredBeans();
+ Stream<_ManagedBeanAdapter> streamRegisteredBeans();
// end::refguide[]
/**
@@ -100,7 +100,7 @@ public interface ServiceRegistry {
* @param id - corresponds to the ObjectSpecificationId of the bean's type
*/
// tag::refguide[]
- Optional<ManagedBeanAdapter> lookupRegisteredBeanById(String id);
+ Optional<_ManagedBeanAdapter> lookupRegisteredBeanById(String id);
// end::refguide[]
/**
@@ -109,7 +109,7 @@ public interface ServiceRegistry {
* @param id - corresponds to the ObjectSpecificationId of the bean's type
*/
// tag::refguide[]
- default ManagedBeanAdapter lookupRegisteredBeanByIdElseFail(String id) {
+ default _ManagedBeanAdapter lookupRegisteredBeanByIdElseFail(String id) {
return lookupRegisteredBeanById(id).orElseThrow(
()->_Exceptions.unrecoverable(
"Failed to lookup BeanAdapter by id '" + id + "'"));
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.extensions.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.extensions.adoc
index 9f3426a..f744199 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/isis.extensions.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.extensions.adoc
@@ -12,73 +12,71 @@ include::../section-hooks/isis.extensions~pre.adoc[]
|Default
|Description
|
-[[isis.extensions.command-replay.primary.base-url]]
+[[isis.extensions.command-replay.analyser.exception.enabled]]
isis.extensions.command-replay. +
-primary.base-url
+analyser.exception.enabled
-|
+| true
| null
|
-[[isis.extensions.command-replay.primary.base-url-end-user]]
+[[isis.extensions.command-replay.analyser.result.enabled]]
isis.extensions.command-replay. +
-primary.base-url-end-user
+analyser.result.enabled
-|
+| true
| null
|
-[[isis.extensions.command-replay.primary.batch-size]]
+[[isis.extensions.command-replay.batch-size]]
isis.extensions.command-replay. +
-primary.batch-size
+batch-size
| 10
| null
|
-[[isis.extensions.command-replay.primary.password]]
+[[isis.extensions.command-replay.primary-access.base-url-restful]]
isis.extensions.command-replay. +
-primary.password
+primary-access.base-url-restful
|
| null
|
-[[isis.extensions.command-replay.primary.user]]
+[[isis.extensions.command-replay.primary-access.base-url-wicket]]
isis.extensions.command-replay. +
-primary.user
+primary-access.base-url-wicket
|
| null
|
-[[isis.extensions.command-replay.secondary.analyser.exception.enabled]]
+[[isis.extensions.command-replay.primary-access.password]]
isis.extensions.command-replay. +
-secondary.analyser.exception. +
-enabled
+primary-access.password
-| true
+|
| null
|
-[[isis.extensions.command-replay.secondary.analyser.result.enabled]]
+[[isis.extensions.command-replay.primary-access.user]]
isis.extensions.command-replay. +
-secondary.analyser.result.enabled
+primary-access.user
-| true
+|
| null
|
-[[isis.extensions.command-replay.secondary.quartz-replicate-and-replay-job.repeat-interval]]
+[[isis.extensions.command-replay.quartz-replicate-and-replay-job.repeat-interval]]
isis.extensions.command-replay. +
-secondary. +
quartz-replicate-and-replay-job. +
repeat-interval
@@ -87,9 +85,8 @@ repeat-interval
|
-[[isis.extensions.command-replay.secondary.quartz-replicate-and-replay-job.start-delay]]
+[[isis.extensions.command-replay.quartz-replicate-and-replay-job.start-delay]]
isis.extensions.command-replay. +
-secondary. +
quartz-replicate-and-replay-job. +
start-delay
@@ -98,9 +95,9 @@ start-delay
|
-[[isis.extensions.command-replay.secondary.quartz-session.roles]]
+[[isis.extensions.command-replay.quartz-session.roles]]
isis.extensions.command-replay. +
-secondary.quartz-session.roles
+quartz-session.roles
| isisModuleExtCommandReplaySecondar +
yRole
@@ -108,9 +105,9 @@ yRole
|
-[[isis.extensions.command-replay.secondary.quartz-session.user]]
+[[isis.extensions.command-replay.quartz-session.user]]
isis.extensions.command-replay. +
-secondary.quartz-session.user
+quartz-session.user
| isisModuleExtCommandReplaySecondar +
yUser
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc b/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
index 2995e3c..89b3857 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
@@ -20,6 +20,15 @@ resteasy.as-map
|
+[[resteasy.authentication.strategy-class-name]]
+resteasy.authentication. +
+strategy-class-name
+
+|
+| Defaults to ``AuthenticationSessionStrategyBasicAuth``.
+
+
+|
[[resteasy.environment]]
resteasy.environment
@@ -36,6 +45,16 @@ resteasy.jaxrs.app.registration
|
+[[resteasy.jaxrs.default-path]]
+resteasy.jaxrs.default-path
+
+| /restful
+| The path at which the RO viewer should be mounted.
+
+Note that this is used rather than ``prefix`` because there is _NO_ implementation of ``Application``, so we rely on it being automatically created.
+
+
+|
[[resteasy.jaxrs.defaultPath]]
resteasy.jaxrs.defaultPath
diff --git a/extensions/core/model-annotation/adoc/modules/model/nav.adoc b/extensions/core/model-annotation/adoc/modules/model/nav.adoc
deleted file mode 100644
index b978522..0000000
--- a/extensions/core/model-annotation/adoc/modules/model/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-: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::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/core/model-annotation/adoc/modules/model/pages/about.adoc b/extensions/core/model-annotation/adoc/modules/model/pages/about.adoc
deleted file mode 100644
index 427494d..0000000
--- a/extensions/core/model-annotation/adoc/modules/model/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= @Model Support
-
-: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 [...]
-
-WARNING: TODO
diff --git a/extensions/core/model-annotation/adoc/modules/model/partials/module-nav.adoc b/extensions/core/model-annotation/adoc/modules/model/partials/module-nav.adoc
deleted file mode 100644
index 89c2fa2..0000000
--- a/extensions/core/model-annotation/adoc/modules/model/partials/module-nav.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-* xref:incubator:model:about.adoc[@Model]
-
-
-
diff --git a/scripts/ci/_adoc-gen-config.sh b/scripts/ci/_adoc-gen-config.sh
index b4db431..878b7dc 100644
--- a/scripts/ci/_adoc-gen-config.sh
+++ b/scripts/ci/_adoc-gen-config.sh
@@ -64,7 +64,7 @@ else
-o $PROJECT_ROOT_PATH/core/config/src/main/adoc/modules/config/pages/sections
if [ ! -z "${DOS2UNIX_CMD}" ]; then
- for FILE in $PROJECT_ROOT_PATH/core/config/src/main/adoc/modules/config/examples/generated/*
+ for FILE in $PROJECT_ROOT_PATH/core/config/src/main/adoc/modules/config/pages/sections/*
do
${DOS2UNIX_CMD} $FILE
done