You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/23 12:03:59 UTC
[isis] 07/08: ISIS-2062: sync adoc
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 911cb3966f67376953dc8282db646e975893324d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 22 17:40:56 2020 +0000
ISIS-2062: sync adoc
(cherry picked from commit 5db29ab999b47a5890c7072901a093e61b6cb493)
---
.../layout/component/ActionLayoutDataOwner.java | 4 ++-
.../layout/component/CollectionLayoutData.java | 21 ++++++++-------
.../examples/layout/component/FieldSet.java | 31 ++++++++++++----------
.../layout/component/PropertyLayoutData.java | 14 ++++++----
.../examples/layout/grid/bootstrap3/BS3Col.java | 15 ++++++-----
.../config/examples/generated/resteasy.adoc | 10 +++++++
6 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
index c4b07bb..c4153d0 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
@@ -21,6 +21,8 @@ package org.apache.isis.applib.layout.component;
import java.util.List;
public interface ActionLayoutDataOwner extends Owner {
+
List<ActionLayoutData> getActions();
- void setActions(List<ActionLayoutData> actions);
+ void addAction(ActionLayoutData actionLayoutData);
+
}
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
index 46d4bb2..6991c75 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
@@ -19,17 +19,18 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
+import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
@@ -196,23 +197,23 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.sortedBy = sortedBy;
}
-
-
- private List<ActionLayoutData> actions = new ArrayList<>();
+ private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
// no wrapper
@Override
- @XmlElement(name = "action", required = false)
+ @XmlElementRef(type = ActionLayoutData.class, name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions;
+ return actions.snapshot();
}
- @Override
public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions = actionLayoutDatas;
+ this.actions.replace(actionLayoutDatas);
+ }
+
+ @Override
+ public void addAction(ActionLayoutData actionLayoutData) {
+ this.actions.add(actionLayoutData);
}
-
-
private CollectionLayoutDataOwner owner;
/**
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
index 335d65a..c5e071b 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
@@ -19,7 +19,6 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -30,6 +29,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
+import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* A {@link MemberRegion region} of the page containing a set of
@@ -133,36 +133,39 @@ Serializable {
this.name = name;
}
-
-
- private List<ActionLayoutData> actions = new ArrayList<>();
+ private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
// no wrapper
@Override
@XmlElement(name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions;
+ return actions.snapshot();
}
- @Override
public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions = actionLayoutDatas;
+ this.actions.replace(actionLayoutDatas);
}
-
-
-
- private List<PropertyLayoutData> properties = new ArrayList<>();
+
+ @Override
+ public void addAction(ActionLayoutData actionLayoutData) {
+ this.actions.add(actionLayoutData);
+ }
+
+ private _ConcurrentListWrapper<PropertyLayoutData> properties = new _ConcurrentListWrapper<>();
// no wrapper; required=false because may be auto-generated
@XmlElement(name = "property", required = false)
public List<PropertyLayoutData> getProperties() {
- return properties;
+ return properties.snapshot();
}
public void setProperties(List<PropertyLayoutData> properties) {
- this.properties = properties;
+ this.properties.replace(properties);
+ }
+
+ public void addProperty(PropertyLayoutData actionLayoutData) {
+ this.properties.add(actionLayoutData);
}
-
private FieldSetOwner owner;
/**
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
index 817a6aa..a782ff4 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
@@ -19,7 +19,6 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -34,6 +33,7 @@ import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
+import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
@@ -234,18 +234,22 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.repainting = repainting;
}
- private List<ActionLayoutData> actions = new ArrayList<>();
+ private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
// no wrapper
@Override
@XmlElement(name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions;
+ return actions.snapshot();
}
- @Override
public void setActions(List<ActionLayoutData> actionLayoutDatas) {
- this.actions = actionLayoutDatas;
+ this.actions.replace(actionLayoutDatas);
+ }
+
+ @Override
+ public void addAction(ActionLayoutData actionLayoutData) {
+ this.actions.add(actionLayoutData);
}
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
index 7f44432..439b9b1 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
@@ -35,6 +35,7 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.FieldSetOwner;
+import org.apache.isis.core.commons.internal.concurrent._ConcurrentListWrapper;
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
@@ -171,23 +172,25 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
}
-
- private List<ActionLayoutData> actions = new ArrayList<>();
+ private _ConcurrentListWrapper<ActionLayoutData> actions = new _ConcurrentListWrapper<>();
// no wrapper
@Override
@XmlElementRef(type = ActionLayoutData.class, name = "action", required = false)
public List<ActionLayoutData> getActions() {
- return actions;
+ return actions.snapshot();
}
+ public void setActions(List<ActionLayoutData> actionLayoutDatas) {
+ this.actions.replace(actionLayoutDatas);
+ }
+
@Override
- public void setActions(final List<ActionLayoutData> actions) {
- this.actions = actions;
+ public void addAction(ActionLayoutData actionLayoutData) {
+ this.actions.add(actionLayoutData);
}
-
private List<BS3Row> rows = new ArrayList<>();
// no wrapper
diff --git a/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc b/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
index 644481d..250cd05 100644
--- a/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
+++ b/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
@@ -6,6 +6,16 @@
|
|
+| resteasy.jaxrs.app. +
+registration
+|
+|
+
+| resteasy.jaxrs.default-path
+| /restful
+| Note that this is used rather than `resteasy.servlet.mapping.prefix` because there is _NO_ implementation of ``javax.ws.rs.core.Application``, so we rely on it being automatically created.
+
+
| resteasy.resteasy-settings
|
|