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 2016/10/28 07:33:04 UTC
[01/21] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Repository: isis
Updated Branches:
refs/heads/master 3b2c55207 -> f6f10e349
ISIS-1223 Upgrade Wicket to 7.x
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dc976bcd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dc976bcd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dc976bcd
Branch: refs/heads/master
Commit: dc976bcddfb59d0d34b267bee21f02d6a56a0e3c
Parents: c8a61af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 20:27:24 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 20:28:20 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 15 ++---
.../wicket/viewer/IsisWicketApplication.java | 7 +-
.../viewer/settings/IsisResourceSettings.java | 4 +-
.../model/models/BookmarkedPagesModel.java | 2 +-
.../components/about/JarManifestListView.java | 4 +-
.../IsisAjaxFallbackOrderByBorder.java | 3 +-
.../scalars/IsisConverterLocator.java | 4 +-
.../scalars/jdkmath/BigIntegerConverter.java | 68 --------------------
.../jdkmath/JavaMathBigIntegerPanel.java | 5 +-
.../reference/EntityLinkSelect2Panel.java | 2 +-
.../select2/Select2BootstrapCssReference.java | 5 +-
.../widgets/select2/Select2ChoiceUtil.java | 7 +-
.../widgets/select2/Select2JsReference.java | 5 +-
.../wicket/ui/errors/StackTraceListView.java | 4 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 6 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 3 +-
17 files changed, 41 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 089843b..aed6870 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,15 +122,14 @@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>6.20.0</wicket.version>
- <wicketstuff.version>6.20.0</wicketstuff.version>
+ <wicket.version>7.1.0</wicket.version>
+ <wicketstuff.version>7.1.0</wicketstuff.version>
- <wicket-webjars.version>0.4.7</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.13</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.3</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.4</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
- <wicket-select2.version>6.20.0</wicket-select2.version>
- <select2.version>3.5.2</select2.version>
+ <select2.version>4.0.0-2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<guice.version>3.0</guice.version>
@@ -1583,7 +1582,7 @@ ${license.additional-notes}
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicket-select2.version}</version>
+ <version>${wicketstuff.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 192851f..401a4b5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -56,7 +56,7 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
+import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -215,7 +215,7 @@ public class IsisWicketApplication
/**
* Although there are warnings about not overriding this method, it doesn't seem possible
- * to call {@link #setResourceSettings(org.apache.wicket.settings.IResourceSettings)} in the
+ * to call {@link #setResourceSettings(org.apache.wicket.settings.ResourceSettings)} in the
* {@link #init()} method.
*/
@Override
@@ -318,7 +318,6 @@ public class IsisWicketApplication
ApplicationSettings select2Settings = ApplicationSettings.get();
select2Settings.setCssReference(new Select2BootstrapCssReference());
select2Settings.setJavaScriptReference(new Select2JsReference());
- select2Settings.setIncludeJqueryUI(false);
}
private void configureWicketSourcePlugin() {
@@ -347,7 +346,7 @@ public class IsisWicketApplication
settings.setDeferJavascript(false);
Bootstrap.install(this, settings);
- getHeaderContributorListenerCollection().add(new IHeaderContributor() {
+ getHeaderContributorListeners().add(new IHeaderContributor() {
@Override
public void renderHead(IHeaderResponse response) {
BootstrapBaseBehavior bootstrapBaseBehavior = new BootstrapBaseBehavior();
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
index ddb3da6..849b093 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.settings;
import java.util.List;
import org.apache.wicket.Application;
import org.apache.wicket.resource.loader.*;
-import org.apache.wicket.settings.def.ResourceSettings;
+import org.apache.wicket.settings.ResourceSettings;
import org.apache.wicket.util.lang.Generics;
public class IsisResourceSettings extends ResourceSettings {
@@ -91,7 +91,7 @@ public class IsisResourceSettings extends ResourceSettings {
}
/**
- * @see org.apache.wicket.settings.IResourceSettings#getStringResourceLoaders()
+ * @see org.apache.wicket.settings.ResourceSettings#getStringResourceLoaders()
*/
@Override
public List<IStringResourceLoader> getStringResourceLoaders()
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 1a5d614..077c0d6 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
-public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkTreeNode>> {
+public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
index 1565ac9..9224135 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
@@ -30,7 +30,7 @@ public final class JarManifestListView extends ListView<JarManifestAttributes> {
private static final long serialVersionUID = 1L;
private final String idLine;
- public JarManifestListView(String id, String idLine, List<? extends JarManifestAttributes> list) {
+ public JarManifestListView(String id, String idLine, List<JarManifestAttributes> list) {
super(id, list);
this.idLine = idLine;
}
@@ -42,4 +42,4 @@ public final class JarManifestListView extends ListView<JarManifestAttributes> {
item.add(new AttributeAppender("class", detail.getType().name().toLowerCase()));
item.add(label);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
index dedcfdd..92f1b7a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
@@ -21,7 +21,6 @@ import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -36,7 +35,7 @@ public class IsisAjaxFallbackOrderByBorder<T> extends AjaxFallbackOrderByBorder<
private final ISortStateLocator<T> stateLocator;
public IsisAjaxFallbackOrderByBorder(String id, IsisAjaxFallbackDataTable<?, ?> dataTable, T sortProperty, ISortStateLocator<T> stateLocator, IAjaxCallListener ajaxCallListener) {
- super(id, sortProperty, stateLocator, new OrderByLink.VoidCssProvider<T>(), ajaxCallListener);
+ super(id, sortProperty, stateLocator, ajaxCallListener);
this.dataTable = dataTable;
this.stateLocator = stateLocator;
this.sortProperty = sortProperty;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
index 95e1d23..b88d42f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
import org.apache.wicket.Application;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converter.BigIntegerConverter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
@@ -32,7 +33,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverte
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverterForJavaSqlTimestamp;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverterForJavaUtilDate;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.BigDecimalConverterWithScale;
-import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.BigIntegerConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaDateTime;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaLocalDate;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaLocalDateTime;
@@ -86,7 +86,7 @@ public class IsisConverterLocator {
} else if (java.sql.Timestamp.class == correspondingClass) {
converter = new DateConverterForJavaSqlTimestamp(wicketViewerSettings, adjustBy);
} else if (java.math.BigInteger.class == correspondingClass) {
- converter = BigIntegerConverter.INSTANCE;
+ converter = new BigIntegerConverter();
} else if (java.math.BigDecimal.class == correspondingClass) {
final BigDecimalValueFacet facet = objectSpecification.getFacet(BigDecimalValueFacet.class);
Integer scale = null;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
deleted file mode 100644
index 3f581b4..0000000
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
+++ /dev/null
@@ -1,68 +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.viewer.wicket.ui.components.scalars.jdkmath;
-
-import java.math.BigInteger;
-import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converter.AbstractIntegerConverter;
-import org.apache.wicket.util.string.Strings;
-
-public final class BigIntegerConverter extends AbstractIntegerConverter<BigInteger> {
- private static final long serialVersionUID = 1L;
-
- /**
- * The singleton instance for a big integer converter
- * (cf the Wicket subclasses)
- */
- public static final IConverter<BigInteger> INSTANCE = new BigIntegerConverter();
-
- @Override
- public BigInteger convertToObject(String value, Locale locale) throws ConversionException {
- if (Strings.isEmpty(value))
- {
- return null;
- }
-
- final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
-
- if (number instanceof BigInteger)
- {
- return (BigInteger)number;
- }
- else if (number instanceof Long)
- {
- return BigInteger.valueOf(number.longValue());
- }
- else if (number instanceof Integer)
- {
- return BigInteger.valueOf(number.intValue());
- }
- else
- {
- return new BigInteger(value);
- }
- }
-
- @Override
- protected Class<BigInteger> getTargetType() {
- return BigInteger.class;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
index d68038d..f8e948f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converter.BigIntegerConverter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
@@ -40,7 +41,7 @@ public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInte
private static final String ID_SCALAR_VALUE = "scalarValue";
public JavaMathBigIntegerPanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel, BigInteger.class, BigIntegerConverter.INSTANCE);
+ super(id, scalarModel, BigInteger.class, new BigIntegerConverter());
}
@Override
@@ -51,7 +52,7 @@ public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInte
@SuppressWarnings("unchecked")
@Override
public <C> IConverter<C> getConverter(Class<C> type) {
- return (IConverter<C>) (type == BigInteger.class? BigIntegerConverter.INSTANCE: super.getConverter(type));
+ return (IConverter<C>) (type == BigInteger.class? new BigIntegerConverter(): super.getConverter(type));
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
index 8ac459d..4a93f5f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
@@ -60,7 +60,7 @@ class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAdapter> i
}
@Override
- protected void convertInput() {
+ public void convertInput() {
owningPanel.convertInput();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
index 6277b87..3baa87e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
+import java.util.List;
import com.google.common.collect.Lists;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
@@ -36,7 +37,7 @@ public class Select2BootstrapCssReference extends CssResourceReference {
}
@Override
- public Iterable<? extends HeaderItem> getDependencies() {
- return Lists.newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
+ public List<HeaderItem> getDependencies() {
+ return Lists.<HeaderItem>newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index 476286b..0282e1e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -38,7 +38,7 @@ public final class Select2ChoiceUtil {
return select2Choice;
}
- private static class EmptyChoiceProvider extends ChoiceProvider<ObjectAdapterMemento> {
+ private static class EmptyChoiceProvider implements ChoiceProvider<ObjectAdapterMemento> {
private static final EmptyChoiceProvider INSTANCE = new EmptyChoiceProvider();
@@ -56,5 +56,10 @@ public final class Select2ChoiceUtil {
public Collection<ObjectAdapterMemento> toChoices(Collection<String> ids) {
return null;
}
+
+ @Override
+ public void detach() {
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
index 1363267..b454f32 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+import java.util.List;
import com.google.common.collect.Lists;
import org.apache.wicket.Application;
import org.apache.wicket.markup.head.HeaderItem;
@@ -37,8 +38,8 @@ public class Select2JsReference extends WebjarsJavaScriptResourceReference {
}
@Override
- public Iterable<? extends HeaderItem> getDependencies() {
+ public List<HeaderItem> getDependencies() {
ResourceReference jQueryReference = Application.get().getJavaScriptLibrarySettings().getJQueryReference();
- return Lists.newArrayList(JavaScriptHeaderItem.forReference(jQueryReference));
+ return Lists.<HeaderItem>newArrayList(JavaScriptHeaderItem.forReference(jQueryReference));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
index b703a28..64067ce 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
@@ -30,7 +30,7 @@ public final class StackTraceListView extends ListView<StackTraceDetail> {
private static final long serialVersionUID = 1L;
private final String idLine;
- public StackTraceListView(String id, String idLine, List<? extends org.apache.isis.viewer.wicket.ui.errors.StackTraceDetail> list) {
+ public StackTraceListView(String id, String idLine, List<org.apache.isis.viewer.wicket.ui.errors.StackTraceDetail> list) {
super(id, list);
this.idLine = idLine;
}
@@ -42,4 +42,4 @@ public final class StackTraceListView extends ListView<StackTraceDetail> {
item.add(new AttributeAppender("class", detail.getType().name().toLowerCase()));
item.add(label);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 6c1d2ab..5045f7f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -74,7 +74,7 @@ public class MmvErrorPage extends WebPage {
private static final String ID_ERROR = "error";
private static final String ID_ERROR_MESSAGE = "errorMessage";
- public MmvErrorPage(final IModel<List<? extends String>> model) {
+ public MmvErrorPage(final IModel<List<String>> model) {
super(model);
addPageTitle();
addApplicationName();
@@ -82,8 +82,8 @@ public class MmvErrorPage extends WebPage {
}
@SuppressWarnings("unchecked")
- private IModel<List<? extends String>> getModel() {
- return (IModel<List<? extends String>>) getDefaultModel();
+ private IModel<List<String>> getModel() {
+ return (IModel<List<String>>) getDefaultModel();
}
private MarkupContainer addPageTitle() {
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 4815d10..95e715a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
@@ -43,7 +42,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
- implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
+ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
AuthenticationSessionProvider, DeploymentCategoryProvider, PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index bffaa6b..a451490 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -45,7 +44,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
-public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements IHeaderContributor, PersistenceSessionProvider, AuthenticationSessionProvider,
+public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements PersistenceSessionProvider, AuthenticationSessionProvider,
DeploymentCategoryProvider {
private static final long serialVersionUID = 1L;
[16/21] isis git commit: Merge branch 'ISIS-1223-upgrade-to-wicket-7'
into ISIS-1224-select2-v4
Posted by da...@apache.org.
Merge branch 'ISIS-1223-upgrade-to-wicket-7' into ISIS-1224-select2-v4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/55763877
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/55763877
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/55763877
Branch: refs/heads/master
Commit: 5576387731bc74affcc34c5c39899a67c7d71676
Parents: 7b5bfad f4697c6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 25 15:17:08 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 25 15:17:08 2016 +0100
----------------------------------------------------------------------
README.adoc | 9 +-
STATUS | 6 +
adocs/documentation/README.adoc | 2 +-
adocs/documentation/monitor.rb | 42 +-
adocs/documentation/monitor.sh | 2 +-
adocs/documentation/pom.xml | 390 ++++++----
.../_migration-notes_1.10.0-to-1.11.0.adoc | 90 ++-
.../_migration-notes_1.11.0-to-1.12.0.adoc | 20 +
...tes_1.8.0-to-1.9.0_exception-recognizer.adoc | 2 +-
..._fixture-scripts-specification-provider.adoc | 2 +-
.../_migration-notes_1.9.0-to-1.10.0.adoc | 6 +-
.../asciidoc/_powered-by_gesconsultor-grc.adoc | 2 +-
.../main/asciidoc/_release-notes_1.11.0.adoc | 84 ++
.../main/asciidoc/_release-notes_1.11.1.adoc | 20 +
.../main/asciidoc/_release-notes_1.12.0.adoc | 112 +++
.../applib/layout/component/component.xsd | 136 ++++
.../layout/grid/bootstrap3/bootstrap3.xsd | 143 ++++
.../src/main/asciidoc/doap_isis.rdf | 36 +-
.../src/main/asciidoc/documentation.adoc | 96 ++-
.../src/main/asciidoc/downloads.adoc | 12 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 729 -----------------
.../src/main/asciidoc/guides/_cg_asciidoc.adoc | 205 -----
.../main/asciidoc/guides/_cg_building-isis.adoc | 222 ------
.../src/main/asciidoc/guides/_cg_cmd-line.adoc | 9 -
.../guides/_cg_committers-applying-patches.adoc | 90 ---
.../main/asciidoc/guides/_cg_committers.adoc | 28 -
.../_cg_committers_cutting-a-release.adoc | 670 ----------------
.../guides/_cg_committers_key-generation.adoc | 571 --------------
.../_cg_committers_merging-a-pull-request.adoc | 123 ---
.../guides/_cg_committers_pmc-notes.adoc | 71 --
.../_cg_committers_post-release-successful.adoc | 417 ----------
...cg_committers_post-release-unsuccessful.adoc | 94 ---
...ommitters_release-process-for-snapshots.adoc | 88 ---
.../_cg_committers_release-process-prereqs.adoc | 78 --
.../_cg_committers_verifying-releases.adoc | 304 --------
.../main/asciidoc/guides/_cg_contributing.adoc | 255 ------
.../main/asciidoc/guides/_cg_git-cookbook.adoc | 258 -------
.../main/asciidoc/guides/_cg_ide-templates.adoc | 95 ---
.../src/main/asciidoc/guides/_cg_ide.adoc | 19 -
.../main/asciidoc/guides/_cg_ide_agilej.adoc | 55 --
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 160 ----
.../main/asciidoc/guides/_cg_ide_intellij.adoc | 492 ------------
.../asciidoc/guides/_cg_ide_project-lombok.adoc | 50 --
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 75 --
.../guides/_cg_isis-maven-plugin_validate.adoc | 241 ------
.../guides/_cg_isis-maven-plugin_xsd.adoc | 329 --------
.../src/main/asciidoc/guides/_cg_policies.adoc | 14 -
.../guides/_cg_policies_git-policy.adoc | 98 ---
.../guides/_cg_policies_versioning-policy.adoc | 35 -
.../guides/_cgcom-applying-patches.adoc | 90 +++
.../guides/_cgcom_cutting-a-release.adoc | 680 ++++++++++++++++
.../asciidoc/guides/_cgcom_key-generation.adoc | 571 ++++++++++++++
.../guides/_cgcom_merging-a-pull-request.adoc | 123 +++
.../main/asciidoc/guides/_cgcom_pmc-notes.adoc | 71 ++
.../main/asciidoc/guides/_cgcom_policies.adoc | 14 +
.../guides/_cgcom_policies_git-policy.adoc | 98 +++
.../_cgcom_policies_versioning-policy.adoc | 35 +
.../guides/_cgcom_post-release-successful.adoc | 438 +++++++++++
.../_cgcom_post-release-unsuccessful.adoc | 94 +++
.../_cgcom_release-process-for-snapshots.adoc | 88 +++
.../guides/_cgcom_release-process-prereqs.adoc | 88 +++
.../guides/_cgcom_verifying-releases.adoc | 304 ++++++++
.../src/main/asciidoc/guides/_dg_agilej.adoc | 55 ++
.../asciidoc/guides/_dg_asciidoc-templates.adoc | 741 ++++++++++++++++++
.../src/main/asciidoc/guides/_dg_asciidoc.adoc | 205 +++++
.../main/asciidoc/guides/_dg_building-isis.adoc | 294 +++++++
.../src/main/asciidoc/guides/_dg_cmd-line.adoc | 9 +
.../main/asciidoc/guides/_dg_contributing.adoc | 255 ++++++
.../main/asciidoc/guides/_dg_git-cookbook.adoc | 258 +++++++
.../main/asciidoc/guides/_dg_ide-templates.adoc | 95 +++
.../src/main/asciidoc/guides/_dg_ide.adoc | 17 +
.../main/asciidoc/guides/_dg_ide_eclipse.adoc | 160 ++++
.../main/asciidoc/guides/_dg_ide_intellij.adoc | 492 ++++++++++++
.../asciidoc/guides/_dg_project-lombok.adoc | 50 ++
.../src/main/asciidoc/guides/_rgant-Action.adoc | 10 +-
.../guides/_rgant-ActionLayout_named.adoc | 2 +-
.../asciidoc/guides/_rgant-Action_command.adoc | 20 +-
.../guides/_rgant-Action_domainEvent.adoc | 10 +-
.../guides/_rgant-Action_publishing.adoc | 2 +-
.../guides/_rgant-Action_semantics.adoc | 2 +-
.../main/asciidoc/guides/_rgant-Collection.adoc | 2 +-
.../guides/_rgant-CollectionLayout_named.adoc | 2 +-
.../guides/_rgant-Collection_domainEvent.adoc | 10 +-
.../guides/_rgant-Collection_notPersisted.adoc | 2 +-
.../asciidoc/guides/_rgant-Discriminator.adoc | 2 +-
.../asciidoc/guides/_rgant-DomainObject.adoc | 34 +-
.../guides/_rgant-DomainObjectLayout.adoc | 6 +-
...gant-DomainObjectLayout_cssClassUiEvent.adoc | 14 +-
.../_rgant-DomainObjectLayout_iconUiEvent.adoc | 14 +-
.../guides/_rgant-DomainObjectLayout_named.adoc | 2 +-
.../_rgant-DomainObjectLayout_titleUiEvent.adoc | 14 +-
.../guides/_rgant-DomainObject_auditing.adoc | 2 +-
...gant-DomainObject_createdLifecycleEvent.adoc | 10 +-
...rgant-DomainObject_loadedLifecycleEvent.adoc | 6 +-
.../guides/_rgant-DomainObject_nature.adoc | 2 +-
.../guides/_rgant-DomainObject_objectType.adoc | 2 +-
...nt-DomainObject_persistedLifecycleEvent.adoc | 6 +-
...t-DomainObject_persistingLifecycleEvent.adoc | 6 +-
.../guides/_rgant-DomainObject_publishing.adoc | 2 +-
...ant-DomainObject_removingLifecycleEvent.adoc | 6 +-
...gant-DomainObject_updatedLifecycleEvent.adoc | 6 +-
...ant-DomainObject_updatingLifecycleEvent.adoc | 6 +-
.../asciidoc/guides/_rgant-DomainService.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 4 +-
.../src/main/asciidoc/guides/_rgant-Mixin.adoc | 2 +-
.../guides/_rgant-ParameterLayout_named.adoc | 2 +-
.../guides/_rgant-Parameter_regexPattern.adoc | 4 +-
.../guides/_rgant-PersistenceCapable.adoc | 2 +-
.../asciidoc/guides/_rgant-PostConstruct.adoc | 6 +-
.../main/asciidoc/guides/_rgant-PreDestroy.adoc | 2 +-
.../main/asciidoc/guides/_rgant-PrimaryKey.adoc | 2 +-
.../asciidoc/guides/_rgant-Programmatic.adoc | 2 +-
.../main/asciidoc/guides/_rgant-Property.adoc | 2 +-
.../guides/_rgant-PropertyLayout_named.adoc | 2 +-
.../guides/_rgant-Property_domainEvent.adoc | 8 +-
.../guides/_rgant-Property_notPersisted.adoc | 2 +-
.../guides/_rgant-Property_regexPattern.adoc | 6 +-
.../asciidoc/guides/_rgant-RequestScoped.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Title.adoc | 2 +-
.../main/asciidoc/guides/_rgant-ViewModel.adoc | 2 +-
.../guides/_rgant-ViewModelLayout_named.adoc | 2 +-
.../guides/_rgant-XmlJavaTypeAdapter.adoc | 8 +-
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 14 +-
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 2 +-
.../guides/_rgcfg_configuring-core.adoc | 50 +-
.../guides/_rgcfg_configuring-datanucleus.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_classes.adoc | 4 +-
.../guides/_rgcms_classes_domainevent.adoc | 2 +-
...s_classes_domainevent_ActionDomainEvent.adoc | 2 +-
.../_rgcms_classes_i18n_TranslatableString.adoc | 3 +-
.../asciidoc/guides/_rgcms_classes_layout.adoc | 94 +++
.../guides/_rgcms_classes_lifecycleevent.adoc | 12 +-
...asses_lifecycleevent_ObjectCreatedEvent.adoc | 2 +-
...ses_lifecycleevent_ObjectPersistedEvent.adoc | 2 +-
...es_lifecycleevent_ObjectPersistingEvent.adoc | 2 +-
...sses_lifecycleevent_ObjectRemovingEvent.adoc | 2 +-
...asses_lifecycleevent_ObjectUpdatedEvent.adoc | 2 +-
...sses_lifecycleevent_ObjectUpdatingEvent.adoc | 2 +-
.../asciidoc/guides/_rgcms_classes_mixins.adoc | 16 +
.../guides/_rgcms_classes_mixins_Dto.adoc | 62 ++
.../guides/_rgcms_classes_mixins_Object.adoc | 74 ++
.../_rgcms_classes_mixins_Persistable.adoc | 56 ++
.../asciidoc/guides/_rgcms_classes_roles.adoc | 2 -
.../guides/_rgcms_classes_roles_Dto.adoc | 61 --
.../_rgcms_classes_roles_HoldsUpdatedAt.adoc | 2 +-
.../_rgcms_classes_roles_Persistable.adoc | 34 -
.../asciidoc/guides/_rgcms_classes_super.adoc | 2 +-
...s_classes_super_AbstractContainedObject.adoc | 4 +-
...gcms_classes_super_AbstractDomainObject.adoc | 2 +-
.../_rgcms_classes_super_AbstractService.adoc | 2 +-
..._rgcms_classes_super_AbstractSubscriber.adoc | 6 +-
.../_rgcms_classes_super_FixtureScripts.adoc | 4 +-
.../asciidoc/guides/_rgcms_classes_uievent.adoc | 4 +-
.../_rgcms_classes_uievent_CssClassUiEvent.adoc | 2 +-
.../_rgcms_classes_uievent_IconUiEvent.adoc | 2 +-
.../_rgcms_classes_uievent_TitleUiEvent.adoc | 2 +-
.../guides/_rgcms_methods_lifecycle.adoc | 2 +-
.../_rgcms_methods_lifecycle_created.adoc | 4 +-
.../_rgcms_methods_lifecycle_jdo-api.adoc | 4 +-
.../guides/_rgcms_methods_lifecycle_loaded.adoc | 2 +-
.../_rgcms_methods_lifecycle_persisted.adoc | 2 +-
.../_rgcms_methods_lifecycle_persisting.adoc | 2 +-
.../_rgcms_methods_lifecycle_removed.adoc | 2 +-
.../_rgcms_methods_lifecycle_removing.adoc | 2 +-
.../_rgcms_methods_lifecycle_updated.adoc | 2 +-
.../_rgcms_methods_lifecycle_updating.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_default.adoc | 4 +-
.../guides/_rgcms_methods_prefixes_disable.adoc | 2 +-
.../_rgcms_methods_prefixes_validate.adoc | 2 +-
.../_rgcms_methods_prefixes_validateAddTo.adoc | 2 +-
...cms_methods_prefixes_validateRemoveFrom.adoc | 2 +-
.../guides/_rgcms_methods_reserved_disable.adoc | 2 +-
.../guides/_rgcms_methods_reserved_title.adoc | 4 +-
.../_rgcms_methods_reserved_validate.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_schema-aim.adoc | 2 +-
.../asciidoc/guides/_rgcms_schema-common.adoc | 2 +-
.../src/main/asciidoc/guides/_rgmvn_intro.adoc | 93 +++
.../main/asciidoc/guides/_rgmvn_swagger.adoc | 107 +++
.../main/asciidoc/guides/_rgmvn_validate.adoc | 241 ++++++
.../src/main/asciidoc/guides/_rgmvn_xsd.adoc | 333 ++++++++
.../src/main/asciidoc/guides/_rgsvc-api.adoc | 306 --------
.../_rgsvc-api_ActionInvocationContext.adoc | 98 ---
.../guides/_rgsvc-api_BackgroundService.adoc | 123 ---
...roundService_BackgroundCommandExecution.adoc | 25 -
.../_rgsvc-api_BackgroundService_Quartz.adoc | 162 ----
.../guides/_rgsvc-api_BookmarkService.adoc | 116 ---
.../_rgsvc-api_BulkInteractionContext.adoc | 9 -
.../guides/_rgsvc-api_ClockService.adoc | 101 ---
.../guides/_rgsvc-api_CommandContext.adoc | 216 ------
.../guides/_rgsvc-api_DeepLinkService.adoc | 56 --
.../_rgsvc-api_DomainObjectContainer.adoc | 40 -
...nObjectContainer_generic-repository-api.adoc | 89 ---
...-api_DomainObjectContainer_messages-api.adoc | 50 --
...mainObjectContainer_object-creation-api.adoc | 49 --
...nObjectContainer_object-persistence-api.adoc | 62 --
..._DomainObjectContainer_presentation-api.adoc | 46 --
...pi_DomainObjectContainer_properties-api.adoc | 54 --
...-api_DomainObjectContainer_security-api.adoc | 48 --
...-api_DomainObjectContainer_services-api.adoc | 37 -
...pi_DomainObjectContainer_validation-api.adoc | 26 -
.../guides/_rgsvc-api_EmailService.adoc | 95 ---
.../guides/_rgsvc-api_EventBusService.adoc | 405 ----------
.../_rgsvc-api_FixtureScriptsDefault.adoc | 50 --
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 91 ---
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 276 -------
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 67 --
.../guides/_rgsvc-api_MementoService.adoc | 131 ----
.../guides/_rgsvc-api_MetamodelService.adoc | 42 -
.../guides/_rgsvc-api_QueryResultsCache.adoc | 126 ---
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 128 ---
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 69 --
.../guides/_rgsvc-api_WrapperFactory.adoc | 162 ----
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 220 ------
.../src/main/asciidoc/guides/_rgsvc-spi.adoc | 299 -------
.../guides/_rgsvc-spi_AuditingService.adoc | 85 --
.../_rgsvc-spi_BackgroundCommandService.adoc | 131 ----
.../_rgsvc-spi_ClassDiscoveryService.adoc | 82 --
.../guides/_rgsvc-spi_CommandService.adoc | 100 ---
.../_rgsvc-spi_ContentMappingService.adoc | 107 ---
.../_rgsvc-spi_ContentNegotiationService.adoc | 204 -----
.../_rgsvc-spi_EmailNotificationService.adoc | 81 --
.../_rgsvc-spi_ErrorReportingService.adoc | 106 ---
.../guides/_rgsvc-spi_EventSerializer.adoc | 74 --
.../guides/_rgsvc-spi_ExceptionRecognizer.adoc | 119 ---
...spi_FixtureScriptsSpecificationProvider.adoc | 76 --
.../guides/_rgsvc-spi_LocaleProvider.adoc | 70 --
.../guides/_rgsvc-spi_PublishingService.adoc | 192 -----
.../_rgsvc-spi_RepresentationService.adoc | 103 ---
.../guides/_rgsvc-spi_TranslationService.adoc | 80 --
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 67 --
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 59 --
.../guides/_rgsvc-spi_UserProfileService.adoc | 47 --
.../_rgsvc-spi_UserRegistrationService.adoc | 98 ---
.../guides/_rgsvc_api_AcceptHeaderService.adoc | 79 ++
.../_rgsvc_api_ActionInvocationContext.adoc | 99 +++
..._rgsvc_api_ApplicationFeatureRepository.adoc | 59 ++
.../guides/_rgsvc_api_BackgroundService.adoc | 123 +++
...roundService_BackgroundCommandExecution.adoc | 25 +
.../_rgsvc_api_BackgroundService_Quartz.adoc | 162 ++++
.../guides/_rgsvc_api_BookmarkService.adoc | 116 +++
.../_rgsvc_api_BulkInteractionContext.adoc | 9 +
.../guides/_rgsvc_api_ClockService.adoc | 101 +++
.../guides/_rgsvc_api_CommandContext.adoc | 216 ++++++
.../guides/_rgsvc_api_ConfigurationService.adoc | 88 +++
.../guides/_rgsvc_api_DeepLinkService.adoc | 56 ++
.../_rgsvc_api_DomainObjectContainer.adoc | 51 ++
...nObjectContainer_generic-repository-api.adoc | 84 ++
..._api_DomainObjectContainer_messages-api.adoc | 45 ++
...mainObjectContainer_object-creation-api.adoc | 47 ++
...nObjectContainer_object-persistence-api.adoc | 56 ++
..._DomainObjectContainer_presentation-api.adoc | 47 ++
...pi_DomainObjectContainer_properties-api.adoc | 50 ++
..._api_DomainObjectContainer_security-api.adoc | 47 ++
..._api_DomainObjectContainer_services-api.adoc | 36 +
...pi_DomainObjectContainer_validation-api.adoc | 29 +
.../guides/_rgsvc_api_EmailService.adoc | 95 +++
.../guides/_rgsvc_api_EventBusService.adoc | 405 ++++++++++
.../guides/_rgsvc_api_FactoryService.adoc | 79 ++
.../_rgsvc_api_FixtureScriptsDefault.adoc | 50 ++
.../guides/_rgsvc_api_GuiceBeanProvider.adoc | 91 +++
.../_rgsvc_api_HomePageProviderService.adoc | 40 +
.../guides/_rgsvc_api_IsisJdoSupport.adoc | 276 +++++++
.../asciidoc/guides/_rgsvc_api_JaxbService.adoc | 68 ++
.../guides/_rgsvc_api_LayoutService.adoc | 107 +++
.../guides/_rgsvc_api_MementoService.adoc | 131 ++++
.../guides/_rgsvc_api_MessageService.adoc | 78 ++
.../guides/_rgsvc_api_MetamodelService.adoc | 55 ++
.../guides/_rgsvc_api_QueryResultsCache.adoc | 126 +++
.../guides/_rgsvc_api_RepositoryService.adoc | 189 +++++
.../asciidoc/guides/_rgsvc_api_Scratchpad.adoc | 128 +++
.../guides/_rgsvc_api_ServiceRegistry.adoc | 72 ++
.../_rgsvc_api_SessionManagementService.adoc | 56 ++
.../asciidoc/guides/_rgsvc_api_SudoService.adoc | 69 ++
.../guides/_rgsvc_api_SwaggerService.adoc | 69 ++
.../guides/_rgsvc_api_TitleService.adoc | 74 ++
.../guides/_rgsvc_api_TransactionService.adoc | 65 ++
.../asciidoc/guides/_rgsvc_api_UserService.adoc | 83 ++
.../guides/_rgsvc_api_WrapperFactory.adoc | 162 ++++
.../guides/_rgsvc_api_XmlSnapshotService.adoc | 219 ++++++
.../guides/_rgsvc_application-layer-api.adoc | 144 ++++
.../guides/_rgsvc_application-layer-spi.adoc | 77 ++
.../guides/_rgsvc_bootstrapping-spi.adoc | 40 +
.../asciidoc/guides/_rgsvc_core-domain-api.adoc | 155 ++++
.../asciidoc/guides/_rgsvc_integration-api.adoc | 112 +++
.../src/main/asciidoc/guides/_rgsvc_intro.adoc | 139 ++++
.../asciidoc/guides/_rgsvc_metadata-api.adoc | 89 +++
.../guides/_rgsvc_persistence-layer-api.adoc | 74 ++
.../guides/_rgsvc_persistence-layer-spi.adoc | 102 +++
.../_rgsvc_presentation-layer-internal-spi.adoc | 66 ++
.../guides/_rgsvc_presentation-layer-spi.adoc | 203 +++++
.../guides/_rgsvc_spi_AuditingService.adoc | 85 ++
.../_rgsvc_spi_BackgroundCommandService.adoc | 131 ++++
.../_rgsvc_spi_ClassDiscoveryService.adoc | 82 ++
.../guides/_rgsvc_spi_CommandService.adoc | 100 +++
.../_rgsvc_spi_ContentMappingService.adoc | 102 +++
.../_rgsvc_spi_ContentNegotiationService.adoc | 204 +++++
.../_rgsvc_spi_EmailNotificationService.adoc | 81 ++
.../_rgsvc_spi_ErrorReportingService.adoc | 106 +++
.../guides/_rgsvc_spi_EventSerializer.adoc | 74 ++
.../guides/_rgsvc_spi_ExceptionRecognizer.adoc | 119 +++
...spi_FixtureScriptsSpecificationProvider.adoc | 76 ++
.../guides/_rgsvc_spi_GridLoaderService.adoc | 53 ++
.../asciidoc/guides/_rgsvc_spi_GridService.adoc | 72 ++
.../guides/_rgsvc_spi_GridSystemService.adoc | 75 ++
.../asciidoc/guides/_rgsvc_spi_HintStore.adoc | 63 ++
.../guides/_rgsvc_spi_LocaleProvider.adoc | 70 ++
.../guides/_rgsvc_spi_PublishingService.adoc | 192 +++++
.../_rgsvc_spi_RepresentationService.adoc | 103 +++
.../guides/_rgsvc_spi_RoutingService.adoc | 79 ++
.../guides/_rgsvc_spi_TranslationService.adoc | 87 +++
.../guides/_rgsvc_spi_TranslationsResolver.adoc | 67 ++
.../guides/_rgsvc_spi_UrlEncodingService.adoc | 59 ++
.../guides/_rgsvc_spi_UserProfileService.adoc | 47 ++
.../_rgsvc_spi_UserRegistrationService.adoc | 98 +++
.../main/asciidoc/guides/_rgsvc_testing.adoc | 89 +++
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 4 +-
.../_tg_stop-scaffolding-start-coding.adoc | 20 +-
.../main/asciidoc/guides/_ugbtb_decoupling.adoc | 28 +
.../guides/_ugbtb_decoupling_contributions.adoc | 23 +
.../guides/_ugbtb_decoupling_db-schemas.adoc | 141 ++++
.../guides/_ugbtb_decoupling_event-bus.adoc | 11 +
.../guides/_ugbtb_decoupling_mixins.adoc | 191 +++++
.../_ugbtb_decoupling_pushing-changes.adoc | 140 ++++
.../_ugbtb_decoupling_vetoing-visibility.adoc | 15 +
.../guides/_ugbtb_deployment_tomcat.adoc | 2 +-
.../asciidoc/guides/_ugbtb_headless-access.adoc | 27 +
...less-access_AbstractIsisSessionTemplate.adoc | 40 +
...dless-access_BackgroundCommandExecution.adoc | 45 ++
.../src/main/asciidoc/guides/_ugbtb_i18n.adoc | 671 ++++++++++++++++
.../asciidoc/guides/_ugbtb_more-advanced.adoc | 26 -
.../guides/_ugbtb_more-advanced_decoupling.adoc | 28 -
..._more-advanced_decoupling_contributions.adoc | 23 -
...btb_more-advanced_decoupling_db-schemas.adoc | 141 ----
...gbtb_more-advanced_decoupling_event-bus.adoc | 11 -
.../_ugbtb_more-advanced_decoupling_mixins.adoc | 191 -----
...ore-advanced_decoupling_pushing-changes.adoc | 140 ----
...-advanced_decoupling_vetoing-visibility.adoc | 15 -
.../_ugbtb_more-advanced_headless-access.adoc | 27 -
...less-access_AbstractIsisSessionTemplate.adoc | 40 -
...dless-access_BackgroundCommandExecution.adoc | 45 --
.../guides/_ugbtb_more-advanced_i18n.adoc | 378 ---------
...ugbtb_more-advanced_mapping-rdbms-views.adoc | 9 -
.../_ugbtb_more-advanced_multi-tenancy.adoc | 8 -
...ore-advanced_overriding-jdo-annotations.adoc | 64 --
.../_ugbtb_more-advanced_persisted-title.adoc | 82 --
...placing-default-service-implementations.adoc | 64 --
...b_more-advanced_transactions-and-errors.adoc | 33 -
.../_ugbtb_more-advanced_view-models.adoc | 19 -
.../_ugbtb_more-advanced_view-models_jaxb.adoc | 240 ------
...-advanced_view-models_programming-model.adoc | 87 ---
...btb_more-advanced_view-models_use-cases.adoc | 142 ----
.../guides/_ugbtb_other-techniques.adoc | 22 +
...tb_other-techniques_mapping-rdbms-views.adoc | 9 +
.../_ugbtb_other-techniques_multi-tenancy.adoc | 8 +
...r-techniques_overriding-jdo-annotations.adoc | 64 ++
..._ugbtb_other-techniques_persisted-title.adoc | 82 ++
...placing-default-service-implementations.adoc | 64 ++
...ther-techniques_transactions-and-errors.adoc | 33 +
.../guides/_ugbtb_programming-model.adoc | 2 +-
...gbtb_programming-model_custom-validator.adoc | 2 +-
.../_ugbtb_programming-model_finetuning.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 10 +
.../asciidoc/guides/_ugbtb_view-models.adoc | 19 +
.../guides/_ugbtb_view-models_jaxb.adoc | 432 +++++++++++
.../_ugbtb_view-models_programming-model.adoc | 87 +++
.../guides/_ugbtb_view-models_use-cases.adoc | 160 ++++
.../main/asciidoc/guides/_ugbtb_web-xml.adoc | 25 +-
.../_ugfun_core-concepts_building-blocks.adoc | 14 +-
...re-concepts_framework-provided-services.adoc | 46 +-
..._core-concepts_other-deployment-options.adoc | 2 +-
.../_ugfun_core-concepts_philosophy_aop.adoc | 4 +-
...concepts_principles_apache-isis-vs_cqrs.adoc | 6 +-
...rinciples_apache-isis-vs_event-sourcing.adoc | 2 +-
.../src/main/asciidoc/guides/_ugfun_faqs.adoc | 3 +
...un_faqs_how-run-fixtures-on-app-startup.adoc | 20 +
...aqs_how-to-handle-void-and-null-results.adoc | 80 ++
...un_faqs_how-to-implement-a-spellchecker.adoc | 30 +
..._ugfun_faqs_i18n-label-in-wicket-viewer.adoc | 18 +-
.../guides/_ugfun_faqs_per-user-themes.adoc | 2 +-
.../_ugfun_faqs_restful-image-property.adoc | 7 +-
...faqs_subtype-entity-not-fully-populated.adoc | 7 +-
.../asciidoc/guides/_ugfun_getting-started.adoc | 2 +-
...un_getting-started_datanucleus-enhancer.adoc | 2 +-
...fun_getting-started_simpleapp-archetype.adoc | 58 +-
.../guides/_ugfun_how-tos_class-structure.adoc | 2 +-
...ow-tos_class-structure_class-definition.adoc | 2 +-
.../asciidoc/guides/_ugfun_how-tos_crud.adoc | 8 +-
.../guides/_ugfun_how-tos_domain-services.adoc | 9 +-
...how-tos_ui-hints_names-and-descriptions.adoc | 2 +-
.../asciidoc/guides/_ugfun_object-layout.adoc | 1 +
.../_ugfun_object-layout_application-menu.adoc | 2 +-
.../guides/_ugfun_object-layout_dynamic.adoc | 42 +-
.../_ugfun_object-layout_dynamic_xml.adoc | 401 ++++++++++
.../guides/_ugfun_object-layout_static.adoc | 49 +-
.../guides/_ugsec_api-for-applications.adoc | 2 +-
.../_ugsec_configuring-isis-to-use-bypass.adoc | 2 +-
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 2 +-
.../guides/_ugsec_shiro-isis-ldap-realm.adoc | 2 +-
..._shiro-isisaddons-security-module-realm.adoc | 4 +-
.../guides/_ugsec_usage-by-isis-viewers.adoc | 14 +-
.../src/main/asciidoc/guides/_ugtst_aaa.adoc | 2 +-
.../_ugtst_fixture-scripts_api-and-usage.adoc | 6 +-
..._ugtst_integ-test-support_bootstrapping.adoc | 2 +-
...gtst_integ-test-support_wrapper-factory.adoc | 4 +-
..._ugtst_unit-test-support_contract-tests.adoc | 2 +-
.../asciidoc/guides/_ugvro_architecture.adoc | 9 +-
.../guides/_ugvro_configuration-properties.adoc | 147 +++-
.../main/asciidoc/guides/_ugvro_ro-spec.adoc | 2 +-
.../_ugvro_simplified-representations.adoc | 39 +-
...epresentations_configuration-properties.adoc | 121 +--
.../guides/_ugvw_configuration-properties.adoc | 17 +-
...ugvw_customisation_tweaking-css-classes.adoc | 151 +++-
.../guides/_ugvw_extending_custom-pages.adoc | 4 +-
.../_ugvw_features_user-registration.adoc | 10 +-
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 85 +-
.../src/main/asciidoc/guides/cg.adoc | 63 --
.../src/main/asciidoc/guides/cgcom.adoc | 63 ++
.../src/main/asciidoc/guides/dg.adoc | 66 ++
.../acceptheaderservice.png | Bin 0 -> 10997 bytes
.../acceptheaderservice.pptx | Bin 0 -> 46935 bytes
.../images/reference-services/categories.png | Bin 0 -> 31453 bytes
.../images/reference-services/categories.pptx | Bin 0 -> 63438 bytes
.../ToDoAppDashboard.png | Bin 0 -> 124848 bytes
.../ToDoItem.png | Bin 0 -> 91690 bytes
.../src/main/asciidoc/guides/rg.adoc | 27 -
.../src/main/asciidoc/guides/rgant.adoc | 13 +-
.../src/main/asciidoc/guides/rgcfg.adoc | 9 +-
.../src/main/asciidoc/guides/rgcms.adoc | 11 +-
.../src/main/asciidoc/guides/rgmvn.adoc | 51 ++
.../src/main/asciidoc/guides/rgsvc.adoc | 35 +-
.../asciidoc/guides/simpleapp-archetype.adoc | 207 -----
.../src/main/asciidoc/guides/ug.adoc | 27 -
.../src/main/asciidoc/guides/ugbtb.adoc | 17 +-
.../src/main/asciidoc/guides/ugfun.adoc | 9 +-
.../src/main/asciidoc/guides/ugsec.adoc | 11 +-
.../src/main/asciidoc/guides/ugtst.adoc | 9 +-
.../src/main/asciidoc/guides/ugvro.adoc | 9 +-
.../src/main/asciidoc/guides/ugvw.adoc | 5 +-
adocs/documentation/src/main/asciidoc/help.adoc | 2 +-
.../src/main/asciidoc/images/PDF-50.png | Bin 0 -> 587 bytes
.../images/isis-in-pictures/010-login.png | Bin 53308 -> 52503 bytes
.../isis-in-pictures/020-install-fixtures.png | Bin 84507 -> 98880 bytes
.../030-dashboard-view-model.png | Bin 118239 -> 124043 bytes
.../isis-in-pictures/040-domain-entity.png | Bin 100818 -> 87866 bytes
.../isis-in-pictures/050-edit-property.png | Bin 97649 -> 96607 bytes
.../isis-in-pictures/060-invoke-action.png | Bin 118082 -> 104578 bytes
.../isis-in-pictures/065-contributions.png | Bin 108489 -> 88063 bytes
.../isis-in-pictures/067-contributed-action.png | Bin 25914 -> 20163 bytes
.../main/asciidoc/images/todoapp/dashboard.png | Bin 0 -> 137248 bytes
.../main/asciidoc/images/todoapp/todoitem.png | Bin 0 -> 98559 bytes
.../documentation/src/main/asciidoc/index.html | 99 ++-
.../src/main/asciidoc/isis-in-pictures.adoc | 20 +-
.../src/main/asciidoc/migration-notes.adoc | 1 +
.../documentation/src/main/asciidoc/quotes.adoc | 191 +++++
.../src/main/asciidoc/release-notes.adoc | 31 +-
...-settings-file-templates-for-apache-isis.jar | Bin 9104 -> 9105 bytes
.../templates/isis-asciidoc-templates-idea.xml | 18 +-
.../resources/templates/isis-template-idea.xml | 522 -------------
.../resources/templates/isis-templates-idea.xml | 522 +++++++++++++
.../src/main/asciidoc/screencasts.adoc | 26 +-
adocs/template/document.html.erb | 18 +-
core/applib/pom.xml | 6 +-
.../isis/applib/DomainObjectContainer.java | 331 +++-----
.../java/org/apache/isis/applib/ViewModel.java | 4 +-
.../isis/applib/annotation/ActionLayout.java | 8 +
.../isis/applib/annotation/BookmarkPolicy.java | 5 +
.../applib/annotation/CollectionLayout.java | 7 +-
.../isis/applib/annotation/Contributed.java | 5 +
.../applib/annotation/DomainObjectLayout.java | 2 +-
.../isis/applib/annotation/LabelPosition.java | 5 +
.../isis/applib/annotation/RenderType.java | 9 +
.../apache/isis/applib/annotation/Where.java | 5 +
.../isis/applib/annotation/package-info.java | 31 -
.../applib/conmap/ContentMappingService.java | 35 +
.../applib/fixturescripts/FixtureScript.java | 12 +
.../org/apache/isis/applib/layout/Util.java | 49 ++
.../layout/component/ActionLayoutData.java | 253 ++++++
.../layout/component/ActionLayoutDataOwner.java | 26 +
.../layout/component/CollectionLayoutData.java | 269 +++++++
.../component/CollectionLayoutDataOwner.java | 26 +
.../component/DomainObjectLayoutData.java | 208 +++++
.../component/DomainObjectLayoutDataOwner.java | 25 +
.../isis/applib/layout/component/FieldSet.java | 223 ++++++
.../applib/layout/component/FieldSetOwner.java | 25 +
.../isis/applib/layout/component/Grid.java | 90 +++
.../applib/layout/component/GridAbstract.java | 197 +++++
.../applib/layout/component/HasBookmarking.java | 29 +
.../applib/layout/component/HasCssClass.java | 27 +
.../applib/layout/component/HasCssClassFa.java | 35 +
.../applib/layout/component/HasDescribedAs.java | 29 +
.../isis/applib/layout/component/HasHidden.java | 31 +
.../isis/applib/layout/component/HasNamed.java | 34 +
.../applib/layout/component/MemberRegion.java | 33 +
.../layout/component/MemberRegionOwner.java | 23 +
.../isis/applib/layout/component/Owned.java | 23 +
.../isis/applib/layout/component/Owner.java | 24 +
.../layout/component/PropertyLayoutData.java | 254 ++++++
.../applib/layout/component/package-info.java | 36 +
.../layout/grid/bootstrap3/BS3ClearFix.java | 24 +
.../grid/bootstrap3/BS3ClearFixHidden.java | 49 ++
.../grid/bootstrap3/BS3ClearFixVisible.java | 73 ++
.../applib/layout/grid/bootstrap3/BS3Col.java | 273 +++++++
.../layout/grid/bootstrap3/BS3Element.java | 35 +
.../grid/bootstrap3/BS3ElementAbstract.java | 46 ++
.../applib/layout/grid/bootstrap3/BS3Grid.java | 304 ++++++++
.../applib/layout/grid/bootstrap3/BS3Row.java | 140 ++++
.../layout/grid/bootstrap3/BS3RowContent.java | 80 ++
.../grid/bootstrap3/BS3RowContentOwner.java | 25 +
.../layout/grid/bootstrap3/BS3RowOwner.java | 28 +
.../applib/layout/grid/bootstrap3/BS3Tab.java | 177 +++++
.../layout/grid/bootstrap3/BS3TabGroup.java | 123 +++
.../grid/bootstrap3/BS3TabGroupOwner.java | 28 +
.../layout/grid/bootstrap3/BS3TabOwner.java | 28 +
.../applib/layout/grid/bootstrap3/HasCssId.java | 28 +
.../applib/layout/grid/bootstrap3/Size.java | 34 +
.../applib/layout/grid/bootstrap3/SizeSpan.java | 103 +++
.../layout/grid/bootstrap3/WithinGrid.java | 27 +
.../layout/grid/bootstrap3/package-info.java | 34 +
.../acceptheader/AcceptHeaderService.java | 32 +
.../appfeat/ApplicationFeatureRepository.java | 42 +
.../services/appfeat/ApplicationMemberType.java | 42 +
.../services/config/ConfigurationProperty.java | 87 +++
.../config/ConfigurationProperty.layout.xml | 58 ++
.../services/config/ConfigurationProperty.png | Bin 0 -> 927 bytes
.../services/config/ConfigurationService.java | 54 ++
.../config/ConfigurationServiceMenu.java | 67 ++
.../applib/services/dto/Dto_downloadXml.java | 10 +-
.../applib/services/dto/Dto_downloadXsd.java | 6 +-
.../applib/services/factory/FactoryService.java | 62 ++
.../applib/services/grid/GridLoaderService.java | 48 ++
.../isis/applib/services/grid/GridService.java | 108 +++
.../applib/services/grid/GridSystemService.java | 55 ++
.../isis/applib/services/hint/HintStore.java | 43 ++
.../homepage/HomePageProviderService.java | 43 ++
.../jaxb/CatalogingSchemaOutputResolver.java | 152 ++++
.../isis/applib/services/jaxb/JaxbService.java | 199 ++++-
.../services/jaxb/StreamResultWithWriter.java | 45 ++
.../applib/services/layout/LayoutService.java | 80 ++
.../services/layout/LayoutServiceMenu.java | 91 +++
.../layout/Object_downloadLayoutXml.java | 74 ++
.../layout/Object_rebuildMetamodel.java | 58 ++
.../isis/applib/services/layout/Util.java | 33 +
.../applib/services/message/MessageService.java | 112 +++
.../applib/services/metamodel/DomainMember.java | 54 ++
.../services/metamodel/MetaModelService.java | 15 +
.../metamodel/MetaModelServicesMenu.java | 146 ++++
.../isis/applib/services/metamodel/Util.java | 33 +
.../services/registry/ServiceRegistry.java | 36 +
.../services/repository/RepositoryService.java | 216 ++++++
.../applib/services/routing/RoutingService.java | 34 +
.../services/routing/RoutingServiceDefault.java | 58 ++
.../sessmgmt/SessionManagementService.java | 44 ++
.../applib/services/swagger/SwaggerService.java | 22 +-
.../services/swagger/SwaggerServiceMenu.java | 4 +-
.../applib/services/title/TitleService.java | 41 +
.../isis/applib/services/user/UserService.java | 33 +
.../services/xactn/TransactionService.java | 42 +
.../java/org/apache/isis/applib/value/Blob.java | 10 +-
.../java/org/apache/isis/applib/value/Clob.java | 10 +-
.../layout/grid/bootstrap3/BS3ColTest.java | 63 ++
.../layout/grid/bootstrap3/SizeSpanTest.java | 62 ++
core/integtestsupport/pom.xml | 2 +-
.../integtestsupport/IsisSystemForTest.java | 85 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 56 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 17 +-
.../isis/tool/mavenplugin/IsisMojoSwagger.java | 134 ++++
.../isis/tool/mavenplugin/IsisMojoXsd.java | 10 +-
core/metamodel/pom.xml | 9 +-
.../isis/core/commons/lang/ArrayExtensions.java | 16 +-
.../isis/core/commons/lang/ClassExtensions.java | 12 +-
.../core/metamodel/adapter/ObjectAdapter.java | 18 +-
.../isis/core/metamodel/facetapi/FacetUtil.java | 26 +-
.../facetdecorator/FacetDecoratorSet.java | 11 +-
.../isis/core/metamodel/facets/Annotations.java | 14 +-
.../invocation/ActionInvocationFacet.java | 42 +-
...onInvocationFacetForDomainEventAbstract.java | 73 +-
.../layout/ActionLayoutFacetFactory.java | 6 +-
.../layout/ActionPositionFacetForActionXml.java | 41 +
.../layout/BookmarkPolicyFacetForActionXml.java | 42 +
.../layout/CssClassFaFacetForActionXml.java | 45 ++
.../layout/CssClassFacetForActionXml.java | 43 ++
.../layout/DescribedAsFacetForActionXml.java | 43 ++
.../layout/HiddenFacetForActionLayoutXml.java | 52 ++
.../actions/layout/NamedFacetForActionXml.java | 45 ++
.../all/i18n/TranslationFacetFactory.java | 7 +-
...tViewFacetForCollectionLayoutAnnotation.java | 41 -
...ewFacetOnCollectionFromLayoutProperties.java | 46 --
.../layout/CollectionLayoutFacetFactory.java | 2 -
.../layout/CssClassFacetForCollectionXml.java | 43 ++
...tViewFacetForCollectionLayoutAnnotation.java | 43 ++
.../DefaultViewFacetForCollectionXml.java | 43 ++
...ewFacetOnCollectionFromLayoutProperties.java | 48 ++
.../DescribedAsFacetForCollectionXml.java | 43 ++
.../layout/HiddenFacetForCollectionXml.java | 52 ++
.../layout/NamedFacetForCollectionXml.java | 48 ++
.../layout/PagedFacetForCollectionXml.java | 41 +
.../layout/SortedByFacetForCollectionXml.java | 52 ++
.../members/cssclassfa/CssClassFaPosition.java | 24 +
.../facets/members/order/MemberOrderFacet.java | 4 +
.../members/order/MemberOrderFacetAbstract.java | 6 +
.../order/annotprop/MemberOrderFacetXml.java | 35 +
.../object/autocomplete/AutoCompleteFacet.java | 3 +-
.../autocomplete/AutoCompleteFacetAbstract.java | 51 +-
.../BookmarkPolicyFacetForDomainObjectXml.java | 42 +
.../CssClassFaFacetForDomainObjectXml.java | 45 ++
.../CssClassFacetForDomainObjectXml.java | 43 ++
.../DescribedAsFacetForDomainObjectXml.java | 43 ++
.../NamedFacetForDomainObjectXml.java | 45 ++
.../PluralFacetForDomainObjectXml.java | 41 +
.../DomainServiceLayoutFacetFactory.java | 84 ++
.../DomainServiceLayoutFactory.java | 84 --
.../metamodel/facets/object/grid/GridFacet.java | 40 +
.../facets/object/grid/GridFacetDefault.java | 83 ++
.../facets/object/grid/GridFacetFactory.java | 54 ++
...nCollectionDerivedFromRecreatableObject.java | 3 +-
...eObjectFacetForXmlRootElementAnnotation.java | 13 +
.../param/autocomplete/MinLengthUtil.java | 4 +
.../CssClassFacetForPropertyXml.java | 43 ++
.../DescribedAsFacetForPropertyXml.java | 43 ++
.../HiddenFacetForPropertyXml.java | 52 ++
.../LabelAtFacetForPropertyXml.java | 42 +
.../MultiLineFacetForPropertyXml.java | 41 +
.../NamedFacetForPropertyXml.java | 48 ++
.../RenderedAdjustedFacetForPropertyXml.java | 43 ++
.../TypicalLengthFacetForPropertyXml.java | 49 ++
.../layoutmetadata/LayoutMetadataReader2.java | 2 +-
.../json/LayoutMetadataReaderFromJson.java | 43 +-
.../PersistenceSessionService.java | 4 +-
.../noruntime/RuntimeContextNoRuntime.java | 6 +
.../services/appfeat/ApplicationFeature.java | 351 +++++++++
.../appfeat/ApplicationFeatureFactory.java | 39 +
.../services/appfeat/ApplicationFeatureId.java | 473 ++++++++++++
.../ApplicationFeatureRepositoryDefault.java | 539 +++++++++++++
.../appfeat/ApplicationFeatureType.java | 102 +++
.../config/ConfigurationServiceDefault.java | 93 +++
.../container/DomainObjectContainerDefault.java | 359 +++------
.../metamodel/services/devutils/MemberType.java | 25 +
.../services/factory/FactoryServiceDefault.java | 111 +++
.../services/grid/GridLoaderServiceDefault.java | 209 +++++
.../services/grid/GridNormalizerUtil.java | 38 +
.../services/grid/GridServiceDefault.java | 203 +++++
.../grid/GridSystemServiceAbstract.java | 708 +++++++++++++++++
.../grid/bootstrap3/GridSystemServiceBS3.java | 677 ++++++++++++++++
.../services/grid/fixedcols/applib/Hint.java | 39 +
.../Persistable_datanucleusIdLong.java | 73 ++
.../Persistable_datanucleusVersionLong.java | 66 ++
...Persistable_datanucleusVersionTimestamp.java | 66 ++
.../Persistable_downloadJdoMetadata.java | 41 +-
.../services/layout/LayoutServiceDefault.java | 161 ++++
.../services/message/MessageServiceDefault.java | 87 +++
.../services/metamodel/DomainMemberDefault.java | 247 ++++++
.../metamodel/MetaModelServiceDefault.java | 102 ++-
.../core/metamodel/services/metamodel/Util.java | 33 +
.../registry/ServiceRegistryDefault.java | 72 ++
.../repository/RepositoryServiceDefault.java | 256 ++++++
.../services/swagger/SwaggerServiceDefault.java | 2 +
.../services/swagger/internal/Generation.java | 40 +-
.../services/swagger/internal/Util.java | 8 +-
.../swagger/internal/ValuePropertyFactory.java | 22 +
.../services/title/TitleServiceDefault.java | 91 +++
.../services/user/UserServiceDefault.java | 140 ++++
.../xactn/TransactionServiceDefault.java | 51 ++
.../metamodel/spec/ObjectSpecifications.java | 24 +-
.../metamodel/spec/SpecificationLoaderSpi.java | 2 -
.../metamodel/spec/feature/ObjectAction.java | 7 +-
.../spec/feature/ObjectAssociation.java | 65 +-
.../metamodel/spec/feature/ObjectMember.java | 66 ++
.../specloader/ObjectReflectorDefault.java | 36 +-
.../specloader/SpecificationCacheDefault.java | 31 +-
.../specimpl/FacetedMethodsBuilder.java | 7 +-
.../specloader/specimpl/MixedInMember2.java | 28 +
.../specimpl/ObjectActionContributee.java | 2 +-
.../specimpl/ObjectActionMixedIn.java | 10 +-
.../specimpl/ObjectSpecificationAbstract.java | 11 +-
.../specimpl/OneToManyAssociationMixedIn.java | 12 +-
.../specimpl/OneToOneAssociationMixedIn.java | 13 +-
.../dflt/ObjectSpecificationDefault.java | 13 +-
.../metamodel/util/DeweyOrderComparator.java | 82 ++
.../dflt/ProgrammingModelFacetsJava5.java | 7 +-
.../metamodel/facets/ProgrammableReflector.java | 3 -
.../ActionLayoutAnnotationFacetFactoryTest.java | 192 -----
...youtXmlLayoutAnnotationFacetFactoryTest.java | 192 +++++
.../DomainServiceLayoutFacetFactoryTest.java | 129 ++++
.../DomainServiceLayoutFactoryTest.java | 129 ----
.../object/layoutxml/GridFacetDefaultTest.java | 60 ++
...inObjectContainerDefaultTest_allMatches.java | 112 ---
.../metamodel/services/grid/BS3GridTest.java | 164 ++++
...RepositoryServiceDefaultTest_allMatches.java | 100 +++
.../SpecificationCacheDefaultTest.java | 21 +-
core/pom.xml | 246 ++++--
core/runtime/pom.xml | 28 +-
.../internal/RuntimeContextFromSession.java | 5 +
...shingServiceWithDefaultPayloadFactories.java | 2 +-
.../core/runtime/runner/IsisInjectModule.java | 14 +-
.../opts/OptionHandlerSystemProperties.java | 2 +-
.../runtime/services/DeweyOrderComparator.java | 82 --
.../ServicesInstallerFromAnnotation.java | 7 +-
.../ServicesInstallerFromConfiguration.java | 1 +
...InstallerFromConfigurationAndAnnotation.java | 1 +
.../HomePageProviderServiceDefault.java | 108 +++
.../core/runtime/services/i18n/po/PoReader.java | 16 +-
.../core/runtime/services/i18n/po/PoWriter.java | 39 +-
.../services/i18n/po/TranslationServicePo.java | 4 +-
.../i18n/po/TranslationServicePoMenu.java | 15 +-
.../core/runtime/services/i18n/po/Util.java | 33 +
.../SessionManagementServiceDefault.java | 47 ++
.../services/sudo/SudoServiceDefault.java | 34 +-
.../core/runtime/system/ContextCategory.java | 79 --
.../core/runtime/system/DeploymentType.java | 38 +-
.../isis/core/runtime/system/IsisSystem.java | 69 +-
.../core/runtime/system/IsisSystemFactory.java | 4 +-
.../runtime/system/context/IsisContext.java | 173 ++++-
.../system/context/IsisContextStatic.java | 137 ----
.../system/context/IsisContextThreadLocal.java | 183 -----
.../system/persistence/PersistenceSession.java | 5 +
.../persistence/PersistenceSessionFactory.java | 21 +-
.../system/transaction/IsisTransaction.java | 42 +-
.../isis/core/webapp/IsisSessionFilter.java | 66 +-
.../core/webapp/IsisWebAppBootstrapper.java | 25 +-
.../core/runtime/context/IsisContextTest.java | 140 ----
.../services/DeweyOrderComparatorTest.java | 2 +
.../services/i18n/po/PoWriterTest_escape.java | 44 ++
.../runtime/system/ObjectActionDefaultTest.java | 107 ---
.../ObjectActionLayoutXmlDefaultTest.java | 107 +++
core/schema/pom.xml | 2 +-
.../jaxb/CatalogingSchemaOutputResolver.java | 85 --
.../services/jaxb/JaxbServiceDefault.java | 111 +--
.../services/jaxb/StreamResultWithWriter.java | 45 --
core/security-shiro/pom.xml | 6 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
.../scenarios/ScenarioExecution.java | 3 +-
.../specsupport/specs/CukeGlueAbstract.java | 23 +-
.../specsupport/specs/CukeSpecsAbstract.java | 7 +-
.../appended-resources/supplemental-models.xml | 17 +-
core/unittestsupport/pom.xml | 4 +-
.../soap/PublishedEndpoints.java | 2 +-
.../core/unittestsupport/soap/SoapEndpoint.java | 2 +-
.../unittestsupport/soap/SoapEndpointSpec.java | 3 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
.../domainobjects/ActionResultReprRenderer.java | 2 +-
.../rendering/domainobjects/MemberType.java | 28 +-
.../ObjectPropertyReprRenderer.java | 2 +-
.../RepresentationServiceContentNegotiator.java | 3 +-
.../AcceptHeaderServiceForRest.java | 106 +++
.../service/conmap/ContentMappingService.java | 7 +-
.../ContentNegotiationServiceAbstract.java | 3 -
.../ContentNegotiationServiceXRoDomainType.java | 65 +-
core/viewer-restfulobjects-server/pom.xml | 4 +-
.../server/RestfulObjectsApplication.java | 6 +-
.../server/resources/DomainResourceHelper.java | 9 +
.../server/resources/ObjectActionArgHelper.java | 3 +
.../server/resources/VersionReprRenderer.java | 2 +-
.../IsisTransactionFilterForRestfulObjects.java | 5 +
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
.../wicket/viewer/IsisWicketApplication.java | 158 ++--
.../viewer/guice/GuiceComponentInjector.java | 137 ----
.../viewer/guice/GuiceFieldValueFactory.java | 161 ----
.../viewer/guice/GuiceProxyTargetLocator.java | 162 ----
.../isis/DeploymentTypeAbstract.java | 8 +-
.../integration/wicket/LocalizerForIsis.java | 159 ++++
.../wicket/WebRequestCycleForIsis.java | 15 +-
.../ComponentFactoryRegistrarDefault.java | 44 +-
.../services/HintStoreUsingWicketSession.java | 105 +++
.../viewer/services/Object_clearHints.java | 80 ++
.../viewer/settings/IsisResourceSettings.java | 15 +-
core/viewer-wicket-model/pom.xml | 2 +-
.../model/hints/HasUiHintDisambiguator.java | 24 +
.../hints/IsisPropertyEditCompletedEvent.java | 46 ++
.../wicket/model/hints/IsisSelectorEvent.java | 43 ++
.../wicket/model/hints/IsisUiHintEvent.java | 38 -
.../wicket/model/hints/UiHintContainer.java | 37 +-
.../model/hints/UiHintPathSignificant.java | 21 -
.../model/mementos/ObjectAdapterMemento.java | 15 +-
.../wicket/model/models/ActionExecutor.java | 35 -
.../viewer/wicket/model/models/ActionModel.java | 46 +-
.../model/models/EntityCollectionModel.java | 101 ++-
.../viewer/wicket/model/models/EntityModel.java | 265 +++----
.../wicket/model/models/ExecutingPanel.java | 42 +
.../wicket/model/models/ModelAbstract.java | 72 +-
.../viewer/wicket/model/models/ScalarModel.java | 85 ++
.../wicket/model/util/ComponentHintKey.java | 142 ++++
.../wicket/model/models/ActionModelTest.java | 8 +-
.../model/models/EntityModel_hintsTest.java | 141 ++++
.../wicket/model/models/ModelAbstractTest.java | 170 ----
core/viewer-wicket-ui/pom.xml | 2 +-
.../isis/viewer/wicket/ui/ComponentType.java | 19 +-
.../ActionResultResponseType.java | 20 +-
.../entityactions/AdditionalLinksPanel.java | 2 +-
.../entityactions/EntityActionUtil.java | 33 +-
.../serviceactions/ServiceActionsPanel.css | 5 +
.../actionprompt/ActionPromptHeaderPanel.java | 18 +-
.../actionprompt/ActionPromptModalWindow.java | 15 +-
.../ui/components/actions/ActionPanel.html | 10 +-
.../ui/components/actions/ActionPanel.java | 15 +-
.../actions/ActionParametersFormPanel.java | 18 +-
.../components/collection/CollectionPanel.java | 36 +-
.../selector/CollectionSelectorHelper.java | 122 ++-
.../selector/CollectionSelectorPanel.java | 65 +-
.../selector/UNUSED_CollectionSelectorPanel.css | 60 --
.../CollectionContentsAsAjaxTablePanel.java | 30 +-
...llectionContentsAsAjaxTablePanelFactory.java | 2 +-
.../ajaxtable/IsisAjaxFallbackDataTable.java | 30 +-
.../IsisAjaxFallbackHeadersToolbar.java | 9 +-
.../ajaxtable/IsisAjaxNavigationToolbar.java | 37 +-
.../ajaxtable/IsisAjaxPagingNavigationLink.java | 5 +-
.../columns/ObjectAdapterPropertyColumn.java | 5 +
.../CollectionContentsMultipleViewsPanel.java | 108 ++-
...ectionContentsMultipleViewsPanelFactory.java | 2 +-
.../CollectionContentsAsUnresolvedPanel.html | 29 -
.../CollectionContentsAsUnresolvedPanel.java | 43 --
...lectionContentsAsUnresolvedPanelFactory.java | 70 --
.../CollectionContentsHiddenPanel.html | 29 +
.../CollectionContentsHiddenPanel.java | 43 ++
.../CollectionContentsHiddenPanelFactory.java | 70 ++
.../entity/EntityComponentFactoryAbstract.java | 14 +-
.../collection/EntityCollectionPanel.html | 46 ++
.../collection/EntityCollectionPanel.java | 166 ++++
.../collections/EntityCollectionsPanel.html | 49 --
.../collections/EntityCollectionsPanel.java | 177 -----
.../EntityCollectionsPanelFactory.java | 49 --
.../entity/combined/EntityCombinedPanel.html | 29 -
.../entity/combined/EntityCombinedPanel.java | 60 --
.../combined/EntityCombinedPanelFactory.java | 48 --
.../entity/fieldset/PropertyGroup.html | 41 +
.../entity/fieldset/PropertyGroup.java | 175 +++++
.../entity/header/EntityHeaderPanel.java | 6 +-
.../entity/properties/EntityPropertiesForm.java | 774 -------------------
.../properties/EntityPropertiesForm.properties | 22 -
.../properties/EntityPropertiesPanel.html | 104 ---
.../properties/EntityPropertiesPanel.java | 60 --
.../EntityPropertiesPanelFactory.java | 46 --
.../links/EntityLinksSelectorPanel.java | 22 +-
.../links/EntityLinksSelectorPanelFactory.java | 17 +-
.../ui/components/layout/bs3/BS3GridPanel.html | 28 +
.../ui/components/layout/bs3/BS3GridPanel.java | 63 ++
.../wicket/ui/components/layout/bs3/Util.java | 44 ++
.../layout/bs3/clearfix/ClearFix.html | 26 +
.../layout/bs3/clearfix/ClearFix.java | 69 ++
.../ui/components/layout/bs3/col/Col.html | 49 ++
.../ui/components/layout/bs3/col/Col.java | 327 ++++++++
...eatingViewWithDynamicallyVisibleContent.java | 54 ++
.../ui/components/layout/bs3/row/Row.html | 28 +
.../ui/components/layout/bs3/row/Row.java | 107 +++
.../layout/bs3/tabs/TabGroupPanel.java | 127 +++
.../ui/components/layout/bs3/tabs/TabPanel.html | 30 +
.../ui/components/layout/bs3/tabs/TabPanel.java | 100 +++
.../property/PropertyEditFormPanel.html | 42 +
.../property/PropertyEditFormPanel.java | 199 +++++
.../property/PropertyEditFormPanelFactory.java | 52 ++
.../components/property/PropertyEditPanel.html | 35 +
.../components/property/PropertyEditPanel.java | 302 ++++++++
.../property/PropertyEditPanelFactory.java | 52 ++
.../property/PropertyEditPromptHeaderPanel.html | 32 +
.../property/PropertyEditPromptHeaderPanel.java | 63 ++
.../components/scalars/ScalarPanelAbstract.html | 13 +-
.../components/scalars/ScalarPanelAbstract.java | 47 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 11 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 29 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 7 +-
.../scalars/primitive/BooleanPanel.html | 17 +-
.../scalars/reference/ReferencePanel.html | 27 +-
.../scalars/reference/ReferencePanel.java | 17 +-
.../StandaloneCollectionPanel.html | 26 +-
.../StandaloneCollectionPanel.java | 39 +-
.../widgets/breadcrumbs/BreadcrumbPanel.html | 4 +
...UiHintPathSignificantWebMarkupContainer.java | 34 -
.../linkandlabel/ActionLinkFactoryAbstract.java | 14 +-
.../valuechoices/ValueChoicesSelect2Panel.html | 17 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 7 +
.../ValueChoicesSelect2PanelFactory.java | 7 +-
.../widgets/zclip/ZeroClipboardPanel.html | 5 -
.../widgets/zclip/ZeroClipboardPanel.java | 74 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../ui/pages/bootstrap-overrides-flatly.css | 5 +
.../wicket/ui/pages/bootstrap-overrides.css | 120 ++-
.../wicket/ui/pages/entity/EntityPage.java | 62 +-
.../ui/pages/jquery.isis.wicket.viewer.js | 11 +
.../viewer/wicket/ui/pages/value/ValuePage.html | 10 +-
.../ui/pages/voidreturn/VoidReturnPage.html | 16 +-
.../ui/panels/HasDynamicallyVisibleContent.java | 36 +
.../viewer/wicket/ui/panels/PanelAbstract.java | 1 +
.../viewer/wicket/ui/util/CssIdAppender.java | 70 ++
core/webserver/pom.xml | 3 +-
core/wrapper/pom.xml | 17 +-
.../core/wrapper/WrapperFactoryDefault.java | 2 +
.../handlers/DomainObjectInvocationHandler.java | 11 +
example/application/simpleapp/app/pom.xml | 2 +-
.../app/services/homepage/HomePageService.java | 6 +-
.../homepage/HomePageViewModel.layout.json | 43 --
.../homepage/HomePageViewModel.layout.xml | 49 ++
example/application/simpleapp/dom/pom.xml | 14 +-
.../java/domainapp/dom/simple/SimpleObject.java | 53 +-
.../dom/simple/SimpleObject.layout.json | 56 --
.../dom/simple/SimpleObject.layout.xml | 63 ++
.../domainapp/dom/simple/SimpleObjects.java | 24 +-
.../domainapp/dom/simple/SimpleObjectsTest.java | 12 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 55 +-
.../modules/simple/SimpleObjectIntegTest.java | 44 +-
example/application/simpleapp/pom.xml | 25 +-
.../webapp/ide/eclipse/launch/.gitignore | 8 +-
.../ide/eclipse/launch/SimpleApp-JREBEL.launch | 31 +
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 31 -
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 23 -
...OTOTYPE-with-fixtures-bypass-security.launch | 20 +
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 2 +-
.../eclipse/launch/SimpleApp-PROTOTYPE.launch | 20 +
.../launch/SimpleApp-SERVER-no-fixtures.launch | 23 -
.../ide/eclipse/launch/SimpleApp-SERVER.launch | 20 +
..._PROTOTYPE_with_fixtures-bypass-security.xml | 28 +
.../SimpleApp_PROTOTYPE_with_fixtures.xml | 28 +
.../ide/intellij/launch/SimpleApp_SERVER.xml | 28 +
.../launch/SimpleApp__enhance_only_.xml | 2 +-
example/application/simpleapp/webapp/pom.xml | 352 ++++-----
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes
.../webapp/DomainApplication.properties | 28 +
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
.../src/main/webapp/WEB-INF/translations-en.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-es.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-nl.po | 328 +++++++-
.../src/main/webapp/WEB-INF/translations.po | 328 +++++++-
.../webapp/WEB-INF/viewer_wicket.properties | 6 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 9 +-
.../src/main/webapp/swagger-ui/index.html | 43 +-
example/archetype/simpleapp/pom.xml | 6 +-
.../META-INF/maven/archetype-metadata.xml | 4 +-
...ppAppManifestWithFixturesBypassSecurity.java | 38 +
.../app/services/homepage/HomePageService.java | 6 +-
.../homepage/HomePageViewModel.layout.json | 43 --
.../homepage/HomePageViewModel.layout.xml | 47 ++
.../prototyping/HideMixinsForHomePage.java | 56 ++
.../resources/archetype-resources/dom/pom.xml | 5 +-
.../java/domainapp/dom/simple/SimpleObject.java | 59 +-
.../dom/simple/SimpleObject.layout.json | 56 --
.../dom/simple/SimpleObject.layout.xml | 68 ++
.../domainapp/dom/simple/SimpleObjects.java | 24 +-
.../domainapp/dom/simple/SimpleObjectsTest.java | 12 +-
.../archetype-resources/integtests/pom.xml | 147 +++-
.../modules/simple/SimpleObjectIntegTest.java | 44 +-
.../main/resources/archetype-resources/pom.xml | 23 +-
.../webapp/ide/eclipse/launch/.gitignore | 8 +-
...OTOTYPE-with-fixtures-bypass-security.launch | 22 +
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 +
.../eclipse/launch/SimpleApp-PROTOTYPE.launch | 22 +
.../ide/eclipse/launch/SimpleApp-SERVER.launch | 22 +
..._PROTOTYPE_with_fixtures-bypass-security.xml | 31 +
.../SimpleApp_PROTOTYPE_with_fixtures.xml | 31 +
.../ide/intellij/launch/SimpleApp_SERVER.xml | 31 +
.../launch/SimpleApp__enhance_only_.xml | 2 +-
.../archetype-resources/webapp/pom.xml | 337 ++++----
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes
.../webapp/DomainApplication.properties | 31 +
.../src/main/webapp/WEB-INF/isis.properties | 22 +-
.../src/main/webapp/WEB-INF/translations-en.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-es.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-nl.po | 328 +++++++-
.../src/main/webapp/WEB-INF/translations.po | 328 +++++++-
.../webapp/WEB-INF/viewer_wicket.properties | 6 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 26 +-
.../webapp/src/main/webapp/about/index.html | 18 +-
.../src/main/webapp/swagger-ui/index.html | 164 ++++
.../projects/basic/archetype.properties | 2 +-
pom.xml | 41 +-
recreate_archetype_RELEASE.sh | 6 +-
recreate_archetype_SNAPSHOT.sh | 6 +-
scripts/promoterctag.sh | 2 +-
972 files changed, 44738 insertions(+), 22438 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index 87e480b,e9972b1..9bb2684
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@@ -21,7 -21,7 +21,11 @@@
<body>
<wicket:panel>
<span class="breadcrumbPanel">
++<<<<<<< HEAD
+ <select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select>
++=======
+ <input wicket:id="breadcrumbs" type="hidden" class="autoComplete select2-remote" style="width: 100%; padding: 0" />
++>>>>>>> ISIS-1223-upgrade-to-wicket-7
</span>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 52de953,0874436..26b41c7
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@@ -27,14 -27,20 +27,21 @@@
<div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
<div class="form-group" wicket:id="scalarIfRegular">
<label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
- <div class="scalarValueWrapper">
- <div class="choicesPlaceholder">
- <select wicket:id="scalarValue" class="choices form-control input-sm select2-remote" style="width: 99.8%;"></select>
++
+ <span class="scalarValueWrapper">
+ <div class="scalarPlaceholder">
+ <span class="scalarValueInput">
+ <span class="editing">
- <input wicket:id="scalarValue" type="hidden" class="choices input-sm select2-remote" style="width: 99.8%; padding: 0"/>
- <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
++ <select wicket:id="scalarValue" class="choices input-sm select2-remote" style="width: 99.8%;"></select>
++ <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+ </span>
+ </span>
+ <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
- </div>
- <span wicket:id="associatedActionLinksRight"></span>
+ </span>
- <div class="clearfix"/>
++ <div class="clearfix"></div>
</div>
<span wicket:id="scalarIfCompact"></span>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/55763877/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index c8f51a1,b6fb5f7..32bc2dc
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@@ -24,9 -24,9 +24,10 @@@ import javax.inject.Inject
import com.google.common.base.Function;
import com.google.common.base.Predicate;
+ import com.google.common.base.Strings;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Select2Choice;
[12/21] isis git commit: Merge branch 'ISIS-1223-upgrade-to-wicket-7'
into ISIS-1224-select2-v4
Posted by da...@apache.org.
Merge branch 'ISIS-1223-upgrade-to-wicket-7' into ISIS-1224-select2-v4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/17d7159f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/17d7159f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/17d7159f
Branch: refs/heads/master
Commit: 17d7159fa58871c64bc70be3b467a139d7464a90
Parents: bd2a54b 803fbc1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 13 14:01:35 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 13 14:01:35 2015 +0100
----------------------------------------------------------------------
README.adoc | 8 +-
adocs/documentation/Gemfile | 3 +
adocs/documentation/Gemfile.lock | 5 +-
adocs/documentation/monitor.rb | 70 +-
adocs/documentation/publish.sh | 8 +-
.../_migration-notes_1.10.0-to-1.11.0.adoc | 58 ++
...o-1.9.0_bootstrapping-using-AppManifest.adoc | 4 +-
...tes_1.8.0-to-1.9.0_exception-recognizer.adoc | 6 +-
..._fixture-scripts-specification-provider.adoc | 4 +-
...1.8.0-to-1.9.0_specify-all-dom-packages.adoc | 6 +-
...n-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc | 2 +-
...tion-notes_1.8.0-to-1.9.0_war-packaging.adoc | 4 +-
.../_migration-notes_1.9.0-to-1.10.0.adoc | 6 +-
.../asciidoc/_powered-by_gesconsultor-grc.adoc | 6 +-
.../src/main/asciidoc/_release-notes_1.9.0.adoc | 2 +-
.../src/main/asciidoc/common-use-cases.adoc | 4 +-
.../documentation/src/main/asciidoc/demos.adoc | 18 -
.../src/main/asciidoc/documentation.adoc | 57 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 257 ++----
.../_cg_committers_post-release-successful.adoc | 18 +-
.../main/asciidoc/guides/_cg_ide-templates.adoc | 62 +-
.../src/main/asciidoc/guides/_cg_ide.adoc | 1 +
.../main/asciidoc/guides/_cg_ide_agilej.adoc | 55 ++
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 7 +-
.../main/asciidoc/guides/_cg_ide_intellij.adoc | 10 +-
.../asciidoc/guides/_cg_ide_project-lombok.adoc | 4 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 231 +----
.../guides/_cg_isis-maven-plugin_validate.adoc | 241 ++++++
.../guides/_cg_isis-maven-plugin_xsd.adoc | 329 ++++++++
.../main/asciidoc/guides/_rg_annotations.adoc | 63 --
.../asciidoc/guides/_rg_annotations_aaa.adoc | 17 -
.../guides/_rg_annotations_aaa_deprecated.adoc | 342 --------
.../guides/_rg_annotations_aaa_jdo.adoc | 113 ---
.../guides/_rg_annotations_aaa_jee.adoc | 59 --
.../guides/_rg_annotations_aaa_main.adoc | 103 ---
.../guides/_rg_annotations_aaa_other.adoc | 57 --
.../guides/_rg_annotations_aaa_partial.adoc | 92 --
.../guides/_rg_annotations_manpage-Action.adoc | 131 ---
.../_rg_annotations_manpage-ActionLayout.adoc | 133 ---
...ations_manpage-ActionLayout_bookmarking.adoc | 64 --
...ions_manpage-ActionLayout_contributedAs.adoc | 54 --
...notations_manpage-ActionLayout_cssClass.adoc | 41 -
...tations_manpage-ActionLayout_cssClassFa.adoc | 59 --
...ations_manpage-ActionLayout_describedAs.adoc | 37 -
...annotations_manpage-ActionLayout_hidden.adoc | 57 --
..._annotations_manpage-ActionLayout_named.adoc | 45 -
...notations_manpage-ActionLayout_position.adoc | 80 --
.../_rg_annotations_manpage-Action_command.adoc | 134 ---
..._annotations_manpage-Action_domainEvent.adoc | 145 ----
.../_rg_annotations_manpage-Action_hidden.adoc | 49 --
..._rg_annotations_manpage-Action_invokeOn.adoc | 64 --
...g_annotations_manpage-Action_publishing.adoc | 53 --
...g_annotations_manpage-Action_restrictTo.adoc | 30 -
...rg_annotations_manpage-Action_semantics.adoc | 91 --
.../_rg_annotations_manpage-Action_typeOf.adoc | 31 -
.../_rg_annotations_manpage-Collection.adoc | 105 ---
...rg_annotations_manpage-CollectionLayout.adoc | 137 ---
...tions_manpage-CollectionLayout_cssClass.adoc | 36 -
...ns_manpage-CollectionLayout_defaultView.adoc | 43 -
...ns_manpage-CollectionLayout_describedAs.adoc | 38 -
...tations_manpage-CollectionLayout_hidden.adoc | 58 --
...otations_manpage-CollectionLayout_named.adoc | 53 --
...otations_manpage-CollectionLayout_paged.adoc | 45 -
...tations_manpage-CollectionLayout_render.adoc | 42 -
...tions_manpage-CollectionLayout_sortedBy.adoc | 59 --
...otations_manpage-Collection_domainEvent.adoc | 154 ----
..._annotations_manpage-Collection_editing.adoc | 48 --
...g_annotations_manpage-Collection_hidden.adoc | 54 --
...tations_manpage-Collection_notPersisted.adoc | 57 --
...g_annotations_manpage-Collection_typeOf.adoc | 26 -
.../guides/_rg_annotations_manpage-Column.adoc | 154 ----
.../guides/_rg_annotations_manpage-Digits.adoc | 35 -
.../_rg_annotations_manpage-Discriminator.adoc | 59 --
.../_rg_annotations_manpage-DomainObject.adoc | 105 ---
..._annotations_manpage-DomainObjectLayout.adoc | 115 ---
..._manpage-DomainObjectLayout_bookmarking.adoc | 66 --
...ons_manpage-DomainObjectLayout_cssClass.adoc | 34 -
...s_manpage-DomainObjectLayout_cssClassFa.adoc | 40 -
..._manpage-DomainObjectLayout_describedAs.adoc | 22 -
...ations_manpage-DomainObjectLayout_named.adoc | 37 -
...ations_manpage-DomainObjectLayout_paged.adoc | 33 -
...tions_manpage-DomainObjectLayout_plural.adoc | 28 -
...notations_manpage-DomainObject_auditing.adoc | 38 -
...age-DomainObject_autoCompleteRepository.adoc | 81 --
...nnotations_manpage-DomainObject_bounded.adoc | 36 -
...nnotations_manpage-DomainObject_editing.adoc | 61 --
...annotations_manpage-DomainObject_nature.adoc | 66 --
...tations_manpage-DomainObject_objectType.adoc | 46 -
...tations_manpage-DomainObject_publishing.adoc | 49 --
.../_rg_annotations_manpage-DomainService.adoc | 64 --
...annotations_manpage-DomainServiceLayout.adoc | 78 --
...ons_manpage-DomainServiceLayout_menuBar.adoc | 43 -
...s_manpage-DomainServiceLayout_menuOrder.adoc | 74 --
...tions_manpage-DomainServiceLayout_named.adoc | 29 -
...nnotations_manpage-DomainService_nature.adoc | 89 --
...ons_manpage-DomainService_repositoryFor.adoc | 26 -
.../guides/_rg_annotations_manpage-Facets.adoc | 15 -
.../_rg_annotations_manpage-HomePage.adoc | 52 --
.../guides/_rg_annotations_manpage-Inject.adoc | 154 ----
...g_annotations_manpage-MemberGroupLayout.adoc | 20 -
.../_rg_annotations_manpage-MemberOrder.adoc | 35 -
.../_rg_annotations_manpage-MinLength.adoc | 32 -
.../guides/_rg_annotations_manpage-Mixin.adoc | 40 -
.../_rg_annotations_manpage-NotPersistent.adoc | 18 -
.../_rg_annotations_manpage-Parameter.adoc | 96 ---
..._rg_annotations_manpage-ParameterLayout.adoc | 112 ---
...ations_manpage-ParameterLayout_cssClass.adoc | 29 -
...ons_manpage-ParameterLayout_describedAs.adoc | 38 -
...s_manpage-ParameterLayout_labelPosition.adoc | 41 -
...tions_manpage-ParameterLayout_multiLine.adoc | 32 -
...notations_manpage-ParameterLayout_named.adoc | 44 -
...age-ParameterLayout_renderedAsDayBefore.adoc | 35 -
...s_manpage-ParameterLayout_typicalLength.adoc | 36 -
...annotations_manpage-Parameter_maxLength.adoc | 35 -
...notations_manpage-Parameter_mustSatisfy.adoc | 65 --
...notations_manpage-Parameter_optionality.adoc | 36 -
...otations_manpage-Parameter_regexPattern.adoc | 31 -
..._annotations_manpage-PersistenceCapable.adoc | 90 --
.../_rg_annotations_manpage-PostConstruct.adoc | 71 --
.../_rg_annotations_manpage-PreDestroy.adoc | 53 --
.../_rg_annotations_manpage-PrimaryKey.adoc | 19 -
.../_rg_annotations_manpage-Programmatic.adoc | 27 -
.../_rg_annotations_manpage-Property.adoc | 134 ---
.../_rg_annotations_manpage-PropertyLayout.adoc | 142 ----
...tations_manpage-PropertyLayout_cssClass.adoc | 36 -
...ions_manpage-PropertyLayout_describedAs.adoc | 33 -
...notations_manpage-PropertyLayout_hidden.adoc | 78 --
...ns_manpage-PropertyLayout_labelPosition.adoc | 96 ---
...ations_manpage-PropertyLayout_multiLine.adoc | 44 -
...nnotations_manpage-PropertyLayout_named.adoc | 51 --
...page-PropertyLayout_renderedAsDayBefore.adoc | 45 -
...ns_manpage-PropertyLayout_typicalLength.adoc | 25 -
...nnotations_manpage-Property_domainEvent.adoc | 140 ----
...rg_annotations_manpage-Property_editing.adoc | 43 -
..._rg_annotations_manpage-Property_hidden.adoc | 66 --
..._annotations_manpage-Property_maxLength.adoc | 49 --
...nnotations_manpage-Property_mustSatisfy.adoc | 57 --
...notations_manpage-Property_notPersisted.adoc | 61 --
...nnotations_manpage-Property_optionality.adoc | 129 ---
...notations_manpage-Property_regexPattern.adoc | 28 -
.../_rg_annotations_manpage-RequestScoped.adoc | 50 --
.../guides/_rg_annotations_manpage-Title.adoc | 38 -
.../_rg_annotations_manpage-ViewModel.adoc | 44 -
..._rg_annotations_manpage-ViewModelLayout.adoc | 102 ---
...ations_manpage-ViewModelLayout_cssClass.adoc | 30 -
...ions_manpage-ViewModelLayout_cssClassFa.adoc | 41 -
...ons_manpage-ViewModelLayout_describedAs.adoc | 23 -
...notations_manpage-ViewModelLayout_named.adoc | 35 -
...notations_manpage-ViewModelLayout_paged.adoc | 34 -
...otations_manpage-ViewModelLayout_plural.adoc | 24 -
.../src/main/asciidoc/guides/_rg_classes.adoc | 22 -
.../_rg_classes_AppManifest-bootstrapping.adoc | 282 -------
.../guides/_rg_classes_contributee.adoc | 13 -
...es_contributee_manpage-HasTransactionId.adoc | 31 -
...classes_contributee_manpage-HasUserName.adoc | 27 -
.../guides/_rg_classes_domainevent.adoc | 76 --
...domainevent_manpage-AbstractDomainEvent.adoc | 20 -
...s_domainevent_manpage-ActionDomainEvent.adoc | 20 -
...mainevent_manpage-CollectionDomainEvent.adoc | 21 -
...domainevent_manpage-PropertyDomainEvent.adoc | 17 -
.../main/asciidoc/guides/_rg_classes_i18n.adoc | 11 -
...classes_i18n_manpage-TranslatableString.adoc | 13 -
.../guides/_rg_classes_lifecycleevent.adoc | 130 ---
...cleevent_manpage-AbstractLifecycleEvent.adoc | 27 -
...fecycleevent_manpage-ObjectCreatedEvent.adoc | 20 -
...ifecycleevent_manpage-ObjectLoadedEvent.adoc | 17 -
...cycleevent_manpage-ObjectPersistedEvent.adoc | 19 -
...ycleevent_manpage-ObjectPersistingEvent.adoc | 21 -
...ecycleevent_manpage-ObjectRemovingEvent.adoc | 20 -
...fecycleevent_manpage-ObjectUpdatedEvent.adoc | 21 -
...ecycleevent_manpage-ObjectUpdatingEvent.adoc | 22 -
.../main/asciidoc/guides/_rg_classes_roles.adoc | 15 -
...rg_classes_roles_manpage-HoldsUpdatedAt.adoc | 45 -
...rg_classes_roles_manpage-HoldsUpdatedBy.adoc | 19 -
..._rg_classes_roles_manpage-Timestampable.adoc | 23 -
.../main/asciidoc/guides/_rg_classes_spec.adoc | 108 ---
.../main/asciidoc/guides/_rg_classes_super.adoc | 105 ---
...s_super_manpage-AbstractContainedObject.adoc | 32 -
...sses_super_manpage-AbstractDomainObject.adoc | 14 -
...er_manpage-AbstractFactoryAndRepository.adoc | 15 -
...g_classes_super_manpage-AbstractService.adoc | 10 -
...lasses_super_manpage-AbstractSubscriber.adoc | 8 -
...classes_super_manpage-AbstractViewModel.adoc | 15 -
..._rg_classes_super_manpage-FixtureScript.adoc | 21 -
...rg_classes_super_manpage-FixtureScripts.adoc | 12 -
.../asciidoc/guides/_rg_classes_utility.adoc | 16 -
.../_rg_classes_utility_manpage-Enums.adoc | 8 -
...classes_utility_manpage-ObjectContracts.adoc | 107 ---
.../_rg_classes_utility_manpage-Reasons.adoc | 31 -
..._rg_classes_utility_manpage-TitleBuffer.adoc | 13 -
.../guides/_rg_classes_value-types.adoc | 119 ---
.../_rg_classes_value-types_manpage-Blob.adoc | 8 -
.../_rg_classes_value-types_manpage-Clob.adoc | 8 -
.../_rg_classes_value-types_manpage-Color.adoc | 9 -
.../_rg_classes_value-types_manpage-Money.adoc | 8 -
...rg_classes_value-types_manpage-Password.adoc | 8 -
.../src/main/asciidoc/guides/_rg_methods.adoc | 17 -
.../asciidoc/guides/_rg_methods_lifecycle.adoc | 102 ---
.../guides/_rg_methods_lifecycle_jdo-api.adoc | 53 --
.../_rg_methods_lifecycle_manpage-created.adoc | 17 -
.../_rg_methods_lifecycle_manpage-loaded.adoc | 15 -
..._rg_methods_lifecycle_manpage-persisted.adoc | 16 -
...rg_methods_lifecycle_manpage-persisting.adoc | 16 -
.../_rg_methods_lifecycle_manpage-removed.adoc | 16 -
.../_rg_methods_lifecycle_manpage-removing.adoc | 16 -
.../_rg_methods_lifecycle_manpage-updated.adoc | 18 -
.../_rg_methods_lifecycle_manpage-updating.adoc | 15 -
.../asciidoc/guides/_rg_methods_prefixes.adoc | 219 -----
.../_rg_methods_prefixes_manpage-addTo.adoc | 37 -
...g_methods_prefixes_manpage-autoComplete.adoc | 96 ---
.../_rg_methods_prefixes_manpage-choices.adoc | 143 ----
.../_rg_methods_prefixes_manpage-clear.adoc | 32 -
.../_rg_methods_prefixes_manpage-default.adoc | 129 ---
.../_rg_methods_prefixes_manpage-disable.adoc | 93 ---
.../_rg_methods_prefixes_manpage-get.adoc | 19 -
.../_rg_methods_prefixes_manpage-hide.adoc | 82 --
.../_rg_methods_prefixes_manpage-modify.adoc | 37 -
..._rg_methods_prefixes_manpage-removeFrom.adoc | 37 -
.../_rg_methods_prefixes_manpage-set.adoc | 13 -
.../_rg_methods_prefixes_manpage-validate.adoc | 113 ---
..._methods_prefixes_manpage-validateAddTo.adoc | 45 -
...ods_prefixes_manpage-validateRemoveFrom.adoc | 45 -
.../asciidoc/guides/_rg_methods_reserved.adoc | 58 --
.../_rg_methods_reserved_manpage-cssClass.adoc | 46 -
.../_rg_methods_reserved_manpage-disable.adoc | 102 ---
.../_rg_methods_reserved_manpage-getId.adoc | 19 -
.../_rg_methods_reserved_manpage-hide.adoc | 39 -
.../_rg_methods_reserved_manpage-iconName.adoc | 36 -
.../_rg_methods_reserved_manpage-title.adoc | 65 --
.../_rg_methods_reserved_manpage-validate.adoc | 27 -
.../main/asciidoc/guides/_rg_object-layout.adoc | 18 -
.../_rg_object-layout_application-menu.adoc | 171 ----
.../guides/_rg_object-layout_dynamic.adoc | 113 ---
.../_rg_object-layout_static-vs-dynamic.adoc | 26 -
.../guides/_rg_object-layout_static.adoc | 159 ----
.../src/main/asciidoc/guides/_rg_runtime.adoc | 28 -
.../_rg_runtime_application-specific.adoc | 13 -
...me_application-specific_application-css.adoc | 8 -
...ime_application-specific_application-js.adoc | 9 -
.../guides/_rg_runtime_configuration-files.adoc | 40 -
.../guides/_rg_runtime_configuring-core.adoc | 332 --------
.../_rg_runtime_configuring-datanucleus.adoc | 18 -
...s_disabling-persistence-by-reachability.adoc | 88 --
...atanucleus_eagerly-registering-entities.adoc | 23 -
...configuring-datanucleus_persistence-xml.adoc | 10 -
...time_configuring-datanucleus_properties.adoc | 66 --
...ring-datanucleus_using-jndi-data-source.adoc | 75 --
.../guides/_rg_runtime_deployment-types.adoc | 111 ---
.../_rg_runtime_specifying-components.adoc | 110 ---
.../main/asciidoc/guides/_rg_services-api.adoc | 295 -------
...ces-api_manpage-ActionInvocationContext.adoc | 99 ---
..._services-api_manpage-BackgroundService.adoc | 124 ---
...roundService_BackgroundCommandExecution.adoc | 25 -
...es-api_manpage-BackgroundService_Quartz.adoc | 162 ----
...rg_services-api_manpage-BookmarkService.adoc | 118 ---
...ices-api_manpage-BulkInteractionContext.adoc | 9 -
.../_rg_services-api_manpage-ClockService.adoc | 105 ---
..._rg_services-api_manpage-CommandContext.adoc | 218 -----
...rg_services-api_manpage-DeepLinkService.adoc | 58 --
...vices-api_manpage-DomainObjectContainer.adoc | 44 -
...nObjectContainer_generic-repository-api.adoc | 89 --
...page-DomainObjectContainer_messages-api.adoc | 50 --
...mainObjectContainer_object-creation-api.adoc | 49 --
...nObjectContainer_object-persistence-api.adoc | 62 --
...-DomainObjectContainer_presentation-api.adoc | 46 -
...ge-DomainObjectContainer_properties-api.adoc | 54 --
...page-DomainObjectContainer_security-api.adoc | 48 --
...page-DomainObjectContainer_services-api.adoc | 37 -
...ge-DomainObjectContainer_validation-api.adoc | 26 -
.../_rg_services-api_manpage-EmailService.adoc | 99 ---
...rg_services-api_manpage-EventBusService.adoc | 391 ---------
...vices-api_manpage-FixtureScriptsDefault.adoc | 50 --
..._services-api_manpage-GuiceBeanProvider.adoc | 91 --
..._rg_services-api_manpage-IsisJdoSupport.adoc | 277 ------
..._rg_services-api_manpage-MementoService.adoc | 132 ---
...g_services-api_manpage-MetamodelService.adoc | 43 -
..._services-api_manpage-QueryResultsCache.adoc | 128 ---
.../_rg_services-api_manpage-Scratchpad.adoc | 130 ---
.../_rg_services-api_manpage-SudoService.adoc | 69 --
..._rg_services-api_manpage-WrapperFactory.adoc | 163 ----
...services-api_manpage-XmlSnapshotService.adoc | 215 -----
.../main/asciidoc/guides/_rg_services-spi.adoc | 287 -------
...rg_services-spi_manpage-AuditingService.adoc | 85 --
...es-spi_manpage-BackgroundCommandService.adoc | 130 ---
...vices-spi_manpage-ClassDiscoveryService.adoc | 84 --
..._rg_services-spi_manpage-CommandService.adoc | 100 ---
...vices-spi_manpage-ContentMappingService.adoc | 106 ---
...s-spi_manpage-ContentNegotiationService.adoc | 206 -----
...es-spi_manpage-EmailNotificationService.adoc | 81 --
...vices-spi_manpage-ErrorReportingService.adoc | 105 ---
...rg_services-spi_manpage-EventSerializer.adoc | 73 --
...ervices-spi_manpage-ExceptionRecognizer.adoc | 126 ---
...age-FixtureScriptsSpecificationProvider.adoc | 70 --
..._rg_services-spi_manpage-LocaleProvider.adoc | 72 --
..._services-spi_manpage-PublishingService.adoc | 164 ----
...vices-spi_manpage-RepresentationService.adoc | 107 ---
...services-spi_manpage-TranslationService.adoc | 80 --
...rvices-spi_manpage-TranslationsResolver.adoc | 68 --
...services-spi_manpage-UserProfileService.adoc | 44 -
...ces-spi_manpage-UserRegistrationService.adoc | 82 --
.../src/main/asciidoc/guides/_rg_web-xml.adoc | 458 ----------
.../src/main/asciidoc/guides/_rgant-Action.adoc | 133 +++
.../asciidoc/guides/_rgant-ActionLayout.adoc | 133 +++
.../guides/_rgant-ActionLayout_bookmarking.adoc | 64 ++
.../_rgant-ActionLayout_contributedAs.adoc | 54 ++
.../guides/_rgant-ActionLayout_cssClass.adoc | 41 +
.../guides/_rgant-ActionLayout_cssClassFa.adoc | 59 ++
.../guides/_rgant-ActionLayout_describedAs.adoc | 37 +
.../guides/_rgant-ActionLayout_hidden.adoc | 57 ++
.../guides/_rgant-ActionLayout_named.adoc | 45 +
.../guides/_rgant-ActionLayout_position.adoc | 80 ++
.../asciidoc/guides/_rgant-Action_command.adoc | 134 +++
.../guides/_rgant-Action_domainEvent.adoc | 164 ++++
.../asciidoc/guides/_rgant-Action_hidden.adoc | 49 ++
.../asciidoc/guides/_rgant-Action_invokeOn.adoc | 64 ++
.../guides/_rgant-Action_publishing.adoc | 53 ++
.../guides/_rgant-Action_restrictTo.adoc | 30 +
.../guides/_rgant-Action_semantics.adoc | 91 ++
.../asciidoc/guides/_rgant-Action_typeOf.adoc | 31 +
.../main/asciidoc/guides/_rgant-Collection.adoc | 105 +++
.../guides/_rgant-CollectionLayout.adoc | 137 +++
.../_rgant-CollectionLayout_cssClass.adoc | 36 +
.../_rgant-CollectionLayout_defaultView.adoc | 43 +
.../_rgant-CollectionLayout_describedAs.adoc | 38 +
.../guides/_rgant-CollectionLayout_hidden.adoc | 58 ++
.../guides/_rgant-CollectionLayout_named.adoc | 53 ++
.../guides/_rgant-CollectionLayout_paged.adoc | 45 +
.../guides/_rgant-CollectionLayout_render.adoc | 42 +
.../_rgant-CollectionLayout_sortedBy.adoc | 59 ++
.../guides/_rgant-Collection_domainEvent.adoc | 174 ++++
.../guides/_rgant-Collection_editing.adoc | 48 ++
.../guides/_rgant-Collection_hidden.adoc | 54 ++
.../guides/_rgant-Collection_notPersisted.adoc | 57 ++
.../guides/_rgant-Collection_typeOf.adoc | 26 +
.../src/main/asciidoc/guides/_rgant-Column.adoc | 154 ++++
.../src/main/asciidoc/guides/_rgant-Digits.adoc | 35 +
.../asciidoc/guides/_rgant-Discriminator.adoc | 59 ++
.../asciidoc/guides/_rgant-DomainObject.adoc | 154 ++++
.../guides/_rgant-DomainObjectLayout.adoc | 132 +++
.../_rgant-DomainObjectLayout_bookmarking.adoc | 66 ++
.../_rgant-DomainObjectLayout_cssClass.adoc | 34 +
.../_rgant-DomainObjectLayout_cssClassFa.adoc | 40 +
...gant-DomainObjectLayout_cssClassUiEvent.adoc | 126 +++
.../_rgant-DomainObjectLayout_describedAs.adoc | 22 +
.../_rgant-DomainObjectLayout_iconUiEvent.adoc | 122 +++
.../guides/_rgant-DomainObjectLayout_named.adoc | 37 +
.../guides/_rgant-DomainObjectLayout_paged.adoc | 33 +
.../_rgant-DomainObjectLayout_plural.adoc | 28 +
.../_rgant-DomainObjectLayout_titleUiEvent.adoc | 120 +++
.../guides/_rgant-DomainObject_auditing.adoc | 38 +
...ant-DomainObject_autoCompleteRepository.adoc | 81 ++
.../guides/_rgant-DomainObject_bounded.adoc | 36 +
...gant-DomainObject_createdLifecycleEvent.adoc | 108 +++
.../guides/_rgant-DomainObject_editing.adoc | 61 ++
...rgant-DomainObject_loadedLifecycleEvent.adoc | 105 +++
.../guides/_rgant-DomainObject_nature.adoc | 66 ++
.../guides/_rgant-DomainObject_objectType.adoc | 46 +
...nt-DomainObject_persistedLifecycleEvent.adoc | 111 +++
...t-DomainObject_persistingLifecycleEvent.adoc | 114 +++
.../guides/_rgant-DomainObject_publishing.adoc | 49 ++
...ant-DomainObject_removingLifecycleEvent.adoc | 114 +++
...gant-DomainObject_updatedLifecycleEvent.adoc | 110 +++
...ant-DomainObject_updatingLifecycleEvent.adoc | 114 +++
.../asciidoc/guides/_rgant-DomainService.adoc | 64 ++
.../guides/_rgant-DomainServiceLayout.adoc | 78 ++
.../_rgant-DomainServiceLayout_menuBar.adoc | 43 +
.../_rgant-DomainServiceLayout_menuOrder.adoc | 74 ++
.../_rgant-DomainServiceLayout_named.adoc | 29 +
.../guides/_rgant-DomainService_nature.adoc | 89 ++
.../_rgant-DomainService_repositoryFor.adoc | 26 +
.../src/main/asciidoc/guides/_rgant-Facets.adoc | 15 +
.../main/asciidoc/guides/_rgant-HomePage.adoc | 52 ++
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 154 ++++
.../guides/_rgant-MemberGroupLayout.adoc | 20 +
.../asciidoc/guides/_rgant-MemberOrder.adoc | 35 +
.../main/asciidoc/guides/_rgant-MinLength.adoc | 32 +
.../src/main/asciidoc/guides/_rgant-Mixin.adoc | 40 +
.../asciidoc/guides/_rgant-NotPersistent.adoc | 18 +
.../main/asciidoc/guides/_rgant-Parameter.adoc | 96 +++
.../asciidoc/guides/_rgant-ParameterLayout.adoc | 112 +++
.../guides/_rgant-ParameterLayout_cssClass.adoc | 29 +
.../_rgant-ParameterLayout_describedAs.adoc | 38 +
.../_rgant-ParameterLayout_labelPosition.adoc | 41 +
.../_rgant-ParameterLayout_multiLine.adoc | 32 +
.../guides/_rgant-ParameterLayout_named.adoc | 44 +
...ant-ParameterLayout_renderedAsDayBefore.adoc | 35 +
.../_rgant-ParameterLayout_typicalLength.adoc | 36 +
.../guides/_rgant-Parameter_maxLength.adoc | 35 +
.../guides/_rgant-Parameter_mustSatisfy.adoc | 65 ++
.../guides/_rgant-Parameter_optionality.adoc | 36 +
.../guides/_rgant-Parameter_regexPattern.adoc | 37 +
.../guides/_rgant-PersistenceCapable.adoc | 90 ++
.../asciidoc/guides/_rgant-PostConstruct.adoc | 71 ++
.../main/asciidoc/guides/_rgant-PreDestroy.adoc | 53 ++
.../main/asciidoc/guides/_rgant-PrimaryKey.adoc | 19 +
.../asciidoc/guides/_rgant-Programmatic.adoc | 27 +
.../main/asciidoc/guides/_rgant-Property.adoc | 134 +++
.../asciidoc/guides/_rgant-PropertyLayout.adoc | 142 ++++
.../guides/_rgant-PropertyLayout_cssClass.adoc | 36 +
.../_rgant-PropertyLayout_describedAs.adoc | 33 +
.../guides/_rgant-PropertyLayout_hidden.adoc | 78 ++
.../_rgant-PropertyLayout_labelPosition.adoc | 96 +++
.../guides/_rgant-PropertyLayout_multiLine.adoc | 44 +
.../guides/_rgant-PropertyLayout_named.adoc | 51 ++
...gant-PropertyLayout_renderedAsDayBefore.adoc | 45 +
.../_rgant-PropertyLayout_typicalLength.adoc | 25 +
.../guides/_rgant-Property_domainEvent.adoc | 154 ++++
.../guides/_rgant-Property_editing.adoc | 43 +
.../asciidoc/guides/_rgant-Property_hidden.adoc | 66 ++
.../guides/_rgant-Property_maxLength.adoc | 49 ++
.../guides/_rgant-Property_mustSatisfy.adoc | 57 ++
.../guides/_rgant-Property_notPersisted.adoc | 61 ++
.../guides/_rgant-Property_optionality.adoc | 129 +++
.../guides/_rgant-Property_regexPattern.adoc | 35 +
.../asciidoc/guides/_rgant-RequestScoped.adoc | 50 ++
.../src/main/asciidoc/guides/_rgant-Title.adoc | 62 ++
.../main/asciidoc/guides/_rgant-ViewModel.adoc | 44 +
.../asciidoc/guides/_rgant-ViewModelLayout.adoc | 102 +++
.../guides/_rgant-ViewModelLayout_cssClass.adoc | 30 +
.../_rgant-ViewModelLayout_cssClassFa.adoc | 41 +
.../_rgant-ViewModelLayout_describedAs.adoc | 23 +
.../guides/_rgant-ViewModelLayout_named.adoc | 35 +
.../guides/_rgant-ViewModelLayout_paged.adoc | 34 +
.../guides/_rgant-ViewModelLayout_plural.adoc | 24 +
.../guides/_rgant-XmlJavaTypeAdapter.adoc | 27 +
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 83 ++
.../src/main/asciidoc/guides/_rgant_aaa.adoc | 17 +
.../asciidoc/guides/_rgant_aaa_deprecated.adoc | 342 ++++++++
.../main/asciidoc/guides/_rgant_aaa_jdo.adoc | 113 +++
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 73 ++
.../main/asciidoc/guides/_rgant_aaa_main.adoc | 103 +++
.../main/asciidoc/guides/_rgant_aaa_other.adoc | 57 ++
.../asciidoc/guides/_rgant_aaa_partial.adoc | 92 ++
.../guides/_rgcfg_configuration-files.adoc | 40 +
.../guides/_rgcfg_configuring-core.adoc | 455 ++++++++++
.../guides/_rgcfg_configuring-datanucleus.adoc | 18 +
...s_disabling-persistence-by-reachability.adoc | 88 ++
...atanucleus_eagerly-registering-entities.adoc | 23 +
...configuring-datanucleus_persistence-xml.adoc | 10 +
...gcfg_configuring-datanucleus_properties.adoc | 66 ++
...ring-datanucleus_using-jndi-data-source.adoc | 75 ++
.../guides/_rgcfg_deployment-types.adoc | 111 +++
.../guides/_rgcfg_specifying-components.adoc | 110 +++
.../main/asciidoc/guides/_rgcms_classes.adoc | 23 +
...rgcms_classes_AppManifest-bootstrapping.adoc | 282 +++++++
.../guides/_rgcms_classes_contributee.adoc | 13 +
...ms_classes_contributee_HasTransactionId.adoc | 31 +
.../_rgcms_classes_contributee_HasUserName.adoc | 27 +
.../guides/_rgcms_classes_domainevent.adoc | 76 ++
...classes_domainevent_AbstractDomainEvent.adoc | 20 +
...s_classes_domainevent_ActionDomainEvent.adoc | 20 +
...asses_domainevent_CollectionDomainEvent.adoc | 21 +
...classes_domainevent_PropertyDomainEvent.adoc | 17 +
.../asciidoc/guides/_rgcms_classes_i18n.adoc | 11 +
.../_rgcms_classes_i18n_TranslatableString.adoc | 13 +
.../guides/_rgcms_classes_lifecycleevent.adoc | 130 +++
...s_lifecycleevent_AbstractLifecycleEvent.adoc | 27 +
...asses_lifecycleevent_ObjectCreatedEvent.adoc | 20 +
...lasses_lifecycleevent_ObjectLoadedEvent.adoc | 17 +
...ses_lifecycleevent_ObjectPersistedEvent.adoc | 19 +
...es_lifecycleevent_ObjectPersistingEvent.adoc | 21 +
...sses_lifecycleevent_ObjectRemovingEvent.adoc | 20 +
...asses_lifecycleevent_ObjectUpdatedEvent.adoc | 21 +
...sses_lifecycleevent_ObjectUpdatingEvent.adoc | 22 +
.../asciidoc/guides/_rgcms_classes_roles.adoc | 18 +
.../guides/_rgcms_classes_roles_Dto.adoc | 61 ++
.../_rgcms_classes_roles_HoldsUpdatedAt.adoc | 44 +
.../_rgcms_classes_roles_HoldsUpdatedBy.adoc | 19 +
.../_rgcms_classes_roles_Persistable.adoc | 34 +
.../_rgcms_classes_roles_Timestampable.adoc | 23 +
.../asciidoc/guides/_rgcms_classes_spec.adoc | 108 +++
.../asciidoc/guides/_rgcms_classes_super.adoc | 105 +++
...s_classes_super_AbstractContainedObject.adoc | 32 +
...gcms_classes_super_AbstractDomainObject.adoc | 14 +
...sses_super_AbstractFactoryAndRepository.adoc | 15 +
.../_rgcms_classes_super_AbstractService.adoc | 10 +
..._rgcms_classes_super_AbstractSubscriber.adoc | 18 +
.../_rgcms_classes_super_AbstractViewModel.adoc | 15 +
.../_rgcms_classes_super_FixtureScript.adoc | 21 +
.../_rgcms_classes_super_FixtureScripts.adoc | 12 +
.../asciidoc/guides/_rgcms_classes_uievent.adoc | 62 ++
.../_rgcms_classes_uievent_CssClassUiEvent.adoc | 22 +
.../_rgcms_classes_uievent_IconUiEvent.adoc | 23 +
.../_rgcms_classes_uievent_TitleUiEvent.adoc | 22 +
.../asciidoc/guides/_rgcms_classes_utility.adoc | 16 +
.../guides/_rgcms_classes_utility_Enums.adoc | 8 +
.../_rgcms_classes_utility_ObjectContracts.adoc | 107 +++
.../guides/_rgcms_classes_utility_Reasons.adoc | 31 +
.../_rgcms_classes_utility_TitleBuffer.adoc | 13 +
.../guides/_rgcms_classes_value-types.adoc | 119 +++
.../guides/_rgcms_classes_value-types_Blob.adoc | 8 +
.../guides/_rgcms_classes_value-types_Clob.adoc | 8 +
.../_rgcms_classes_value-types_Color.adoc | 8 +
.../_rgcms_classes_value-types_Money.adoc | 8 +
.../_rgcms_classes_value-types_Password.adoc | 8 +
.../main/asciidoc/guides/_rgcms_methods.adoc | 17 +
.../guides/_rgcms_methods_lifecycle.adoc | 102 +++
.../_rgcms_methods_lifecycle_created.adoc | 17 +
.../_rgcms_methods_lifecycle_jdo-api.adoc | 53 ++
.../guides/_rgcms_methods_lifecycle_loaded.adoc | 15 +
.../_rgcms_methods_lifecycle_persisted.adoc | 16 +
.../_rgcms_methods_lifecycle_persisting.adoc | 16 +
.../_rgcms_methods_lifecycle_removed.adoc | 16 +
.../_rgcms_methods_lifecycle_removing.adoc | 16 +
.../_rgcms_methods_lifecycle_updated.adoc | 18 +
.../_rgcms_methods_lifecycle_updating.adoc | 15 +
.../guides/_rgcms_methods_prefixes.adoc | 219 +++++
.../guides/_rgcms_methods_prefixes_addTo.adoc | 37 +
.../_rgcms_methods_prefixes_autoComplete.adoc | 96 +++
.../guides/_rgcms_methods_prefixes_choices.adoc | 143 ++++
.../guides/_rgcms_methods_prefixes_clear.adoc | 32 +
.../guides/_rgcms_methods_prefixes_default.adoc | 129 +++
.../guides/_rgcms_methods_prefixes_disable.adoc | 93 +++
.../guides/_rgcms_methods_prefixes_get.adoc | 19 +
.../guides/_rgcms_methods_prefixes_hide.adoc | 82 ++
.../guides/_rgcms_methods_prefixes_modify.adoc | 37 +
.../_rgcms_methods_prefixes_removeFrom.adoc | 37 +
.../guides/_rgcms_methods_prefixes_set.adoc | 13 +
.../_rgcms_methods_prefixes_validate.adoc | 113 +++
.../_rgcms_methods_prefixes_validateAddTo.adoc | 45 +
...cms_methods_prefixes_validateRemoveFrom.adoc | 45 +
.../guides/_rgcms_methods_reserved.adoc | 58 ++
.../_rgcms_methods_reserved_cssClass.adoc | 46 +
.../guides/_rgcms_methods_reserved_disable.adoc | 102 +++
.../guides/_rgcms_methods_reserved_getId.adoc | 19 +
.../guides/_rgcms_methods_reserved_hide.adoc | 39 +
.../_rgcms_methods_reserved_iconName.adoc | 36 +
.../guides/_rgcms_methods_reserved_title.adoc | 65 ++
.../_rgcms_methods_reserved_validate.adoc | 27 +
.../main/asciidoc/guides/_rgcms_schema-aim.adoc | 97 +++
.../asciidoc/guides/_rgcms_schema-common.adoc | 103 +++
.../src/main/asciidoc/guides/_rgcms_schema.adoc | 24 +
.../src/main/asciidoc/guides/_rgsvc-api.adoc | 306 +++++++
.../_rgsvc-api_ActionInvocationContext.adoc | 98 +++
.../guides/_rgsvc-api_BackgroundService.adoc | 123 +++
...roundService_BackgroundCommandExecution.adoc | 25 +
.../_rgsvc-api_BackgroundService_Quartz.adoc | 162 ++++
.../guides/_rgsvc-api_BookmarkService.adoc | 116 +++
.../_rgsvc-api_BulkInteractionContext.adoc | 9 +
.../guides/_rgsvc-api_ClockService.adoc | 101 +++
.../guides/_rgsvc-api_CommandContext.adoc | 216 +++++
.../guides/_rgsvc-api_DeepLinkService.adoc | 56 ++
.../_rgsvc-api_DomainObjectContainer.adoc | 40 +
...nObjectContainer_generic-repository-api.adoc | 89 ++
...-api_DomainObjectContainer_messages-api.adoc | 50 ++
...mainObjectContainer_object-creation-api.adoc | 49 ++
...nObjectContainer_object-persistence-api.adoc | 62 ++
..._DomainObjectContainer_presentation-api.adoc | 46 +
...pi_DomainObjectContainer_properties-api.adoc | 54 ++
...-api_DomainObjectContainer_security-api.adoc | 48 ++
...-api_DomainObjectContainer_services-api.adoc | 37 +
...pi_DomainObjectContainer_validation-api.adoc | 26 +
.../guides/_rgsvc-api_EmailService.adoc | 95 +++
.../guides/_rgsvc-api_EventBusService.adoc | 405 +++++++++
.../_rgsvc-api_FixtureScriptsDefault.adoc | 50 ++
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 91 ++
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 276 ++++++
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 67 ++
.../guides/_rgsvc-api_MementoService.adoc | 131 +++
.../guides/_rgsvc-api_MetamodelService.adoc | 42 +
.../guides/_rgsvc-api_QueryResultsCache.adoc | 126 +++
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 128 +++
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 69 ++
.../guides/_rgsvc-api_WrapperFactory.adoc | 162 ++++
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 220 +++++
.../src/main/asciidoc/guides/_rgsvc-spi.adoc | 299 +++++++
.../guides/_rgsvc-spi_AuditingService.adoc | 85 ++
.../_rgsvc-spi_BackgroundCommandService.adoc | 131 +++
.../_rgsvc-spi_ClassDiscoveryService.adoc | 82 ++
.../guides/_rgsvc-spi_CommandService.adoc | 100 +++
.../_rgsvc-spi_ContentMappingService.adoc | 107 +++
.../_rgsvc-spi_ContentNegotiationService.adoc | 204 +++++
.../_rgsvc-spi_EmailNotificationService.adoc | 81 ++
.../_rgsvc-spi_ErrorReportingService.adoc | 106 +++
.../guides/_rgsvc-spi_EventSerializer.adoc | 74 ++
.../guides/_rgsvc-spi_ExceptionRecognizer.adoc | 119 +++
...spi_FixtureScriptsSpecificationProvider.adoc | 76 ++
.../guides/_rgsvc-spi_LocaleProvider.adoc | 70 ++
.../guides/_rgsvc-spi_PublishingService.adoc | 192 +++++
.../_rgsvc-spi_RepresentationService.adoc | 103 +++
.../guides/_rgsvc-spi_TranslationService.adoc | 80 ++
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 67 ++
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 59 ++
.../guides/_rgsvc-spi_UserProfileService.adoc | 47 ++
.../_rgsvc-spi_UserRegistrationService.adoc | 98 +++
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../_tg_stop-scaffolding-start-coding.adoc | 134 +--
.../main/asciidoc/guides/_ug_core-concepts.adoc | 22 -
.../guides/_ug_core-concepts_add-ons.adoc | 35 -
.../_ug_core-concepts_building-blocks.adoc | 267 ------
...re-concepts_framework-provided-services.adoc | 54 --
..._core-concepts_other-deployment-options.adoc | 81 --
.../guides/_ug_core-concepts_philosophy.adoc | 21 -
.../_ug_core-concepts_philosophy_aop.adoc | 36 -
.../_ug_core-concepts_philosophy_dci.adoc | 9 -
...oncepts_philosophy_domain-driven-design.adoc | 78 --
...cepts_philosophy_hexagonal-architecture.adoc | 29 -
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 --
...ncepts_philosophy_naked-objects-pattern.adoc | 60 --
...bjects-pattern_object-interface-mapping.adoc | 18 -
.../guides/_ug_core-concepts_principles.adoc | 16 -
...core-concepts_principles_apache-isis-vs.adoc | 16 -
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 -
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 -
...ts_principles_apache-isis-vs_metawidget.adoc | 16 -
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 -
...ug_core-concepts_principles_isis-itself.adoc | 47 --
.../_ug_core-concepts_principles_your-apps.adoc | 39 -
.../main/asciidoc/guides/_ug_deployment.adoc | 19 -
.../guides/_ug_deployment_cmd-line.adoc | 113 ---
...g_deployment_externalized-configuration.adoc | 245 ------
.../asciidoc/guides/_ug_deployment_gae.adoc | 50 --
.../guides/_ug_deployment_jvm-flags.adoc | 52 --
.../asciidoc/guides/_ug_deployment_neo4j.adoc | 59 --
.../asciidoc/guides/_ug_deployment_tomcat.adoc | 28 -
.../src/main/asciidoc/guides/_ug_extending.adoc | 14 -
.../guides/_ug_extending_programming-model.adoc | 13 -
...ding_programming-model_custom-validator.adoc | 107 ---
..._extending_programming-model_finetuning.adoc | 80 --
...rogramming-model_layout-metadata-reader.adoc | 82 --
.../_ug_extending_restfulobjects-viewer.adoc | 51 --
.../guides/_ug_extending_wicket-viewer.adoc | 25 -
...ng_wicket-viewer_custom-bootstrap-theme.adoc | 34 -
...ug_extending_wicket-viewer_custom-pages.adoc | 92 --
...ng_wicket-viewer_isis-addons-extensions.adoc | 17 -
...viewer_login-via-query-args-prototyping.adoc | 49 --
...g_wicket-viewer_replacing-page-elements.adoc | 167 ----
.../asciidoc/guides/_ug_getting-started.adoc | 37 -
...ug_getting-started_datanucleus-enhancer.adoc | 107 ---
..._ug_getting-started_simpleapp-archetype.adoc | 304 -------
.../asciidoc/guides/_ug_headless-access.adoc | 27 -
...less-access_AbstractIsisSessionTemplate.adoc | 40 -
...dless-access_BackgroundCommandExecution.adoc | 45 -
.../src/main/asciidoc/guides/_ug_how-tos.adoc | 21 -
.../guides/_ug_how-tos_business-rules.adoc | 72 --
.../guides/_ug_how-tos_class-structure.adoc | 38 -
...w-tos_class-structure_action-parameters.adoc | 26 -
.../_ug_how-tos_class-structure_actions.adoc | 19 -
...ow-tos_class-structure_class-definition.adoc | 24 -
..._ug_how-tos_class-structure_collections.adoc | 26 -
...ow-tos_class-structure_ignoring-methods.adoc | 16 -
...how-tos_class-structure_inject-services.adoc | 83 --
...lass-structure_properties-vs-parameters.adoc | 45 -
.../_ug_how-tos_class-structure_properties.adoc | 299 -------
.../guides/_ug_how-tos_contributed-members.adoc | 69 --
.../main/asciidoc/guides/_ug_how-tos_crud.adoc | 29 -
.../guides/_ug_how-tos_derived-members.adoc | 48 --
.../guides/_ug_how-tos_domain-services.adoc | 313 -------
.../_ug_how-tos_drop-downs-and-defaults.adoc | 65 --
.../_ug_how-tos_entity-relationships.adoc | 15 -
...aged-1-to-m-bidirectional-relationships.adoc | 58 --
.../guides/_ug_how-tos_persisted-title.adoc | 56 --
...placing-default-service-implementations.adoc | 64 --
.../asciidoc/guides/_ug_how-tos_ui-hints.adoc | 15 -
...g_how-tos_ui-hints_action-icons-and-css.adoc | 58 --
.../_ug_how-tos_ui-hints_eager-rendering.adoc | 58 --
.../guides/_ug_how-tos_ui-hints_layout.adoc | 9 -
...how-tos_ui-hints_names-and-descriptions.adoc | 47 --
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 ---
.../main/asciidoc/guides/_ug_more-advanced.adoc | 26 -
.../guides/_ug_more-advanced_bulk-actions.adoc | 8 -
.../guides/_ug_more-advanced_decoupling.adoc | 28 -
..._more-advanced_decoupling_contributions.adoc | 23 -
..._ug_more-advanced_decoupling_db-schemas.adoc | 141 ----
.../_ug_more-advanced_decoupling_event-bus.adoc | 11 -
.../_ug_more-advanced_decoupling_mixins.adoc | 191 -----
...ore-advanced_decoupling_pushing-changes.adoc | 140 ----
...-advanced_decoupling_vetoing-visibility.adoc | 15 -
.../asciidoc/guides/_ug_more-advanced_i18n.adoc | 378 ---------
.../_ug_more-advanced_mapping-rdbms-views.adoc | 9 -
.../guides/_ug_more-advanced_multi-tenancy.adoc | 8 -
...ore-advanced_overriding-jdo-annotations.adoc | 55 --
..._ug_more-advanced_persistence-lifecycle.adoc | 8 -
.../guides/_ug_more-advanced_tips-n-tricks.adoc | 15 -
...ore-advanced_tips-n-tricks_are-you-sure.adoc | 76 --
...ore-advanced_tips-n-tricks_enhance-only.adoc | 17 -
...-advanced_tips-n-tricks_per-user-themes.adoc | 85 --
...-tricks_render-all-properties-in-tables.adoc | 49 --
...tricks_simulating-collections-of-values.adoc | 23 -
...g_more-advanced_transactions-and-errors.adoc | 33 -
.../guides/_ug_more-advanced_view-models.adoc | 22 -
.../guides/_ug_restfulobjects-viewer.adoc | 25 -
...objects-viewer_configuration-properties.adoc | 72 --
...configuration-properties_honor-ui-hints.adoc | 27 -
...erties_simplified-object-representation.adoc | 68 --
...uration-properties_suppressing-elements.adoc | 39 -
.../_ug_restfulobjects-viewer_features.adoc | 23 -
...ug_restfulobjects-viewer_hints-and-tips.adoc | 85 --
.../src/main/asciidoc/guides/_ug_security.adoc | 53 --
.../_ug_security_api-for-applications.adoc | 63 --
...security_configuring-isis-to-use-bypass.adoc | 23 -
..._security_configuring-isis-to-use-shiro.adoc | 76 --
.../guides/_ug_security_shiro-caching.adoc | 41 -
.../guides/_ug_security_shiro-ini-realm.adoc | 133 ---
...shiro-isis-enhanced-wildcard-permission.adoc | 61 --
.../_ug_security_shiro-isis-ldap-realm.adoc | 146 ----
..._shiro-isisaddons-security-module-realm.adoc | 36 -
.../guides/_ug_security_shiro-jdbc-realm.adoc | 113 ---
.../_ug_security_usage-by-isis-viewers.adoc | 208 -----
.../src/main/asciidoc/guides/_ug_testing.adoc | 17 -
.../main/asciidoc/guides/_ug_testing_aaa.adoc | 166 ----
.../guides/_ug_testing_bdd-spec-support.adoc | 22 -
...ug_testing_bdd-spec-support_bdd-tooling.adoc | 14 -
...g_testing_bdd-spec-support_how-it-works.adoc | 20 -
...ug_testing_bdd-spec-support_key-classes.adoc | 59 --
...ng_bdd-spec-support_maven-configuration.adoc | 73 --
...ing_bdd-spec-support_writing-a-bdd-spec.adoc | 141 ----
.../guides/_ug_testing_fixture-scripts.adoc | 44 -
...g_testing_fixture-scripts_api-and-usage.adoc | 352 --------
...ug_testing_fixture-scripts_sudo-service.adoc | 59 --
.../guides/_ug_testing_integ-test-support.adoc | 24 -
...esting_integ-test-support_bootstrapping.adoc | 260 ------
..._integ-test-support_maven-configuration.adoc | 46 -
...esting_integ-test-support_typical-usage.adoc | 124 ---
...ting_integ-test-support_wrapper-factory.adoc | 162 ----
.../guides/_ug_testing_unit-test-support.adoc | 14 -
...esting_unit-test-support_contract-tests.adoc | 171 ----
...ting_unit-test-support_jmock-extensions.adoc | 59 --
...g_unit-test-support_maven-configuration.adoc | 46 -
...est-support_soap-fake-server-junit-rule.adoc | 113 ---
.../asciidoc/guides/_ug_troubleshooting.adoc | 14 -
.../_ug_troubleshooting_enabling-logging.adoc | 39 -
.../main/asciidoc/guides/_ug_wicket-viewer.adoc | 30 -
..._wicket-viewer_configuration-properties.adoc | 112 ---
...guration-properties_abbreviating-titles.adoc | 33 -
...ration-properties_showing-theme-chooser.adoc | 43 -
...uration-properties_stripped-wicket-tags.adoc | 26 -
...n-properties_suppressing-password-reset.adoc | 47 --
...tion-properties_suppressing-remember-me.adoc | 35 -
...guration-properties_suppressing-sign-up.adoc | 49 --
.../guides/_ug_wicket-viewer_customisation.adoc | 18 -
..._wicket-viewer_customisation_about-page.adoc | 121 ---
...icket-viewer_customisation_auto-refresh.adoc | 35 -
..._wicket-viewer_customisation_brand-logo.adoc | 71 --
...er_customisation_cheap-n-cheerful-theme.adoc | 29 -
...-viewer_customisation_custom-javascript.adoc | 42 -
...cket-viewer_customisation_default-theme.adoc | 29 -
...ewer_customisation_tweaking-css-classes.adoc | 107 ---
..._customisation_using-different-css-file.adoc | 36 -
...icket-viewer_customisation_welcome-page.adoc | 42 -
.../guides/_ug_wicket-viewer_features.adoc | 26 -
...wicket-viewer_features_blob-attachments.adoc | 121 ---
...wicket-viewer_features_bookmarked-pages.adoc | 108 ---
...cket-viewer_features_hints-and-copy-url.adoc | 79 --
..._ug_wicket-viewer_features_recent-pages.adoc | 53 --
...wicket-viewer_features_titles-in-tables.adoc | 76 --
...icket-viewer_features_user-registration.adoc | 81 --
.../guides/_ug_wicket-viewer_isis-addons.adoc | 33 -
.../guides/_ug_wicket-viewer_layout.adoc | 97 ---
.../_ug_wicket-viewer_request-parameters.adoc | 53 --
.../main/asciidoc/guides/_ugbtb_deployment.adoc | 19 +
.../guides/_ugbtb_deployment_cmd-line.adoc | 113 +++
...b_deployment_externalized-configuration.adoc | 245 ++++++
.../asciidoc/guides/_ugbtb_deployment_gae.adoc | 50 ++
.../guides/_ugbtb_deployment_jvm-flags.adoc | 52 ++
.../guides/_ugbtb_deployment_neo4j.adoc | 59 ++
.../guides/_ugbtb_deployment_tomcat.adoc | 28 +
.../asciidoc/guides/_ugbtb_more-advanced.adoc | 26 +
.../guides/_ugbtb_more-advanced_decoupling.adoc | 28 +
..._more-advanced_decoupling_contributions.adoc | 23 +
...btb_more-advanced_decoupling_db-schemas.adoc | 141 ++++
...gbtb_more-advanced_decoupling_event-bus.adoc | 11 +
.../_ugbtb_more-advanced_decoupling_mixins.adoc | 191 +++++
...ore-advanced_decoupling_pushing-changes.adoc | 140 ++++
...-advanced_decoupling_vetoing-visibility.adoc | 15 +
.../_ugbtb_more-advanced_headless-access.adoc | 27 +
...less-access_AbstractIsisSessionTemplate.adoc | 40 +
...dless-access_BackgroundCommandExecution.adoc | 45 +
.../guides/_ugbtb_more-advanced_i18n.adoc | 378 +++++++++
...ugbtb_more-advanced_mapping-rdbms-views.adoc | 9 +
.../_ugbtb_more-advanced_multi-tenancy.adoc | 8 +
...ore-advanced_overriding-jdo-annotations.adoc | 64 ++
.../_ugbtb_more-advanced_persisted-title.adoc | 82 ++
...placing-default-service-implementations.adoc | 64 ++
...b_more-advanced_transactions-and-errors.adoc | 33 +
.../_ugbtb_more-advanced_view-models.adoc | 19 +
.../_ugbtb_more-advanced_view-models_jaxb.adoc | 240 ++++++
...-advanced_view-models_programming-model.adoc | 87 ++
...btb_more-advanced_view-models_use-cases.adoc | 142 ++++
.../guides/_ugbtb_programming-model.adoc | 14 +
...gbtb_programming-model_custom-validator.adoc | 107 +++
.../_ugbtb_programming-model_finetuning.adoc | 80 ++
...rogramming-model_layout-metadata-reader.adoc | 82 ++
.../main/asciidoc/guides/_ugbtb_web-xml.adoc | 473 +++++++++++
.../asciidoc/guides/_ugfun_core-concepts.adoc | 22 +
.../guides/_ugfun_core-concepts_add-ons.adoc | 35 +
.../_ugfun_core-concepts_building-blocks.adoc | 335 ++++++++
...re-concepts_framework-provided-services.adoc | 54 ++
..._core-concepts_other-deployment-options.adoc | 81 ++
.../guides/_ugfun_core-concepts_philosophy.adoc | 21 +
.../_ugfun_core-concepts_philosophy_aop.adoc | 36 +
.../_ugfun_core-concepts_philosophy_dci.adoc | 9 +
...oncepts_philosophy_domain-driven-design.adoc | 79 ++
...cepts_philosophy_hexagonal-architecture.adoc | 29 +
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 ++
...ncepts_philosophy_naked-objects-pattern.adoc | 60 ++
...bjects-pattern_object-interface-mapping.adoc | 18 +
.../guides/_ugfun_core-concepts_principles.adoc | 16 +
...core-concepts_principles_apache-isis-vs.adoc | 16 +
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 +
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 +
...ts_principles_apache-isis-vs_metawidget.adoc | 16 +
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 +
...un_core-concepts_principles_isis-itself.adoc | 47 ++
...gfun_core-concepts_principles_your-apps.adoc | 39 +
.../src/main/asciidoc/guides/_ugfun_faqs.adoc | 18 +
.../guides/_ugfun_faqs_enabling-logging.adoc | 39 +
.../guides/_ugfun_faqs_enhance-only.adoc | 17 +
..._ugfun_faqs_i18n-label-in-wicket-viewer.adoc | 16 +
.../guides/_ugfun_faqs_per-user-themes.adoc | 85 ++
.../_ugfun_faqs_restful-image-property.adoc | 20 +
...faqs_subtype-entity-not-fully-populated.adoc | 67 ++
.../asciidoc/guides/_ugfun_getting-started.adoc | 37 +
...un_getting-started_datanucleus-enhancer.adoc | 107 +++
...fun_getting-started_simpleapp-archetype.adoc | 304 +++++++
.../main/asciidoc/guides/_ugfun_how-tos.adoc | 22 +
.../guides/_ugfun_how-tos_bulk-actions.adoc | 8 +
.../guides/_ugfun_how-tos_business-rules.adoc | 72 ++
.../guides/_ugfun_how-tos_class-structure.adoc | 38 +
...w-tos_class-structure_action-parameters.adoc | 26 +
.../_ugfun_how-tos_class-structure_actions.adoc | 19 +
...ow-tos_class-structure_class-definition.adoc | 24 +
...fun_how-tos_class-structure_collections.adoc | 26 +
...ow-tos_class-structure_ignoring-methods.adoc | 16 +
...how-tos_class-structure_inject-services.adoc | 83 ++
...lass-structure_properties-vs-parameters.adoc | 45 +
...gfun_how-tos_class-structure_properties.adoc | 299 +++++++
.../_ugfun_how-tos_contributed-members.adoc | 69 ++
.../asciidoc/guides/_ugfun_how-tos_crud.adoc | 29 +
.../guides/_ugfun_how-tos_derived-members.adoc | 48 ++
.../guides/_ugfun_how-tos_domain-services.adoc | 313 +++++++
.../_ugfun_how-tos_drop-downs-and-defaults.adoc | 65 ++
.../_ugfun_how-tos_entity-relationships.adoc | 15 +
...aged-1-to-m-bidirectional-relationships.adoc | 59 ++
...how-tos_render-all-properties-in-tables.adoc | 49 ++
...ow-tos_simulating-collections-of-values.adoc | 23 +
.../guides/_ugfun_how-tos_ui-hints.adoc | 15 +
...n_how-tos_ui-hints_action-icons-and-css.adoc | 58 ++
..._ugfun_how-tos_ui-hints_eager-rendering.adoc | 58 ++
.../guides/_ugfun_how-tos_ui-hints_layout.adoc | 9 +
...how-tos_ui-hints_names-and-descriptions.adoc | 47 ++
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 +++
.../guides/_ugfun_how-tos_ui_are-you-sure.adoc | 76 ++
.../asciidoc/guides/_ugfun_object-layout.adoc | 18 +
.../_ugfun_object-layout_application-menu.adoc | 171 ++++
.../guides/_ugfun_object-layout_dynamic.adoc | 113 +++
.../_ugfun_object-layout_static-vs-dynamic.adoc | 26 +
.../guides/_ugfun_object-layout_static.adoc | 159 ++++
.../guides/_ugsec_api-for-applications.adoc | 63 ++
.../_ugsec_configuring-isis-to-use-bypass.adoc | 23 +
.../_ugsec_configuring-isis-to-use-shiro.adoc | 76 ++
.../asciidoc/guides/_ugsec_shiro-caching.adoc | 41 +
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 133 +++
...shiro-isis-enhanced-wildcard-permission.adoc | 61 ++
.../guides/_ugsec_shiro-isis-ldap-realm.adoc | 146 ++++
..._shiro-isisaddons-security-module-realm.adoc | 36 +
.../guides/_ugsec_shiro-jdbc-realm.adoc | 113 +++
.../guides/_ugsec_usage-by-isis-viewers.adoc | 208 +++++
.../src/main/asciidoc/guides/_ugtst_aaa.adoc | 166 ++++
.../guides/_ugtst_bdd-spec-support.adoc | 22 +
.../_ugtst_bdd-spec-support_bdd-tooling.adoc | 14 +
.../_ugtst_bdd-spec-support_how-it-works.adoc | 20 +
.../_ugtst_bdd-spec-support_key-classes.adoc | 59 ++
...st_bdd-spec-support_maven-configuration.adoc | 73 ++
...tst_bdd-spec-support_writing-a-bdd-spec.adoc | 141 ++++
.../asciidoc/guides/_ugtst_fixture-scripts.adoc | 44 +
.../_ugtst_fixture-scripts_api-and-usage.adoc | 352 ++++++++
.../_ugtst_fixture-scripts_sudo-service.adoc | 59 ++
.../guides/_ugtst_integ-test-support.adoc | 24 +
..._ugtst_integ-test-support_bootstrapping.adoc | 260 ++++++
..._integ-test-support_maven-configuration.adoc | 46 +
..._ugtst_integ-test-support_typical-usage.adoc | 124 +++
...gtst_integ-test-support_wrapper-factory.adoc | 162 ++++
.../guides/_ugtst_unit-test-support.adoc | 14 +
..._ugtst_unit-test-support_contract-tests.adoc | 171 ++++
...gtst_unit-test-support_jmock-extensions.adoc | 59 ++
...t_unit-test-support_maven-configuration.adoc | 46 +
...est-support_soap-fake-server-junit-rule.adoc | 113 +++
.../asciidoc/guides/_ugvro_architecture.adoc | 57 ++
.../guides/_ugvro_configuration-properties.adoc | 54 ++
.../asciidoc/guides/_ugvro_hints-and-tips.adoc | 97 +++
.../main/asciidoc/guides/_ugvro_ro-spec.adoc | 201 +++++
.../_ugvro_simplified-representations.adoc | 368 ++++++++
...epresentations_configuration-properties.adoc | 135 +++
.../guides/_ugvw_configuration-properties.adoc | 112 +++
...guration-properties_abbreviating-titles.adoc | 33 +
...ration-properties_showing-theme-chooser.adoc | 43 +
...uration-properties_stripped-wicket-tags.adoc | 26 +
...n-properties_suppressing-password-reset.adoc | 47 ++
...tion-properties_suppressing-remember-me.adoc | 35 +
...guration-properties_suppressing-sign-up.adoc | 49 ++
.../asciidoc/guides/_ugvw_customisation.adoc | 18 +
.../guides/_ugvw_customisation_about-page.adoc | 121 +++
.../_ugvw_customisation_auto-refresh.adoc | 35 +
.../guides/_ugvw_customisation_brand-logo.adoc | 71 ++
...vw_customisation_cheap-n-cheerful-theme.adoc | 29 +
.../_ugvw_customisation_custom-javascript.adoc | 42 +
.../_ugvw_customisation_default-theme.adoc | 29 +
...ugvw_customisation_tweaking-css-classes.adoc | 107 +++
..._customisation_using-different-css-file.adoc | 36 +
.../_ugvw_customisation_welcome-page.adoc | 42 +
.../main/asciidoc/guides/_ugvw_extending.adoc | 25 +
.../_ugvw_extending_custom-bootstrap-theme.adoc | 34 +
.../guides/_ugvw_extending_custom-pages.adoc | 92 ++
.../_ugvw_extending_isis-addons-extensions.adoc | 17 +
...ending_login-via-query-args-prototyping.adoc | 49 ++
..._ugvw_extending_replacing-page-elements.adoc | 167 ++++
.../main/asciidoc/guides/_ugvw_features.adoc | 26 +
.../guides/_ugvw_features_blob-attachments.adoc | 121 +++
.../guides/_ugvw_features_bookmarked-pages.adoc | 108 +++
.../_ugvw_features_hints-and-copy-url.adoc | 79 ++
.../guides/_ugvw_features_recent-pages.adoc | 53 ++
.../guides/_ugvw_features_titles-in-tables.adoc | 76 ++
.../_ugvw_features_user-registration.adoc | 81 ++
.../main/asciidoc/guides/_ugvw_isis-addons.adoc | 33 +
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 97 +++
.../guides/_ugvw_request-parameters.adoc | 53 ++
.../src/main/asciidoc/guides/cg.adoc | 30 +-
.../guides/images/maven-plugin/xsd-goal.png | Bin 0 -> 46790 bytes
.../guides/images/maven-plugin/xsd-goal.pptx | Bin 0 -> 64740 bytes
.../service-collaborations.png | Bin 10368 -> 28874 bytes
.../service-collaborations.pptx | Bin 52460 -> 51472 bytes
.../ro-spec-resources-and-representations.png | Bin 0 -> 139796 bytes
.../src/main/asciidoc/guides/rg.adoc | 33 +-
.../src/main/asciidoc/guides/rgant.adoc | 96 +++
.../src/main/asciidoc/guides/rgcfg.adoc | 62 ++
.../src/main/asciidoc/guides/rgcms.adoc | 46 +
.../src/main/asciidoc/guides/rgsvc.adoc | 40 +
.../asciidoc/guides/simpleapp-archetype.adoc | 2 +-
.../src/main/asciidoc/guides/tg.adoc | 1 +
.../src/main/asciidoc/guides/ug.adoc | 42 +-
.../src/main/asciidoc/guides/ugbtb.adoc | 44 +
.../src/main/asciidoc/guides/ugfun.adoc | 50 ++
.../src/main/asciidoc/guides/ugsec.adoc | 85 ++
.../src/main/asciidoc/guides/ugtst.adoc | 50 ++
.../src/main/asciidoc/guides/ugvro.adoc | 55 ++
.../src/main/asciidoc/guides/ugvw.adoc | 55 ++
.../src/main/asciidoc/how-isis-works.adoc | 2 +-
.../documentation/src/main/asciidoc/index.html | 2 +-
.../src/main/asciidoc/isis-in-pictures.adoc | 44 +-
.../src/main/asciidoc/migration-notes.adoc | 1 +
.../asciidoc/resources/templates/.gitignore | 1 +
.../templates/asciidoc-templates-idea.xml | 365 --------
...-settings-file-templates-for-apache-isis.jar | Bin 0 -> 9104 bytes
.../templates/isis-asciidoc-templates-idea.xml | 328 ++++++++
.../resources/templates/isis-template-idea.xml | 522 ++++++++++++
.../resources/templates/isis-templates-idea.xml | 804 ------------------
.../resources/templates/isis-templates2.xml | 479 -----------
adocs/template/document.html.erb | 31 +
.../apache/isis/applib/AbstractSubscriber.java | 14 +-
.../org/apache/isis/applib/AppManifest.java | 1 +
.../isis/applib/DomainObjectContainer.java | 11 +
.../isis/applib/annotation/DomainObject.java | 91 ++
.../applib/annotation/DomainObjectLayout.java | 38 +-
.../apache/isis/applib/annotation/Nature.java | 30 +-
.../isis/applib/annotation/NatureOfService.java | 22 +-
.../isis/applib/annotation/Parameter.java | 2 +-
.../apache/isis/applib/annotation/Property.java | 4 +
.../apache/isis/applib/annotation/Title.java | 2 +-
.../isis/applib/annotation/ViewModel.java | 22 +
.../apache/isis/applib/services/dto/Dto.java | 21 +
.../applib/services/dto/Dto_downloadXml.java | 67 ++
.../applib/services/dto/Dto_downloadXsd.java | 125 +++
.../apache/isis/applib/services/dto/Util.java | 33 +
.../services/eventbus/AbstractUiEvent.java | 97 +++
.../services/eventbus/ActionDomainEvent.java | 32 +-
.../eventbus/ActionInteractionEvent.java | 8 +
.../eventbus/CollectionDomainEvent.java | 31 +-
.../eventbus/CollectionInteractionEvent.java | 7 +
.../services/eventbus/CssClassUiEvent.java | 102 +++
.../applib/services/eventbus/IconUiEvent.java | 101 +++
.../services/eventbus/ObjectCreatedEvent.java | 30 +
.../services/eventbus/ObjectLoadedEvent.java | 32 +
.../services/eventbus/ObjectPersistedEvent.java | 30 +
.../eventbus/ObjectPersistingEvent.java | 30 +
.../services/eventbus/ObjectRemovingEvent.java | 30 +
.../services/eventbus/ObjectUpdatedEvent.java | 30 +
.../services/eventbus/ObjectUpdatingEvent.java | 30 +
.../services/eventbus/PropertyDomainEvent.java | 30 +-
.../eventbus/PropertyInteractionEvent.java | 5 +
.../applib/services/eventbus/TitleUiEvent.java | 129 +++
.../services/i18n/TranslatableString.java | 1 +
.../isis/applib/services/jaxb/JaxbService.java | 64 ++
.../applib/services/swagger/SwaggerService.java | 72 ++
.../services/swagger/SwaggerServiceMenu.java | 80 ++
.../isis/applib/services/swagger/Util.java | 46 +
.../urlencoding/UrlEncodingService.java | 29 +
.../UrlEncodingServiceUsingBaseEncoding.java | 57 ++
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 24 +-
.../isis/tool/mavenplugin/IsisMojoValidate.java | 15 +-
.../isis/tool/mavenplugin/IsisMojoXsd.java | 155 ++++
.../tool/mavenplugin/MetaModelProcessor.java | 2 +-
core/metamodel/pom.xml | 11 +
.../isis/core/commons/lang/ClassExtensions.java | 7 +-
.../core/commons/lang/StringExtensions.java | 12 +-
.../isis/core/metamodel/facets/Annotations.java | 115 +++
.../facets/ContributeeMemberFacetFactory.java | 3 +-
.../action/ActionAnnotationFacetFactory.java | 10 +-
.../ActionDomainEventFacetAbstract.java | 3 -
.../CollectionAnnotationFacetFactory.java | 15 +-
.../callbacks/CreatedCallbackFacetAbstract.java | 35 +
.../callbacks/CreatedCallbackFacetFactory.java | 62 ++
.../CreatedCallbackFacetViaMethod.java | 65 ++
.../callbacks/CreatedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 ++
.../object/callbacks/LifecycleEventFacet.java | 28 +
.../callbacks/LoadCallbackFacetFactory.java | 68 ++
.../callbacks/LoadedCallbackFacetAbstract.java | 37 +
.../callbacks/LoadedCallbackFacetViaMethod.java | 65 ++
.../callbacks/LoadedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 ++
.../callbacks/LoadingCallbackFacetAbstract.java | 41 +
.../LoadingCallbackFacetViaMethod.java | 69 ++
.../callbacks/PersistCallbackFacetFactory.java | 78 ++
...ersistCallbackViaSaveMethodFacetFactory.java | 78 ++
.../PersistedCallbackFacetAbstract.java | 37 +
.../PersistedCallbackFacetViaMethod.java | 65 ++
.../callbacks/PersistedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 ++
.../PersistingCallbackFacetAbstract.java | 37 +
.../PersistingCallbackFacetViaMethod.java | 65 ++
.../PersistingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 50 ++
.../callbacks/RemoveCallbackFacetFactory.java | 78 ++
...moveCallbackViaDeleteMethodFacetFactory.java | 78 ++
.../object/callbacks/RemovedCallbackFacet.java | 2 +
.../callbacks/RemovedCallbackFacetAbstract.java | 39 +
.../RemovedCallbackFacetViaMethod.java | 69 ++
.../RemovingCallbackFacetAbstract.java | 37 +
.../RemovingCallbackFacetViaMethod.java | 65 ++
.../callbacks/RemovingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 ++
.../callbacks/UpdateCallbackFacetFactory.java | 68 ++
.../callbacks/UpdatedCallbackFacetAbstract.java | 37 +
.../UpdatedCallbackFacetViaMethod.java | 65 ++
.../callbacks/UpdatedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 ++
.../UpdatingCallbackFacetAbstract.java | 37 +
.../UpdatingCallbackFacetViaMethod.java | 69 ++
.../callbacks/UpdatingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 ++
.../create/CreatedCallbackFacetAbstract.java | 37 -
.../create/CreatedCallbackFacetFactory.java | 62 --
.../create/CreatedCallbackFacetViaMethod.java | 65 --
.../load/LoadCallbackFacetFactory.java | 68 --
.../load/LoadedCallbackFacetAbstract.java | 37 -
.../load/LoadedCallbackFacetViaMethod.java | 65 --
.../load/LoadingCallbackFacetAbstract.java | 41 -
.../load/LoadingCallbackFacetViaMethod.java | 69 --
.../persist/PersistCallbackFacetFactory.java | 80 --
...ersistCallbackViaSaveMethodFacetFactory.java | 80 --
.../persist/PersistedCallbackFacetAbstract.java | 37 -
.../PersistedCallbackFacetViaMethod.java | 65 --
.../PersistingCallbackFacetAbstract.java | 37 -
.../PersistingCallbackFacetViaMethod.java | 65 --
.../remove/RemoveCallbackFacetFactory.java | 80 --
...moveCallbackViaDeleteMethodFacetFactory.java | 80 --
.../remove/RemovedCallbackFacetAbstract.java | 37 -
.../remove/RemovedCallbackFacetViaMethod.java | 65 --
.../remove/RemovingCallbackFacetAbstract.java | 37 -
.../remove/RemovingCallbackFacetViaMethod.java | 65 --
.../update/UpdateCallbackFacetFactory.java | 68 --
.../update/UpdatedCallbackFacetAbstract.java | 37 -
.../update/UpdatedCallbackFacetViaMethod.java | 65 --
.../update/UpdatingCallbackFacetAbstract.java | 37 -
.../update/UpdatingCallbackFacetViaMethod.java | 69 --
.../DomainObjectAnnotationFacetFactory.java | 156 ++++
...bleObjectFacetForDomainObjectAnnotation.java | 7 +-
...ectLayoutAnnotationUsingCssClassUiEvent.java | 106 +++
.../DomainObjectLayoutFacetFactory.java | 31 +-
...nObjectLayoutAnnotationUsingIconUiEvent.java | 103 +++
...ObjectLayoutAnnotationUsingTitleUiEvent.java | 119 +++
.../RemoveSubscriberMethodsFacetFactory.java | 70 ++
.../facets/object/parseable/ParseableFacet.java | 2 +-
.../RecreatableObjectFacetAbstract.java | 48 +-
...creatableObjectFacetDeclarativeAbstract.java | 166 ----
...ectFacetDeclarativeInitializingAbstract.java | 165 ++++
.../RecreatableObjectFacetFactory.java | 18 +-
...acetForRecreatableDomainObjectInterface.java | 6 +-
...jectFacetForRecreatableObjectAnnotation.java | 5 +-
...bjectFacetForRecreatableObjectInterface.java | 6 +-
...atableObjectFacetForViewModelAnnotation.java | 41 +
...eObjectFacetForXmlRootElementAnnotation.java | 65 ++
.../annotation/RegExFacetOnTypeAnnotation.java | 4 +-
.../RegExFacetOnTypeAnnotationFactory.java | 3 +-
.../annotation/TitleAnnotationFacetFactory.java | 32 +-
.../TitleFacetViaTitleAnnotation.java | 29 +-
.../facets/object/viewmodel/ViewModelFacet.java | 49 ++
.../objectvalue/multiline/MultiLineFacet.java | 4 +-
.../facets/objectvalue/regex/RegExFacet.java | 1 +
.../objectvalue/regex/RegExFacetAbstract.java | 12 +-
.../regex/RegExFacetForParameterAnnotation.java | 7 +-
...egExFacetFromRegExAnnotationOnParameter.java | 7 +-
.../PropertyAnnotationFacetFactory.java | 14 +-
.../regex/RegExFacetForPropertyAnnotation.java | 8 +-
.../RegExFacetForRegExAnnotationOnProperty.java | 7 +-
.../json/LayoutMetadataReaderFromJson.java | 8 +-
.../metamodel/progmodel/ProgrammingModel.java | 6 +-
.../container/DomainObjectContainerDefault.java | 11 +
.../Persistable_downloadJdoMetadata.java | 80 ++
.../metamodel/services/jdosupport/Util.java | 33 +
.../services/swagger/SwaggerServiceDefault.java | 81 ++
.../services/swagger/internal/Caching.java | 48 ++
.../swagger/internal/ClassExcluder.java | 52 ++
.../services/swagger/internal/Generation.java | 832 +++++++++++++++++++
.../swagger/internal/SwaggerSpecGenerator.java | 64 ++
.../services/swagger/internal/Tagger.java | 61 ++
.../services/swagger/internal/Util.java | 166 ++++
.../swagger/internal/ValuePropertyFactory.java | 176 ++++
.../specloader/specimpl/ContributeeMember.java | 2 +-
.../specimpl/ObjectActionMixedIn.java | 3 +-
.../specimpl/ObjectMemberAbstract.java | 2 +-
.../isis/core/metamodel/util/EventUtil.java | 45 +
.../dflt/ProgrammingModelFacetsJava5.java | 26 +-
.../CreatedCallbackFacetFactoryTest.java | 4 +-
.../DeleteCallbackFacetFactoryTest.java | 6 +-
.../callback/LoadCallbackFacetFactoryTest.java | 6 +-
.../PersistAndSaveCallbackFacetFactoryTest.java | 8 +-
.../PersistCallbackFacetFactoryTest.java | 6 +-
...RemoveAndDeleteCallbackFacetFactoryTest.java | 8 +-
.../RemoveCallbackFacetFactoryTest.java | 6 +-
.../callback/SaveCallbackFacetFactoryTest.java | 6 +-
.../UpdateCallbackFacetFactoryTest.java | 6 +-
.../TitleAnnotationFacetFactoryTest.java | 13 +-
.../TitleFacetViaTitleAnnotationTest.java | 27 +-
.../regex/RegExFacetAnnotationTest.java | 14 +-
.../swagger/internal/GenerationTest.java | 48 ++
.../services/swagger/internal/TaggerTest.java | 69 ++
core/runtime/pom.xml | 5 +
.../i18n/po/TranslationServicePoMenu.java | 37 +-
.../services/memento/MementoServiceDefault.java | 38 +-
.../system/persistence/PersistenceSession.java | 96 ++-
.../persistence/spi/JdoObjectIdSerializer.java | 2 +-
.../jaxb/CatalogingSchemaOutputResolver.java | 85 ++
.../services/jaxb/JaxbServiceDefault.java | 142 ++++
.../services/jaxb/StreamResultWithWriter.java | 45 +
.../utils/ActionInvocationMementoDtoUtils.java | 12 +-
...odaLocalTimeXMLGregorianCalendarAdapter.java | 4 -
.../jaxbadapters/PersistentEntityAdapter.java | 67 ++
...atorOrAuthorizorTest_isVisibleInAnyRole.java | 3 -
.../ActionResultRepresentation.java | 3 +-
.../rendering/RendererContext.java | 18 +-
.../rendering/RendererContext2.java | 2 +-
.../rendering/RendererContext4.java | 3 +-
.../rendering/RendererContext5.java | 4 +-
.../rendering/RendererContext6.java | 33 +
.../rendering/ReprRendererAbstract.java | 6 +-
.../restfulobjects/rendering/Responses.java | 57 +-
.../AbstractObjectMemberReprRenderer.java | 5 +-
.../domainobjects/ActionResultReprRenderer.java | 107 ++-
.../domainobjects/DomainObjectReprRenderer.java | 26 +-
.../domainobjects/ListReprRenderer.java | 8 +-
.../domainobjects/ObjectActionReprRenderer.java | 9 +-
.../ObjectAndActionInvocation.java | 43 +-
.../domainobjects/ObjectAndCollection2.java | 39 +
.../domainobjects/ObjectAndProperty2.java | 36 +
.../ObjectCollectionReprRenderer.java | 19 +-
.../ObjectPropertyReprRenderer.java | 12 +-
.../domainobjects/ScalarValueReprRenderer.java | 5 +-
.../AbstractTypeFeatureReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 6 +-
.../service/RepresentationService.java | 46 +-
.../RepresentationServiceContentNegotiator.java | 214 +++++
.../RepresentationServiceForRestfulObjects.java | 265 +-----
.../conneg/ContentNegotiationService.java | 2 -
.../ContentNegotiationServiceAbstract.java | 33 +
...NegotiationServiceForRestfulObjectsV1_0.java | 266 ++++++
...ontentNegotiationServiceOrgApacheIsisV1.java | 404 +++++++++
core/viewer-restfulobjects-server/pom.xml | 11 +
.../restfulobjects/server/ResourceContext.java | 45 +-
.../server/RestfulObjectsApplication.java | 6 +
...estfulObjectsApplicationExceptionMapper.java | 12 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 67 ++
.../restfulobjects/server/conneg/Util.java | 33 +
.../DomainObjectResourceServerside.java | 73 +-
.../server/resources/DomainResourceHelper.java | 54 +-
.../DomainServiceResourceServerside.java | 41 +-
.../resources/DomainTypeResourceServerside.java | 19 +-
.../resources/HomePageResourceServerside.java | 3 +-
.../server/resources/ResourceAbstract.java | 20 +-
.../server/resources/SwaggerSpecResource.java | 125 +++
.../resources/UserResourceServerside.java | 5 +-
.../resources/VersionResourceServerside.java | 3 +-
...ontextTest_ensureCompatibleAcceptHeader.java | 2 +-
.../server/ResourceContextTest_getArg.java | 4 +-
.../viewer/wicket/model/models/ActionModel.java | 2 -
.../model/models/EntityCollectionModel.java | 17 +-
.../ActionResultResponseHandlingStrategy.java | 13 +-
.../entityactions/EntityActionLinkFactory.java | 4 +-
.../entityactions/EntityActionUtil.java | 2 +-
.../actionmenu/serviceactions/CssMenuItem.java | 4 +-
.../ServiceActionLinkFactory.java | 5 +-
.../ui/components/actions/ActionPanel.java | 72 +-
.../collection/bulk/BulkActionsLinkFactory.java | 5 +-
.../components/scalars/ScalarPanelAbstract.java | 4 +-
.../ScalarPanelTextFieldParseableAbstract.java | 2 +-
.../StandaloneCollectionPanel.java | 2 +-
.../widgets/linkandlabel/ActionLinkFactory.java | 5 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 3 +
.../wicket/ui/pages/entity/EntityPage.java | 21 -
...ppAppManifestWithFixturesBypassSecurity.java | 35 +
.../java/domainapp/dom/simple/SimpleObject.java | 10 +-
.../application/simpleapp/integtests/pom.xml | 130 +--
example/application/simpleapp/webapp/pom.xml | 1 -
.../src/main/webapp/WEB-INF/isis.properties | 20 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 17 +-
.../webapp/src/main/webapp/about/index.html | 18 +-
.../src/main/webapp/swagger-ui/index.html | 122 +++
1208 files changed, 44359 insertions(+), 34158 deletions(-)
----------------------------------------------------------------------
[19/21] isis git commit: ISIS-1223: fixes merge errors;
bumps dependency on wicket.bootstrap from 0.10.7 to 0.10.10
Posted by da...@apache.org.
ISIS-1223: fixes merge errors; bumps dependency on wicket.bootstrap from 0.10.7 to 0.10.10
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8bf0cc73
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8bf0cc73
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8bf0cc73
Branch: refs/heads/master
Commit: 8bf0cc73d81c67ca2f5a77efb83f539f45c4e1b7
Parents: 04d8842
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 28 01:01:47 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 28 01:01:47 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 25 ++++++++++----------
.../viewer/wicket/ui/panels/FormAbstract.java | 3 ---
.../viewer/wicket/ui/panels/PanelAbstract.java | 9 ++-----
3 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index ceec979..0ba3e7c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -142,7 +142,7 @@
<wicket.version>7.3.0</wicket.version>
<wicket-webjars.version>0.5.4</wicket-webjars.version>
- <wicket-bootstrap.version>0.10.7</wicket-bootstrap.version>
+ <wicket-bootstrap.version>0.10.10</wicket-bootstrap.version>
<wicket-source.version>7.0.0</wicket-source.version>
<wicketstuff.version>7.3.0</wicketstuff.version>
@@ -1511,7 +1511,6 @@ ${license.additional-notes}
<version>${resteasy-jaxrs.version}</version>
</dependency>
- <!-- Wicket -->
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
@@ -1525,7 +1524,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1542,7 +1540,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1555,7 +1552,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1568,7 +1564,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1581,7 +1576,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1594,7 +1588,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1607,7 +1600,6 @@ ${license.additional-notes}
<version>${wicket.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -1621,13 +1613,11 @@ ${license.additional-notes}
<!-- Wicket-Select2 -->
<dependency>
-
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
<version>${wicketstuff.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</exclusion>
@@ -1659,7 +1649,6 @@ ${license.additional-notes}
<version>${wicket-webjars.version}</version>
<exclusions>
<exclusion>
- <!-- for dependency convergence -->
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</exclusion>
@@ -1752,6 +1741,18 @@ ${license.additional-notes}
</dependency>
<dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
+ <version>4.17.37-1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>momentjs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 00d5fe0..581effb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -19,12 +19,9 @@
package org.apache.isis.viewer.wicket.ui.panels;
-<<<<<<< HEAD
import org.apache.wicket.markup.html.IHeaderContributor;
-=======
import java.util.List;
->>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
http://git-wip-us.apache.org/repos/asf/isis/blob/8bf0cc73/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index c1463da..0995a80 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -20,11 +20,6 @@
package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
-<<<<<<< HEAD
-import org.apache.wicket.markup.html.IHeaderContributor;
-=======
-import org.apache.wicket.Session;
->>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -34,11 +29,11 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
[13/21] isis git commit: ISIS-1224 Upgrade select2 from v3.5.2 to v4
Posted by da...@apache.org.
ISIS-1224 Upgrade select2 from v3.5.2 to v4
In ActionParametersFormPanel do not repaint the complete ReferencePanel/ValueChoicesSelect2Panel but just its Select2 child component.
It the complete parent is repainted then Select2 JS widget somehow looses information about the parent DOM element and renders the drop-down as orphan, i.e. CSS: position:absolute; left:0; top:0;
If only the Select2Choice element is repainted then it just sends its new values as JSON back and doesn't recreate the complete widget but just its options.
The flow is:
1) the user types something in another field
2) the user clicks on Select2
2.1) the 'change' JS event for the first field fires Ajax call
2.1.1) with the old behavior the Ajax response repaints the whole ReferencePanel
2.1.2) with the new behavior the Ajax response repaints only the Select2 options
2.2) the click on Select2 opens its drop-down
2.3) the Ajax response for 2.1) comes and closes Select2 to update it
3) with the new behavior the user has to click second time to show the drop-down again, but at least its CSS position is correct
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7b5bfad7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7b5bfad7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7b5bfad7
Branch: refs/heads/master
Commit: 7b5bfad70743279c59cfe3e520ba7feb63098529
Parents: 17d7159
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 13 15:21:52 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 13 15:21:52 2015 +0100
----------------------------------------------------------------------
.../ui/components/actions/ActionParametersFormPanel.java | 4 ++--
.../ui/components/scalars/ScalarPanelAbstract.java | 9 +++++++++
.../ui/components/scalars/reference/ReferencePanel.java | 11 ++++++++++-
.../ui/components/widgets/select2/Select2ChoiceUtil.java | 1 +
.../widgets/valuechoices/ValueChoicesSelect2Panel.java | 11 +++++++++++
5 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7b5bfad7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index d1d7020..a8cde09 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -242,8 +242,8 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
// this could throw a ConcurrencyException as we may have to reload the
// object adapter of the action in order to compute the choices
// (and that object adapter might have changed)
- if(paramPanel.updateChoices(pendingArguments)) {
- target.add(paramPanel);
+ if (paramPanel.updateChoices(pendingArguments)) {
+ paramPanel.repaint(target);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7b5bfad7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index a9df6fa..13d117c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -386,6 +386,15 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
return false;
}
+ /**
+ * Repaints this panel of just some of its children
+ *
+ * @param target The Ajax request handler
+ */
+ public void repaint(AjaxRequestTarget target) {
+ target.add(this);
+ }
+
// ///////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/7b5bfad7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 937f990..667b4fe 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.inject.Inject;
import com.google.common.collect.Lists;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
@@ -534,5 +535,13 @@ public class ReferencePanel extends ScalarPanelAbstract {
return IsisContext.getConfiguration();
}
-
+ /**
+ * Repaints just the Select2 component
+ *
+ * @param target The Ajax request handler
+ */
+ @Override
+ public void repaint(AjaxRequestTarget target) {
+ target.add(select2Field);
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7b5bfad7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index 0c059d3..c8ef4d7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -35,6 +35,7 @@ public final class Select2ChoiceUtil {
public static Select2Choice<ObjectAdapterMemento> newSelect2Choice(String id, final IModel<ObjectAdapterMemento> modelObject, ScalarModel scalarModel) {
Select2Choice<ObjectAdapterMemento> select2Choice = new Select2Choice<>(id, modelObject, EmptyChoiceProvider.INSTANCE);
select2Choice.setRequired(scalarModel.isRequired());
+ select2Choice.setOutputMarkupPlaceholderTag(true);
return select2Choice;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7b5bfad7/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index cbfa213..c8f51a1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -26,6 +26,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Select2Choice;
@@ -247,6 +248,16 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
}
/**
+ * Repaints just the Select2 component
+ *
+ * @param target The Ajax request handler
+ */
+ @Override
+ public void repaint(AjaxRequestTarget target) {
+ target.add(select2Field);
+ }
+
+ /**
* sets up the choices, also ensuring that any currently held value
* is compatible.
*/
[20/21] isis git commit: ISIS-1224: updates select2 to v4
Posted by da...@apache.org.
ISIS-1224: updates select2 to v4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c66f629b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c66f629b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c66f629b
Branch: refs/heads/master
Commit: c66f629b065894dd50a63eb2c1c79bc8c69bdc2d
Parents: 8bf0cc7 5576387
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 28 01:06:53 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 28 01:06:53 2016 +0200
----------------------------------------------------------------------
.../actions/ActionParametersFormPanel.java | 4 ++--
.../CollectionContentsMultipleViewsPanel.java | 2 +-
.../components/scalars/ScalarPanelAbstract.java | 9 +++++++++
.../reference/EntityLinkSelect2Panel.html | 2 +-
.../scalars/reference/ReferencePanel.html | 2 +-
.../scalars/reference/ReferencePanel.java | 16 +++++++++++++---
.../ObjectAdapterMementoProviderAbstract.java | 9 ++++-----
.../widgets/breadcrumbs/BreadcrumbModel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.html | 4 ++++
.../widgets/breadcrumbs/BreadcrumbPanel.java | 20 ++++++++++++--------
.../select2/Select2BootstrapCssReference.java | 10 +++++++---
.../widgets/select2/Select2ChoiceUtil.java | 13 ++++++++++++-
.../valuechoices/ValueChoicesSelect2Panel.html | 9 +++++----
.../valuechoices/ValueChoicesSelect2Panel.java | 13 ++++++++++++-
.../ui/errors/ExceptionStackTracePanel.html | 9 ++-------
.../isis/viewer/wicket/ui/util/Components.java | 7 ++++---
16 files changed, 90 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 0039bf6,0cb058a..95b0fac
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@@ -21,7 -21,13 +21,11 @@@ package org.apache.isis.viewer.wicket.u
import java.util.List;
-import javax.inject.Inject;
-
import com.google.common.collect.Lists;
+ import org.apache.wicket.ajax.AjaxRequestTarget;
+ import org.wicketstuff.select2.ChoiceProvider;
+ import org.wicketstuff.select2.Select2Choice;
+ import org.wicketstuff.select2.Settings;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@@ -533,10 -531,16 +537,16 @@@ public class ReferencePanel extends Sca
private WicketViewerSettings wicketViewerSettings;
IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
}
-
-
-
+ /**
+ * Repaints just the Select2 component
+ *
+ * @param target The Ajax request handler
+ */
+ @Override
+ public void repaint(AjaxRequestTarget target) {
+ target.add(select2Field);
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index cdc2250,1ce0ce7..68956a8
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@@ -27,8 -26,6 +27,7 @@@ import org.wicketstuff.select2.ChoicePr
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
- import org.wicketstuff.select2.TextChoiceProvider;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 6fa1496,815aaa1..c75a11b
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@@ -31,9 -31,10 +31,11 @@@ import org.wicketstuff.select2.ChoicePr
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
- import org.wicketstuff.select2.TextChoiceProvider;
import org.apache.isis.core.commons.authentication.MessageBroker;
++import org.apache.isis.core.commons.config.IsisConfiguration;
++import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
+ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@@ -72,8 -68,10 +74,10 @@@ public class BreadcrumbPanel extends Pa
}
@Override
- protected Object getId(EntityModel choice) {
- return breadcrumbModel.getId(choice);
+ public String getIdValue(EntityModel choice) {
+ RootOid rootOid = breadcrumbModel.getId(choice);
- String id = IsisContext.getOidMarshaller().marshal(rootOid);
++ String id = OidMarshaller.INSTANCE.marshal(rootOid);
+ return id;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 172069e,32bc2dc..7ae2c63
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@@ -29,6 -34,6 +29,7 @@@ import com.google.common.collect.Lists
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
++import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
[10/21] isis git commit: ISIS-1224 Upgrade select2 from v3.5.2 to v4,
hopefully to address the floating drop-down problem
Posted by da...@apache.org.
ISIS-1224 Upgrade select2 from v3.5.2 to v4, hopefully to address the floating drop-down problem
Fix the path to select2.css dependency
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd2a54bc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd2a54bc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd2a54bc
Branch: refs/heads/master
Commit: bd2a54bc07710637132e1e31fe39889062cf3b8e
Parents: 009b930
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Nov 13 19:25:56 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Nov 13 19:25:56 2015 +0100
----------------------------------------------------------------------
.../widgets/select2/Select2BootstrapCssReference.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bd2a54bc/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
index 3baa87e..d5d1724 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
@@ -19,11 +19,14 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
import java.util.List;
-import com.google.common.collect.Lists;
+
import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.wicketstuff.select2.Select2Choice;
+import org.wicketstuff.select2.ApplicationSettings;
+
+import com.google.common.collect.Lists;
/**
* A CSS reference that loads <a href="https://github.com/ivaynberg/select2/">Select2.css</a>
@@ -38,6 +41,7 @@ public class Select2BootstrapCssReference extends CssResourceReference {
@Override
public List<HeaderItem> getDependencies() {
- return Lists.<HeaderItem>newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
+ CssReferenceHeaderItem select2CssReference = CssHeaderItem.forReference(new CssResourceReference(ApplicationSettings.class, "res/css/select2.css"));
+ return Lists.<HeaderItem>newArrayList(select2CssReference);
}
}
[06/21] isis git commit: Add @Override to an overridden method
Posted by da...@apache.org.
Add @Override to an overridden method
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2d89e3f2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2d89e3f2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2d89e3f2
Branch: refs/heads/master
Commit: 2d89e3f29b88420291ddfd9e854a62832b050244
Parents: 7c27df4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 21:59:11 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 21:59:11 2015 +0100
----------------------------------------------------------------------
.../multiple/CollectionContentsMultipleViewsPanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2d89e3f2/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index 8c3a1e6..020a878 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -80,12 +80,12 @@ public class CollectionContentsMultipleViewsPanel
/**
* Build UI only after added to parent.
*/
+ @Override
public void onInitialize() {
super.onInitialize();
addUnderlyingViews();
}
-
private void addUnderlyingViews() {
final EntityCollectionModel model = getModel();
[21/21] isis git commit: ISIS-1223: fixes remaining issues with
merging in of branch; also bumps simpleapp to run against 1.14.0-SNAPSHOT
Posted by da...@apache.org.
ISIS-1223: fixes remaining issues with merging in of branch; also bumps simpleapp to run against 1.14.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6f10e34
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6f10e34
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6f10e34
Branch: refs/heads/master
Commit: f6f10e349e984a33b4e7033e9c459c9d564e9fbf
Parents: c66f629
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 28 09:27:30 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 28 09:27:30 2016 +0200
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 36 ++------------------
.../ui/components/footer/FooterPanel.java | 11 +++---
.../widgets/breadcrumbs/BreadcrumbPanel.html | 5 ++-
example/application/simpleapp/pom.xml | 2 +-
4 files changed, 11 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index e3dedd5..5b45c5a 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -55,12 +55,11 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
+import org.apache.wicket.settings.RequestCycleSettings;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.wicketstuff.select2.ApplicationSettings;
-import net.ftlines.wicketsource.WicketSource;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -103,38 +102,6 @@ import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjec
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings;
-import org.apache.wicket.Application;
-import org.apache.wicket.ConverterLocator;
-import org.apache.wicket.IConverterLocator;
-import org.apache.wicket.Page;
-import org.apache.wicket.RuntimeConfigurationType;
-import org.apache.wicket.SharedResources;
-import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
-import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
-import org.apache.wicket.core.request.mapper.MountedMapper;
-import org.apache.wicket.guice.GuiceComponentInjector;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
-import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponseDecorator;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
-import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
-import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.settings.RequestCycleSettings;
-import org.apache.wicket.util.time.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.wicketstuff.select2.ApplicationSettings;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.inject.Guice;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Module;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
@@ -143,6 +110,7 @@ import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.webjars.WicketWebjars;
import de.agilecoders.wicket.webjars.settings.IWebjarsSettings;
import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
+import net.ftlines.wicketsource.WicketSource;
/**
* Main application, subclassing the Wicket {@link Application} and
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
index 8ab6ea5..7da7692 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java
@@ -18,11 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.footer;
-import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
-import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
-import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
-import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.basic.Label;
@@ -31,6 +26,12 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
+import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser;
+import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+
/**
* A panel for the default page footer
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index 9bb2684..83824a1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@ -21,11 +21,10 @@
<body>
<wicket:panel>
<span class="breadcrumbPanel">
-<<<<<<< HEAD
<select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select>
-=======
+<!--
<input wicket:id="breadcrumbs" type="hidden" class="autoComplete select2-remote" style="width: 100%; padding: 0" />
->>>>>>> ISIS-1223-upgrade-to-wicket-7
+-->
</span>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 1c15b91..1bbb74a 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -34,7 +34,7 @@
</prerequisites>
<properties>
- <isis.version>1.13.1-SNAPSHOT</isis.version>
+ <isis.version>1.14.0-SNAPSHOT</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[04/21] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Posted by da...@apache.org.
ISIS-1223 Upgrade Wicket to 7.x
Change the id of the rememberMe parent.
Changed in Wicket with: https://github.com/apache/wicket/commit/e0b105e5bcee89917d04c3a2164440d0ed2fc738
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d483b2c6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d483b2c6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d483b2c6
Branch: refs/heads/master
Commit: d483b2c6eca16ff53b0e963e2bf308666fc92f6f
Parents: 5625c6c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 22:36:43 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 22:36:43 2015 +0100
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d483b2c6/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
index 795a821..2f343ed 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.html
@@ -29,7 +29,7 @@
<label wicket:for="password"><wicket:message key="passwordLabel"/></label>
<input type="password" class="form-control" wicket:id="password" placeholder="Enter password"/>
</div>
- <div class="checkbox" wicket:id="rememberMeRow">
+ <div class="checkbox" wicket:id="rememberMeContainer">
<label>
<input type="checkbox" wicket:id="rememberMe"/> <wicket:message key="rememberMeLabel"/>
</label>
[14/21] isis git commit: Merge branch 'master' into
ISIS-1223-upgrade-to-wicket-7
Posted by da...@apache.org.
Merge branch 'master' into ISIS-1223-upgrade-to-wicket-7
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/82a39243
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/82a39243
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/82a39243
Branch: refs/heads/master
Commit: 82a392435399f4893ba22f8b4495040c32f0a017
Parents: 803fbc1 047e5ef
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Dec 25 14:07:46 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Dec 25 14:07:46 2015 +0100
----------------------------------------------------------------------
README.adoc | 9 +-
adocs/documentation/monitor.rb | 42 +-
adocs/documentation/pom.xml | 2 +-
.../_migration-notes_1.10.0-to-1.11.0.adoc | 54 +-
...tes_1.8.0-to-1.9.0_exception-recognizer.adoc | 2 +-
..._fixture-scripts-specification-provider.adoc | 2 +-
.../_migration-notes_1.9.0-to-1.10.0.adoc | 4 +-
.../asciidoc/_powered-by_gesconsultor-grc.adoc | 2 +-
.../src/main/asciidoc/documentation.adoc | 3 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 8 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 18 +-
.../guides/_cg_isis-maven-plugin_swagger.adoc | 107 +++
.../guides/_cg_isis-maven-plugin_xsd.adoc | 6 +-
.../src/main/asciidoc/guides/_rgant-Action.adoc | 10 +-
.../guides/_rgant-ActionLayout_named.adoc | 2 +-
.../asciidoc/guides/_rgant-Action_command.adoc | 20 +-
.../guides/_rgant-Action_domainEvent.adoc | 8 +-
.../guides/_rgant-Action_publishing.adoc | 2 +-
.../guides/_rgant-Action_semantics.adoc | 2 +-
.../main/asciidoc/guides/_rgant-Collection.adoc | 2 +-
.../guides/_rgant-CollectionLayout_named.adoc | 2 +-
.../guides/_rgant-Collection_domainEvent.adoc | 8 +-
.../guides/_rgant-Collection_notPersisted.adoc | 2 +-
.../asciidoc/guides/_rgant-Discriminator.adoc | 2 +-
.../asciidoc/guides/_rgant-DomainObject.adoc | 16 +-
.../guides/_rgant-DomainObjectLayout.adoc | 6 +-
...gant-DomainObjectLayout_cssClassUiEvent.adoc | 12 +-
.../_rgant-DomainObjectLayout_iconUiEvent.adoc | 12 +-
.../guides/_rgant-DomainObjectLayout_named.adoc | 2 +-
.../_rgant-DomainObjectLayout_titleUiEvent.adoc | 12 +-
.../guides/_rgant-DomainObject_auditing.adoc | 2 +-
...gant-DomainObject_createdLifecycleEvent.adoc | 8 +-
...rgant-DomainObject_loadedLifecycleEvent.adoc | 4 +-
.../guides/_rgant-DomainObject_nature.adoc | 2 +-
.../guides/_rgant-DomainObject_objectType.adoc | 2 +-
...nt-DomainObject_persistedLifecycleEvent.adoc | 4 +-
...t-DomainObject_persistingLifecycleEvent.adoc | 4 +-
.../guides/_rgant-DomainObject_publishing.adoc | 2 +-
...ant-DomainObject_removingLifecycleEvent.adoc | 4 +-
...gant-DomainObject_updatedLifecycleEvent.adoc | 4 +-
...ant-DomainObject_updatingLifecycleEvent.adoc | 4 +-
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 4 +-
.../src/main/asciidoc/guides/_rgant-Mixin.adoc | 2 +-
.../guides/_rgant-ParameterLayout_named.adoc | 2 +-
.../guides/_rgant-PersistenceCapable.adoc | 2 +-
.../asciidoc/guides/_rgant-PostConstruct.adoc | 6 +-
.../main/asciidoc/guides/_rgant-PreDestroy.adoc | 2 +-
.../main/asciidoc/guides/_rgant-PrimaryKey.adoc | 2 +-
.../asciidoc/guides/_rgant-Programmatic.adoc | 2 +-
.../main/asciidoc/guides/_rgant-Property.adoc | 2 +-
.../guides/_rgant-PropertyLayout_named.adoc | 2 +-
.../guides/_rgant-Property_domainEvent.adoc | 6 +-
.../guides/_rgant-Property_notPersisted.adoc | 2 +-
.../asciidoc/guides/_rgant-RequestScoped.adoc | 2 +-
.../main/asciidoc/guides/_rgant-ViewModel.adoc | 2 +-
.../guides/_rgant-ViewModelLayout_named.adoc | 2 +-
.../guides/_rgant-XmlJavaTypeAdapter.adoc | 4 +-
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 10 +-
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 2 +-
.../guides/_rgcfg_configuring-core.adoc | 18 +-
.../guides/_rgcfg_configuring-datanucleus.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_classes.adoc | 2 +-
.../guides/_rgcms_classes_domainevent.adoc | 2 +-
...s_classes_domainevent_ActionDomainEvent.adoc | 2 +-
.../_rgcms_classes_i18n_TranslatableString.adoc | 2 +-
.../guides/_rgcms_classes_lifecycleevent.adoc | 12 +-
...asses_lifecycleevent_ObjectCreatedEvent.adoc | 2 +-
...ses_lifecycleevent_ObjectPersistedEvent.adoc | 2 +-
...es_lifecycleevent_ObjectPersistingEvent.adoc | 2 +-
...sses_lifecycleevent_ObjectRemovingEvent.adoc | 2 +-
...asses_lifecycleevent_ObjectUpdatedEvent.adoc | 2 +-
...sses_lifecycleevent_ObjectUpdatingEvent.adoc | 2 +-
.../guides/_rgcms_classes_roles_Dto.adoc | 4 +-
.../_rgcms_classes_roles_HoldsUpdatedAt.adoc | 2 +-
.../_rgcms_classes_roles_Persistable.adoc | 2 +-
.../asciidoc/guides/_rgcms_classes_super.adoc | 2 +-
...s_classes_super_AbstractContainedObject.adoc | 4 +-
...gcms_classes_super_AbstractDomainObject.adoc | 2 +-
.../_rgcms_classes_super_AbstractService.adoc | 2 +-
..._rgcms_classes_super_AbstractSubscriber.adoc | 4 +-
.../_rgcms_classes_super_FixtureScripts.adoc | 4 +-
.../asciidoc/guides/_rgcms_classes_uievent.adoc | 2 +-
.../guides/_rgcms_methods_lifecycle.adoc | 2 +-
.../_rgcms_methods_lifecycle_created.adoc | 4 +-
.../_rgcms_methods_lifecycle_jdo-api.adoc | 4 +-
.../guides/_rgcms_methods_lifecycle_loaded.adoc | 2 +-
.../_rgcms_methods_lifecycle_persisted.adoc | 2 +-
.../_rgcms_methods_lifecycle_persisting.adoc | 2 +-
.../_rgcms_methods_lifecycle_removed.adoc | 2 +-
.../_rgcms_methods_lifecycle_removing.adoc | 2 +-
.../_rgcms_methods_lifecycle_updated.adoc | 2 +-
.../_rgcms_methods_lifecycle_updating.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_default.adoc | 4 +-
.../guides/_rgcms_methods_prefixes_disable.adoc | 2 +-
.../_rgcms_methods_prefixes_validate.adoc | 2 +-
.../_rgcms_methods_prefixes_validateAddTo.adoc | 2 +-
...cms_methods_prefixes_validateRemoveFrom.adoc | 2 +-
.../guides/_rgcms_methods_reserved_disable.adoc | 2 +-
.../guides/_rgcms_methods_reserved_title.adoc | 4 +-
.../_rgcms_methods_reserved_validate.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_schema-aim.adoc | 2 +-
.../asciidoc/guides/_rgcms_schema-common.adoc | 2 +-
.../src/main/asciidoc/guides/_rgsvc-api.adoc | 306 ---------
.../_rgsvc-api_ActionInvocationContext.adoc | 98 ---
.../guides/_rgsvc-api_BackgroundService.adoc | 123 ----
...roundService_BackgroundCommandExecution.adoc | 25 -
.../_rgsvc-api_BackgroundService_Quartz.adoc | 162 -----
.../guides/_rgsvc-api_BookmarkService.adoc | 116 ----
.../_rgsvc-api_BulkInteractionContext.adoc | 9 -
.../guides/_rgsvc-api_ClockService.adoc | 101 ---
.../guides/_rgsvc-api_CommandContext.adoc | 216 ------
.../guides/_rgsvc-api_DeepLinkService.adoc | 56 --
.../_rgsvc-api_DomainObjectContainer.adoc | 40 --
...nObjectContainer_generic-repository-api.adoc | 89 ---
...-api_DomainObjectContainer_messages-api.adoc | 50 --
...mainObjectContainer_object-creation-api.adoc | 49 --
...nObjectContainer_object-persistence-api.adoc | 62 --
..._DomainObjectContainer_presentation-api.adoc | 46 --
...pi_DomainObjectContainer_properties-api.adoc | 54 --
...-api_DomainObjectContainer_security-api.adoc | 48 --
...-api_DomainObjectContainer_services-api.adoc | 37 -
...pi_DomainObjectContainer_validation-api.adoc | 26 -
.../guides/_rgsvc-api_EmailService.adoc | 95 ---
.../guides/_rgsvc-api_EventBusService.adoc | 405 -----------
.../_rgsvc-api_FixtureScriptsDefault.adoc | 50 --
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 91 ---
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 276 --------
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 67 --
.../guides/_rgsvc-api_MementoService.adoc | 131 ----
.../guides/_rgsvc-api_MetamodelService.adoc | 42 --
.../guides/_rgsvc-api_QueryResultsCache.adoc | 126 ----
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 128 ----
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 69 --
.../guides/_rgsvc-api_WrapperFactory.adoc | 162 -----
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 220 ------
.../src/main/asciidoc/guides/_rgsvc-spi.adoc | 299 ---------
.../guides/_rgsvc-spi_AuditingService.adoc | 85 ---
.../_rgsvc-spi_BackgroundCommandService.adoc | 131 ----
.../_rgsvc-spi_ClassDiscoveryService.adoc | 82 ---
.../guides/_rgsvc-spi_CommandService.adoc | 100 ---
.../_rgsvc-spi_ContentMappingService.adoc | 107 ---
.../_rgsvc-spi_ContentNegotiationService.adoc | 204 ------
.../_rgsvc-spi_EmailNotificationService.adoc | 81 ---
.../_rgsvc-spi_ErrorReportingService.adoc | 106 ---
.../guides/_rgsvc-spi_EventSerializer.adoc | 74 --
.../guides/_rgsvc-spi_ExceptionRecognizer.adoc | 119 ----
...spi_FixtureScriptsSpecificationProvider.adoc | 76 ---
.../guides/_rgsvc-spi_LocaleProvider.adoc | 70 --
.../guides/_rgsvc-spi_PublishingService.adoc | 192 ------
.../_rgsvc-spi_RepresentationService.adoc | 103 ---
.../guides/_rgsvc-spi_TranslationService.adoc | 80 ---
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 67 --
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 59 --
.../guides/_rgsvc-spi_UserProfileService.adoc | 47 --
.../_rgsvc-spi_UserRegistrationService.adoc | 98 ---
.../src/main/asciidoc/guides/_rgsvc_api.adoc | 340 ++++++++++
.../guides/_rgsvc_api_AcceptHeaderService.adoc | 82 +++
.../_rgsvc_api_ActionInvocationContext.adoc | 98 +++
.../guides/_rgsvc_api_BackgroundService.adoc | 123 ++++
...roundService_BackgroundCommandExecution.adoc | 25 +
.../_rgsvc_api_BackgroundService_Quartz.adoc | 162 +++++
.../guides/_rgsvc_api_BookmarkService.adoc | 116 ++++
.../_rgsvc_api_BulkInteractionContext.adoc | 9 +
.../guides/_rgsvc_api_ClockService.adoc | 101 +++
.../guides/_rgsvc_api_CommandContext.adoc | 216 ++++++
.../guides/_rgsvc_api_DeepLinkService.adoc | 56 ++
.../_rgsvc_api_DomainObjectContainer.adoc | 40 ++
...nObjectContainer_generic-repository-api.adoc | 89 +++
..._api_DomainObjectContainer_messages-api.adoc | 50 ++
...mainObjectContainer_object-creation-api.adoc | 49 ++
...nObjectContainer_object-persistence-api.adoc | 62 ++
..._DomainObjectContainer_presentation-api.adoc | 46 ++
...pi_DomainObjectContainer_properties-api.adoc | 54 ++
..._api_DomainObjectContainer_security-api.adoc | 48 ++
..._api_DomainObjectContainer_services-api.adoc | 37 +
...pi_DomainObjectContainer_validation-api.adoc | 26 +
.../guides/_rgsvc_api_EmailService.adoc | 95 +++
.../guides/_rgsvc_api_EventBusService.adoc | 405 +++++++++++
.../_rgsvc_api_FixtureScriptsDefault.adoc | 50 ++
.../guides/_rgsvc_api_GuiceBeanProvider.adoc | 91 +++
.../_rgsvc_api_HomePageProviderService.adoc | 40 ++
.../guides/_rgsvc_api_IsisJdoSupport.adoc | 276 ++++++++
.../asciidoc/guides/_rgsvc_api_JaxbService.adoc | 68 ++
.../guides/_rgsvc_api_MementoService.adoc | 131 ++++
.../guides/_rgsvc_api_MetamodelService.adoc | 42 ++
.../guides/_rgsvc_api_QueryResultsCache.adoc | 126 ++++
.../asciidoc/guides/_rgsvc_api_Scratchpad.adoc | 128 ++++
.../asciidoc/guides/_rgsvc_api_SudoService.adoc | 69 ++
.../guides/_rgsvc_api_SwaggerService.adoc | 71 ++
.../guides/_rgsvc_api_WrapperFactory.adoc | 162 +++++
.../guides/_rgsvc_api_XmlSnapshotService.adoc | 220 ++++++
.../src/main/asciidoc/guides/_rgsvc_spi.adoc | 313 +++++++++
.../guides/_rgsvc_spi_AuditingService.adoc | 85 +++
.../_rgsvc_spi_BackgroundCommandService.adoc | 131 ++++
.../_rgsvc_spi_ClassDiscoveryService.adoc | 82 +++
.../guides/_rgsvc_spi_CommandService.adoc | 100 +++
.../_rgsvc_spi_ContentMappingService.adoc | 107 +++
.../_rgsvc_spi_ContentNegotiationService.adoc | 204 ++++++
.../_rgsvc_spi_EmailNotificationService.adoc | 81 +++
.../_rgsvc_spi_ErrorReportingService.adoc | 106 +++
.../guides/_rgsvc_spi_EventSerializer.adoc | 74 ++
.../guides/_rgsvc_spi_ExceptionRecognizer.adoc | 119 ++++
...spi_FixtureScriptsSpecificationProvider.adoc | 76 +++
.../guides/_rgsvc_spi_LocaleProvider.adoc | 70 ++
.../guides/_rgsvc_spi_PublishingService.adoc | 192 ++++++
.../_rgsvc_spi_RepresentationService.adoc | 103 +++
.../guides/_rgsvc_spi_RoutingService.adoc | 69 ++
.../guides/_rgsvc_spi_TranslationService.adoc | 80 +++
.../guides/_rgsvc_spi_TranslationsResolver.adoc | 67 ++
.../guides/_rgsvc_spi_UrlEncodingService.adoc | 59 ++
.../guides/_rgsvc_spi_UserProfileService.adoc | 47 ++
.../_rgsvc_spi_UserRegistrationService.adoc | 98 +++
.../_tg_stop-scaffolding-start-coding.adoc | 16 +-
.../main/asciidoc/guides/_ugbtb_decoupling.adoc | 28 +
.../guides/_ugbtb_decoupling_contributions.adoc | 23 +
.../guides/_ugbtb_decoupling_db-schemas.adoc | 141 ++++
.../guides/_ugbtb_decoupling_event-bus.adoc | 11 +
.../guides/_ugbtb_decoupling_mixins.adoc | 191 ++++++
.../_ugbtb_decoupling_pushing-changes.adoc | 140 ++++
.../_ugbtb_decoupling_vetoing-visibility.adoc | 15 +
.../guides/_ugbtb_deployment_tomcat.adoc | 2 +-
.../asciidoc/guides/_ugbtb_headless-access.adoc | 27 +
...less-access_AbstractIsisSessionTemplate.adoc | 40 ++
...dless-access_BackgroundCommandExecution.adoc | 45 ++
.../src/main/asciidoc/guides/_ugbtb_i18n.adoc | 671 +++++++++++++++++++
.../asciidoc/guides/_ugbtb_more-advanced.adoc | 26 -
.../guides/_ugbtb_more-advanced_decoupling.adoc | 28 -
..._more-advanced_decoupling_contributions.adoc | 23 -
...btb_more-advanced_decoupling_db-schemas.adoc | 141 ----
...gbtb_more-advanced_decoupling_event-bus.adoc | 11 -
.../_ugbtb_more-advanced_decoupling_mixins.adoc | 191 ------
...ore-advanced_decoupling_pushing-changes.adoc | 140 ----
...-advanced_decoupling_vetoing-visibility.adoc | 15 -
.../_ugbtb_more-advanced_headless-access.adoc | 27 -
...less-access_AbstractIsisSessionTemplate.adoc | 40 --
...dless-access_BackgroundCommandExecution.adoc | 45 --
.../guides/_ugbtb_more-advanced_i18n.adoc | 378 -----------
...ugbtb_more-advanced_mapping-rdbms-views.adoc | 9 -
.../_ugbtb_more-advanced_multi-tenancy.adoc | 8 -
...ore-advanced_overriding-jdo-annotations.adoc | 64 --
.../_ugbtb_more-advanced_persisted-title.adoc | 82 ---
...placing-default-service-implementations.adoc | 64 --
...b_more-advanced_transactions-and-errors.adoc | 33 -
.../_ugbtb_more-advanced_view-models.adoc | 19 -
.../_ugbtb_more-advanced_view-models_jaxb.adoc | 240 -------
...-advanced_view-models_programming-model.adoc | 87 ---
...btb_more-advanced_view-models_use-cases.adoc | 142 ----
.../guides/_ugbtb_other-techniques.adoc | 22 +
...tb_other-techniques_mapping-rdbms-views.adoc | 9 +
.../_ugbtb_other-techniques_multi-tenancy.adoc | 8 +
...r-techniques_overriding-jdo-annotations.adoc | 64 ++
..._ugbtb_other-techniques_persisted-title.adoc | 82 +++
...placing-default-service-implementations.adoc | 64 ++
...ther-techniques_transactions-and-errors.adoc | 33 +
.../guides/_ugbtb_programming-model.adoc | 2 +-
...gbtb_programming-model_custom-validator.adoc | 2 +-
.../_ugbtb_programming-model_finetuning.adoc | 2 +-
.../asciidoc/guides/_ugbtb_view-models.adoc | 19 +
.../guides/_ugbtb_view-models_jaxb.adoc | 240 +++++++
.../_ugbtb_view-models_programming-model.adoc | 87 +++
.../guides/_ugbtb_view-models_use-cases.adoc | 142 ++++
.../main/asciidoc/guides/_ugbtb_web-xml.adoc | 25 +-
.../_ugfun_core-concepts_building-blocks.adoc | 12 +-
...re-concepts_framework-provided-services.adoc | 46 +-
..._core-concepts_other-deployment-options.adoc | 2 +-
.../_ugfun_core-concepts_philosophy_aop.adoc | 4 +-
...concepts_principles_apache-isis-vs_cqrs.adoc | 6 +-
...rinciples_apache-isis-vs_event-sourcing.adoc | 2 +-
.../guides/_ugfun_how-tos_class-structure.adoc | 2 +-
...ow-tos_class-structure_class-definition.adoc | 2 +-
.../asciidoc/guides/_ugfun_how-tos_crud.adoc | 8 +-
.../guides/_ugfun_how-tos_domain-services.adoc | 8 +-
...how-tos_ui-hints_names-and-descriptions.adoc | 2 +-
.../_ugfun_object-layout_application-menu.adoc | 2 +-
.../guides/_ugsec_api-for-applications.adoc | 2 +-
.../guides/_ugsec_usage-by-isis-viewers.adoc | 14 +-
.../src/main/asciidoc/guides/_ugtst_aaa.adoc | 2 +-
.../_ugtst_fixture-scripts_api-and-usage.adoc | 6 +-
..._ugtst_integ-test-support_bootstrapping.adoc | 2 +-
...gtst_integ-test-support_wrapper-factory.adoc | 4 +-
.../asciidoc/guides/_ugvro_architecture.adoc | 6 +-
.../guides/_ugvro_configuration-properties.adoc | 144 +++-
.../main/asciidoc/guides/_ugvro_ro-spec.adoc | 2 +-
.../_ugvro_simplified-representations.adoc | 37 +-
...epresentations_configuration-properties.adoc | 119 +---
.../guides/_ugvw_extending_custom-pages.adoc | 4 +-
.../_ugvw_features_user-registration.adoc | 10 +-
.../acceptheaderservice.png | Bin 0 -> 10997 bytes
.../acceptheaderservice.pptx | Bin 0 -> 46935 bytes
.../src/main/asciidoc/guides/rgsvc.adoc | 8 +-
.../src/main/asciidoc/guides/ugbtb.adoc | 8 +-
.../src/main/asciidoc/guides/ugsec.adoc | 2 +-
.../isis-in-pictures/065-contributions.png | Bin 108489 -> 116303 bytes
.../isis-in-pictures/067-contributed-action.png | Bin 25914 -> 20163 bytes
.../documentation/src/main/asciidoc/index.html | 11 +
.../src/main/asciidoc/isis-in-pictures.adoc | 13 +-
.../templates/isis-asciidoc-templates-idea.xml | 2 +-
adocs/template/document.html.erb | 16 -
.../acceptheader/AcceptHeaderService.java | 32 +
.../applib/services/dto/Dto_downloadXml.java | 2 +-
.../applib/services/dto/Dto_downloadXsd.java | 2 +-
.../homepage/HomePageProviderService.java | 43 ++
.../isis/applib/services/jaxb/JaxbService.java | 27 +-
.../applib/services/routing/RoutingService.java | 34 +
.../services/routing/RoutingServiceDefault.java | 58 ++
.../applib/services/swagger/SwaggerService.java | 22 +-
.../isis/tool/mavenplugin/IsisMojoSwagger.java | 134 ++++
.../core/metamodel/adapter/ObjectAdapter.java | 18 +-
.../all/i18n/TranslationFacetFactory.java | 7 +-
.../facets/members/order/MemberOrderFacet.java | 4 +
.../members/order/MemberOrderFacetAbstract.java | 6 +
.../json/LayoutMetadataReaderFromJson.java | 3 +-
.../container/DomainObjectContainerDefault.java | 1 +
.../Persistable_downloadJdoMetadata.java | 8 +-
.../services/swagger/SwaggerServiceDefault.java | 2 +
.../services/swagger/internal/Util.java | 8 +-
.../swagger/internal/ValuePropertyFactory.java | 22 +
.../spec/feature/ObjectAssociation.java | 13 +-
.../specimpl/ObjectSpecificationAbstract.java | 4 +-
core/pom.xml | 2 +-
.../opts/OptionHandlerSystemProperties.java | 2 +-
.../HomePageProviderServiceDefault.java | 108 +++
.../core/runtime/services/i18n/po/PoReader.java | 16 +-
.../core/runtime/services/i18n/po/PoWriter.java | 39 +-
.../services/i18n/po/TranslationServicePo.java | 4 +-
.../i18n/po/TranslationServicePoMenu.java | 5 +-
.../core/runtime/services/i18n/po/Util.java | 33 +
.../persistence/PersistenceSessionFactory.java | 21 +-
.../isis/core/webapp/IsisSessionFilter.java | 43 +-
.../services/i18n/po/PoWriterTest_escape.java | 26 +
.../domainobjects/ActionResultReprRenderer.java | 2 +-
.../ObjectPropertyReprRenderer.java | 2 +-
.../RepresentationServiceContentNegotiator.java | 3 +-
.../AcceptHeaderServiceForRest.java | 106 +++
.../ContentNegotiationServiceAbstract.java | 3 -
.../ContentNegotiationServiceXRoDomainType.java | 46 +-
.../server/RestfulObjectsApplication.java | 6 +-
.../server/resources/ObjectActionArgHelper.java | 3 +
.../IsisTransactionFilterForRestfulObjects.java | 5 +
.../wicket/viewer/IsisWicketApplication.java | 6 +-
.../viewer/guice/GuiceComponentInjector.java | 137 ----
.../viewer/guice/GuiceFieldValueFactory.java | 161 -----
.../viewer/guice/GuiceProxyTargetLocator.java | 162 -----
.../integration/wicket/LocalizerForIsis.java | 159 +++++
.../viewer/settings/IsisResourceSettings.java | 8 +
.../viewer/wicket/model/models/ActionModel.java | 17 +
.../entity/properties/EntityPropertiesForm.java | 17 +-
.../reference/EntityLinkSelect2Panel.html | 4 +-
.../scalars/reference/ReferencePanel.java | 8 -
.../widgets/breadcrumbs/BreadcrumbPanel.html | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.html | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 7 +
.../wicket/ui/pages/entity/EntityPage.java | 27 +-
example/application/simpleapp/dom/pom.xml | 51 ++
.../java/domainapp/dom/simple/SimpleObject.java | 14 +
.../dom/simple/SimpleObject.layout.json | 4 +
.../domainapp/dom/simple/SimpleObjects.java | 10 +-
.../webapp/DomainApplication.properties | 28 +
.../src/main/webapp/WEB-INF/translations-en.po | 321 ++++++++-
.../src/main/webapp/WEB-INF/translations-es.po | 321 ++++++++-
.../src/main/webapp/WEB-INF/translations-nl.po | 326 ++++++++-
.../src/main/webapp/WEB-INF/translations.po | 326 ++++++++-
.../webapp/src/main/webapp/WEB-INF/web.xml | 9 +-
.../src/main/webapp/swagger-ui/index.html | 25 +-
364 files changed, 11270 insertions(+), 8703 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index 45d1803,05da9b6..6d59370
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -122,14 -122,15 +122,14 @@@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>7.1.0</wicket.version>
- <wicket.version>6.20.0</wicket.version>
- <wicketstuff.version>6.20.0</wicketstuff.version>
++ <wicket.version>7.2.0</wicket.version>
+ <wicketstuff.version>7.1.0</wicketstuff.version>
- <wicket-webjars.version>0.4.7</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.3</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.4</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
- <wicket-select2.version>6.20.0</wicket-select2.version>
- <select2.version>3.5.2</select2.version>
+ <select2.version>4.0.0-2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<guice.version>3.0</guice.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index a04290e,d43027b..673bf3e
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@@ -35,6 -35,6 +35,7 @@@ import com.google.inject.Guice
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
++import org.apache.wicket.guice.GuiceComponentInjector;
import org.wicketstuff.select2.ApplicationSettings;
import org.apache.wicket.Application;
http://git-wip-us.apache.org/repos/asf/isis/blob/82a39243/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
index 849b093,f75ecda..22a1b9b
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
@@@ -21,10 -21,13 +21,13 @@@ package org.apache.isis.viewer.wicket.v
import java.util.List;
import org.apache.wicket.Application;
+ import org.apache.wicket.Localizer;
import org.apache.wicket.resource.loader.*;
-import org.apache.wicket.settings.def.ResourceSettings;
+import org.apache.wicket.settings.ResourceSettings;
import org.apache.wicket.util.lang.Generics;
+ import org.apache.isis.viewer.wicket.viewer.integration.wicket.LocalizerForIsis;
+
public class IsisResourceSettings extends ResourceSettings {
/** Chain of string resource loaders to use */
[03/21] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Posted by da...@apache.org.
ISIS-1223 Upgrade Wicket to 7.x
Copy temporarily Wicket's Guice classes to workaround issue https://issues.apache.org/jira/browse/WICKET-6020.
Once Wicket 7.2.0 is released these classes should be removed!
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5625c6c4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5625c6c4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5625c6c4
Branch: refs/heads/master
Commit: 5625c6c4cec59c57e00cffa0159a89795b46addc
Parents: 8eab457
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 21:35:42 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 21:35:42 2015 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 4 +-
.../viewer/guice/GuiceComponentInjector.java | 137 ++++++++++++++++
.../viewer/guice/GuiceFieldValueFactory.java | 161 ++++++++++++++++++
.../viewer/guice/GuiceProxyTargetLocator.java | 162 +++++++++++++++++++
4 files changed, 461 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5625c6c4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 401a4b5..a04290e 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -46,7 +46,6 @@ import org.apache.wicket.SharedResources;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.core.request.mapper.MountedMapper;
-import org.apache.wicket.guice.GuiceComponentInjector;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
@@ -100,6 +99,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
+import org.apache.isis.viewer.wicket.viewer.guice.GuiceComponentInjector;
import org.apache.isis.viewer.wicket.viewer.integration.isis.DeploymentTypeWicketAbstract;
import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
@@ -689,8 +689,6 @@ public class IsisWicketApplication
protected void initWicketComponentInjection(final Injector injector) {
- // if serializable, then brings in dependency on cglib, and in turn asm.
- // This would block us from migrating to DN 4.0.x
getComponentInstantiationListeners().add(new GuiceComponentInjector(this, injector, false));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5625c6c4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceComponentInjector.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceComponentInjector.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceComponentInjector.java
new file mode 100644
index 0000000..b80ba1d
--- /dev/null
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceComponentInjector.java
@@ -0,0 +1,137 @@
+/*
+ * 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.viewer.wicket.viewer.guice;
+
+import com.google.inject.Guice;
+import com.google.inject.ImplementedBy;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import com.google.inject.Stage;
+import org.apache.wicket.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.IBehaviorInstantiationListener;
+import org.apache.wicket.Session;
+import org.apache.wicket.application.IComponentInstantiationListener;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.guice.GuiceInjectorHolder;
+import org.apache.wicket.injection.IFieldValueFactory;
+import org.apache.wicket.model.Model;
+
+/**
+ * Injects field members of components and behaviors using Guice.
+ * <p>
+ * Add this to your application in its {@link Application#init()} method like so:
+ *
+ * <pre>
+ * getComponentInstantiationListeners().add(new GuiceComponentInjector(this));
+ * </pre>
+ *
+ * <p>
+ * There are different constructors for this object depending on how you want to wire things. See
+ * the javadoc for the constructors for more information.
+ * </p>
+ * <p>
+ * Only Wicket {@link Component}s and {@link Behavior}s are automatically injected, other classes
+ * such as {@link Session}, {@link Model}, and any other POJO can be injected by calling
+ * <code>Injector.get().inject(this)</code> in their constructor.
+ * </p>
+ *
+ * @author Alastair Maw
+ */
+public class GuiceComponentInjector extends org.apache.wicket.injection.Injector
+ implements
+ IComponentInstantiationListener,
+ IBehaviorInstantiationListener
+{
+ private final IFieldValueFactory fieldValueFactory;
+
+ /**
+ * Creates a new Wicket GuiceComponentInjector instance.
+ * <p>
+ * Internally this will create a new Guice {@link Injector} instance, with no {@link Module}
+ * instances. This is only useful if your beans have appropriate {@link ImplementedBy}
+ * annotations on them so that they can be automatically picked up with no extra configuration
+ * code.
+ *
+ * @param app
+ */
+ public GuiceComponentInjector(final Application app)
+ {
+ this(app, new Module[0]);
+ }
+
+ /**
+ * Creates a new Wicket GuiceComponentInjector instance, using the supplied Guice {@link Module}
+ * instances to create a new Guice {@link Injector} instance internally.
+ *
+ * @param app
+ * @param modules
+ */
+ public GuiceComponentInjector(final Application app, final Module... modules)
+ {
+ this(app, Guice.createInjector(app.usesDeploymentConfig() ? Stage.PRODUCTION
+ : Stage.DEVELOPMENT, modules), true);
+ }
+
+ /**
+ * Constructor
+ *
+ * @param app
+ * @param injector
+ */
+ public GuiceComponentInjector(final Application app, final Injector injector)
+ {
+ this(app, injector, true);
+ }
+
+ /**
+ * Creates a new Wicket GuiceComponentInjector instance, using the provided Guice
+ * {@link Injector} instance.
+ *
+ * @param app
+ * @param injector
+ * @param wrapInProxies
+ * whether or not wicket should wrap dependencies with specialized proxies that can
+ * be safely serialized. in most cases this should be set to true.
+ */
+ public GuiceComponentInjector(final Application app, final Injector injector,
+ final boolean wrapInProxies)
+ {
+ app.setMetaData(GuiceInjectorHolder.INJECTOR_KEY, new GuiceInjectorHolder(injector));
+ fieldValueFactory = new GuiceFieldValueFactory(wrapInProxies);
+ app.getBehaviorInstantiationListeners().add(this);
+ bind(app);
+ }
+
+ @Override
+ public void inject(final Object object)
+ {
+ inject(object, fieldValueFactory);
+ }
+
+ @Override
+ public void onInstantiation(final Component component)
+ {
+ inject(component);
+ }
+
+ @Override
+ public void onInstantiation(Behavior behavior)
+ {
+ inject(behavior);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/5625c6c4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceFieldValueFactory.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceFieldValueFactory.java
new file mode 100644
index 0000000..70d3568
--- /dev/null
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceFieldValueFactory.java
@@ -0,0 +1,161 @@
+/*
+ * 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.viewer.wicket.viewer.guice;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.inject.Qualifier;
+
+import org.apache.wicket.injection.IFieldValueFactory;
+import org.apache.wicket.proxy.LazyInitProxyFactory;
+
+import com.google.inject.BindingAnnotation;
+import com.google.inject.Inject;
+import org.apache.wicket.util.lang.Generics;
+
+/**
+ *
+ */
+public class GuiceFieldValueFactory implements IFieldValueFactory
+{
+ private final ConcurrentMap<GuiceProxyTargetLocator, Object> cache = Generics.newConcurrentHashMap();
+ private static final Object NULL_SENTINEL = new Object();
+
+ private final boolean wrapInProxies;
+
+ /**
+ * Construct.
+ *
+ * @param wrapInProxies
+ */
+ GuiceFieldValueFactory(final boolean wrapInProxies)
+ {
+ this.wrapInProxies = wrapInProxies;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Object getFieldValue(final Field field, final Object fieldOwner)
+ {
+ Object target = null;
+
+ if (supportsField(field))
+ {
+ Inject injectAnnotation = field.getAnnotation(Inject.class);
+ javax.inject.Inject javaxInjectAnnotation = field.getAnnotation(javax.inject.Inject.class);
+ if (!Modifier.isStatic(field.getModifiers()) && (injectAnnotation != null || javaxInjectAnnotation != null))
+ {
+ try
+ {
+ boolean optional = injectAnnotation != null && injectAnnotation.optional();
+ Annotation bindingAnnotation = findBindingAnnotation(field.getAnnotations());
+ final GuiceProxyTargetLocator locator = new GuiceProxyTargetLocator(field, bindingAnnotation, optional);
+
+ Object cachedValue = cache.get(locator);
+ if (cachedValue != null)
+ {
+ return cachedValue == NULL_SENTINEL ? null : cachedValue;
+ }
+
+ target = locator.locateProxyTarget();
+ if (target == null)
+ {
+ // Optional without a binding, return null
+ }
+ else
+ {
+ if (wrapInProxies)
+ {
+ target = LazyInitProxyFactory.createProxy(field.getType(), locator);
+ }
+ }
+
+ if (locator.isSingletonScope())
+ {
+ Object tmpTarget = cache.putIfAbsent(locator, target == null ? NULL_SENTINEL : target);
+ if (tmpTarget != null)
+ {
+ target = tmpTarget;
+ }
+ }
+
+ if (!field.isAccessible())
+ {
+ field.setAccessible(true);
+ }
+ }
+ catch (MoreThanOneBindingException e)
+ {
+ throw new RuntimeException(
+ "Can't have more than one BindingAnnotation on field " + field.getName() +
+ " of class " + fieldOwner.getClass().getName());
+ }
+ }
+ }
+
+ return target == NULL_SENTINEL ? null : target;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean supportsField(final Field field)
+ {
+ return field.isAnnotationPresent(Inject.class) || field.isAnnotationPresent(javax.inject.Inject.class);
+ }
+
+ /**
+ *
+ * @param annotations
+ * @return Annotation
+ * @throws MoreThanOneBindingException
+ */
+ private Annotation findBindingAnnotation(final Annotation[] annotations)
+ throws MoreThanOneBindingException
+ {
+ Annotation bindingAnnotation = null;
+
+ // Work out if we have a BindingAnnotation on this parameter.
+ for (Annotation annotation : annotations)
+ {
+ if (annotation.annotationType().getAnnotation(BindingAnnotation.class) != null ||
+ annotation.annotationType().getAnnotation(Qualifier.class) != null)
+ {
+ if (bindingAnnotation != null)
+ {
+ throw new MoreThanOneBindingException();
+ }
+ bindingAnnotation = annotation;
+ }
+ }
+ return bindingAnnotation;
+ }
+
+ /**
+ *
+ */
+ public static class MoreThanOneBindingException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/5625c6c4/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceProxyTargetLocator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceProxyTargetLocator.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceProxyTargetLocator.java
new file mode 100644
index 0000000..dcf11e7
--- /dev/null
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/guice/GuiceProxyTargetLocator.java
@@ -0,0 +1,162 @@
+/*
+ * 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.viewer.wicket.viewer.guice;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+import com.google.inject.ConfigurationException;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Scopes;
+import com.google.inject.TypeLiteral;
+import org.apache.wicket.Application;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.guice.GuiceInjectorHolder;
+import org.apache.wicket.proxy.IProxyTargetLocator;
+import org.apache.wicket.core.util.lang.WicketObjects;
+import org.apache.wicket.util.lang.Objects;
+
+class GuiceProxyTargetLocator implements IProxyTargetLocator
+{
+ private static final long serialVersionUID = 1L;
+
+ private final Annotation bindingAnnotation;
+
+ private final boolean optional;
+
+ private final String className;
+
+ private final String fieldName;
+
+ private Boolean isSingletonCache = null;
+
+ public GuiceProxyTargetLocator(final Field field, final Annotation bindingAnnotation,
+ final boolean optional)
+ {
+ this.bindingAnnotation = bindingAnnotation;
+ this.optional = optional;
+ className = field.getDeclaringClass().getName();
+ fieldName = field.getName();
+ }
+
+ @Override
+ public Object locateProxyTarget()
+ {
+ Injector injector = getInjector();
+
+ final Key<?> key = newGuiceKey();
+
+ // if the Inject annotation is marked optional and no binding is found
+ // then skip this injection (WICKET-2241)
+ if (optional)
+ {
+ // Guice 2.0 throws a ConfigurationException if no binding is find while 1.0 simply
+ // returns null.
+ try
+ {
+ if (injector.getBinding(key) == null)
+ {
+ return null;
+ }
+ }
+ catch (RuntimeException e)
+ {
+ return null;
+ }
+ }
+
+ return injector.getInstance(key);
+ }
+
+ private Key<?> newGuiceKey()
+ {
+ final Type type;
+ try
+ {
+ Class<?> clazz = WicketObjects.resolveClass(className);
+ final Field field = clazz.getDeclaredField(fieldName);
+ type = field.getGenericType();
+ }
+ catch (Exception e)
+ {
+ throw new WicketRuntimeException("Error accessing member: " + fieldName +
+ " of class: " + className, e);
+ }
+
+ // using TypeLiteral to retrieve the key gives us automatic support for
+ // Providers and other injectable TypeLiterals
+ if (bindingAnnotation == null)
+ {
+ return Key.get(TypeLiteral.get(type));
+ }
+ else
+ {
+ return Key.get(TypeLiteral.get(type), bindingAnnotation);
+ }
+ }
+
+ public boolean isSingletonScope()
+ {
+ if (isSingletonCache == null)
+ {
+ try
+ {
+ isSingletonCache = Scopes.isSingleton(getInjector().getBinding(newGuiceKey()));
+ }
+ catch (ConfigurationException ex)
+ {
+ // No binding, if optional can pretend this is null singleton
+ if (optional)
+ isSingletonCache = true;
+ else
+ throw ex;
+ }
+ }
+ return isSingletonCache;
+ }
+
+ private Injector getInjector()
+ {
+ final GuiceInjectorHolder holder = Application.get().getMetaData(
+ GuiceInjectorHolder.INJECTOR_KEY);
+
+ return holder.getInjector();
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ return true;
+ if (!(o instanceof GuiceProxyTargetLocator))
+ return false;
+ GuiceProxyTargetLocator that = (GuiceProxyTargetLocator) o;
+ return Objects.equal(optional, that.optional) &&
+ Objects.equal(bindingAnnotation, that.bindingAnnotation) &&
+ Objects.equal(className, that.className) &&
+ Objects.equal(fieldName, that.fieldName);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return Objects.hashCode(bindingAnnotation, optional, className, fieldName);
+ }
+
+}
[02/21] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Posted by da...@apache.org.
ISIS-1223 Upgrade Wicket to 7.x
Fix Maven dependency convergences.
Fix indents.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8eab4577
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8eab4577
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8eab4577
Branch: refs/heads/master
Commit: 8eab4577340e0b15b0b5db5454ed1f10e89ba5b7
Parents: dc976bc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 21:22:47 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 21:22:47 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++++
core/viewer-wicket-applib/pom.xml | 18 +++++++++---------
core/viewer-wicket-model/pom.xml | 16 ++++++++--------
3 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index aed6870..8f481cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1491,6 +1491,10 @@ ${license.additional-notes}
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index aae5322..e896f80 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -52,16 +52,16 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 66bb1cf..4acaa6a 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-applib</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket-applib</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
[05/21] isis git commit: ISIS-1224 Upgrade select2 from v3.5.2 to v4,
hopefully to address the floating drop-down problem
Posted by da...@apache.org.
ISIS-1224 Upgrade select2 from v3.5.2 to v4, hopefully to address the floating drop-down problem
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c27df44
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c27df44
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c27df44
Branch: refs/heads/master
Commit: 7c27df445e80452ee42ed00f023fea6225f17d22
Parents: d483b2c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 23:43:00 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 23:43:00 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 3 ++-
.../scalars/reference/EntityLinkSelect2Panel.html | 4 ++--
.../ui/components/scalars/reference/ReferencePanel.html | 2 +-
.../widgets/ObjectAdapterMementoProviderAbstract.java | 8 ++++----
.../components/widgets/breadcrumbs/BreadcrumbPanel.html | 2 +-
.../components/widgets/breadcrumbs/BreadcrumbPanel.java | 8 ++++----
.../components/widgets/select2/Select2ChoiceUtil.java | 12 +++++++++++-
.../widgets/valuechoices/ValueChoicesSelect2Panel.html | 4 ++--
.../widgets/valuechoices/ValueChoicesSelect2Panel.java | 2 +-
.../wicket/ui/errors/ExceptionStackTracePanel.html | 9 ++-------
10 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8f481cb..8b0fba2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1586,7 +1586,8 @@ ${license.additional-notes}
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicketstuff.version}</version>
+ <version>7.2.0-SNAPSHOT</version>
+ <!--<version>${wicketstuff.version}</version>-->
<exclusions>
<exclusion>
<!-- for dependency convergence -->
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
index bf0be48..d7265a4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.html
@@ -19,12 +19,12 @@
-->
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
<wicket:panel>
- <input wicket:id="autoComplete" type="hidden" class="autoComplete form-control select2-remote" style="width: 100%" />
+ <select wicket:id="autoComplete" class="autoComplete form-control select2-remote" style="width: 100%"></select>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 0b92105..975eec6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -19,7 +19,7 @@
-->
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index bb72f1e..1ce0ce7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -22,7 +22,7 @@ import java.util.Locale;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import org.wicketstuff.select2.TextChoiceProvider;
+import org.wicketstuff.select2.ChoiceProvider;
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.IsisConverterLocator;
-public abstract class ObjectAdapterMementoProviderAbstract extends TextChoiceProvider<ObjectAdapterMemento> {
+public abstract class ObjectAdapterMementoProviderAbstract extends ChoiceProvider<ObjectAdapterMemento> {
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
}
@Override
- protected String getDisplayText(final ObjectAdapterMemento choice) {
+ public String getDisplayValue(final ObjectAdapterMemento choice) {
if (choice == null) {
return NULL_DISPLAY_TEXT;
}
@@ -71,7 +71,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
}
@Override
- protected Object getId(final ObjectAdapterMemento choice) {
+ public String getIdValue(final ObjectAdapterMemento choice) {
return choice != null? choice.asString(): NULL_PLACEHOLDER;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
index 13d7bdd..87e480b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<span class="breadcrumbPanel">
- <input wicket:id="breadcrumbs" type="hidden" class="autoComplete form-control select2-remote" style="width: 100%" />
+ <select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select>
</span>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 7ba1cd7..1653064 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -24,10 +24,10 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
-import org.wicketstuff.select2.TextChoiceProvider;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -54,17 +54,17 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
final IModel<EntityModel> entityModel = new Model<EntityModel>();
- TextChoiceProvider<EntityModel> choiceProvider = new TextChoiceProvider<EntityModel>() {
+ ChoiceProvider<EntityModel> choiceProvider = new ChoiceProvider<EntityModel>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(EntityModel choice) {
+ public String getDisplayValue(EntityModel choice) {
return breadcrumbModel.titleFor(choice);
}
@Override
- protected Object getId(EntityModel choice) {
+ public String getIdValue(EntityModel choice) {
try {
final PageParameters pageParameters = choice.getPageParameters();
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index 0282e1e..0c059d3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -38,11 +38,21 @@ public final class Select2ChoiceUtil {
return select2Choice;
}
- private static class EmptyChoiceProvider implements ChoiceProvider<ObjectAdapterMemento> {
+ private static class EmptyChoiceProvider extends ChoiceProvider<ObjectAdapterMemento> {
private static final EmptyChoiceProvider INSTANCE = new EmptyChoiceProvider();
@Override
+ public String getDisplayValue(ObjectAdapterMemento object) {
+ return null;
+ }
+
+ @Override
+ public String getIdValue(ObjectAdapterMemento object) {
+ return null;
+ }
+
+ @Override
public void query(String term, int page, Response<ObjectAdapterMemento> response) {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index f1ef0d8..52de953 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -19,7 +19,7 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
<body>
@@ -29,7 +29,7 @@
<label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
<div class="scalarValueWrapper">
<div class="choicesPlaceholder">
- <input wicket:id="scalarValue" type="hidden" class="choices form-control input-sm select2-remote" style="width: 99.8%;"/>
+ <select wicket:id="scalarValue" class="choices form-control input-sm select2-remote" style="width: 99.8%;"></select>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 964188d..cbfa213 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -173,7 +173,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
final Predicate<ObjectAdapterMemento> lookupOam = new Predicate<ObjectAdapterMemento>() {
@Override
public boolean apply(ObjectAdapterMemento input) {
- final String id = (String) getId(input);
+ final String id = getIdValue(input);
return ids.contains(id);
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/7c27df44/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
index 7b649be..79a39af 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
@@ -19,14 +19,9 @@
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xmlns:wicket="http://wicket.apache.org"
xml:lang="en"
lang="en">
- <head>
- <wicket:link>
- <!--<link href="ExceptionStackTracePanel.css" rel="stylesheet" type="text/css"/>-->
- </wicket:link>
- </head>
<body>
<wicket:panel>
<div class="exceptionStackTracePanel">
@@ -39,7 +34,7 @@
</h2>
</div>
<div class="panel-body" wicket:id="ticketDetailsDiv">
- <h3><span wicket:id="ticketDetails">[ticket details]</span></h3>
+ <h3 wicket:id="ticketDetails">[ticket details]</h3>
</div>
<div class="panel-body" wicket:id="ticketReferenceDiv">
<h4>Please quote reference: <span wicket:id="ticketReference">[ticket reference]</span></h4>
[09/21] isis git commit: Merge branch 'master' into
ISIS-1224-select2-v4
Posted by da...@apache.org.
Merge branch 'master' into ISIS-1224-select2-v4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/009b930a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/009b930a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/009b930a
Branch: refs/heads/master
Commit: 009b930ad6aeea0f7bce2fa6a31e4afffd5ee06d
Parents: a6fe41c 2f5bd52
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Nov 12 21:01:02 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Nov 12 21:01:02 2015 +0100
----------------------------------------------------------------------
STATUS | 3 +
adocs/documentation/Gemfile.lock | 3 +
.../_migration-notes_1.7.0-to-1.8.0.adoc | 5 +-
.../_migration-notes_1.9.0-to-1.10.0.adoc | 136 ++
.../src/main/asciidoc/_powered-by_commapp.adoc | 45 +
.../src/main/asciidoc/_powered-by_estatio.adoc | 41 +
.../asciidoc/_powered-by_gesconsultor-grc.adoc | 109 ++
.../asciidoc/_powered-by_transport-planner.adoc | 55 +
.../src/main/asciidoc/_release-notes_1.0.0.adoc | 126 ++
.../src/main/asciidoc/_release-notes_1.0.1.adoc | 22 +
.../src/main/asciidoc/_release-notes_1.1.0.adoc | 141 ++
.../main/asciidoc/_release-notes_1.10.0.adoc | 93 ++
.../src/main/asciidoc/_release-notes_1.2.0.adoc | 136 ++
.../src/main/asciidoc/_release-notes_1.3.0.adoc | 256 +++
.../src/main/asciidoc/_release-notes_1.3.1.adoc | 30 +
.../src/main/asciidoc/_release-notes_1.4.0.adoc | 238 +++
.../src/main/asciidoc/_release-notes_1.4.1.adoc | 30 +
.../src/main/asciidoc/_release-notes_1.5.0.adoc | 125 ++
.../src/main/asciidoc/_release-notes_1.6.0.adoc | 93 ++
.../src/main/asciidoc/_release-notes_1.7.0.adoc | 122 ++
.../src/main/asciidoc/_release-notes_1.8.0.adoc | 127 ++
.../src/main/asciidoc/_release-notes_1.9.0.adoc | 140 ++
.../src/main/asciidoc/doap_isis.rdf | 19 +-
.../src/main/asciidoc/documentation.adoc | 20 +-
.../src/main/asciidoc/downloads.adoc | 10 +-
.../main/asciidoc/guides/_cg_building-isis.adoc | 28 +-
.../_cg_committers_cutting-a-release.adoc | 64 +-
.../_cg_committers_post-release-successful.adoc | 78 +-
...cg_committers_post-release-unsuccessful.adoc | 16 +-
...ommitters_release-process-for-snapshots.adoc | 26 +-
.../_cg_committers_verifying-releases.adoc | 2 +-
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 21 +
.../main/asciidoc/guides/_cg_ide_intellij.adoc | 55 +-
.../asciidoc/guides/_cg_ide_project-lombok.adoc | 2 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 6 +-
.../guides/_rg_annotations_manpage-Action.adoc | 20 +-
..._annotations_manpage-Action_domainEvent.adoc | 35 +-
...rg_annotations_manpage-Action_semantics.adoc | 4 +-
.../_rg_annotations_manpage-Collection.adoc | 2 +-
...rg_annotations_manpage-CollectionLayout.adoc | 9 +
...ns_manpage-CollectionLayout_defaultView.adoc | 43 +
...ns_manpage-CollectionLayout_describedAs.adoc | 5 +-
...tations_manpage-CollectionLayout_render.adoc | 2 +
...otations_manpage-Collection_domainEvent.adoc | 36 +-
...annotations_manpage-DomainObject_nature.adoc | 2 +-
.../guides/_rg_annotations_manpage-Inject.adoc | 2 +-
.../guides/_rg_annotations_manpage-Mixin.adoc | 2 +-
.../_rg_annotations_manpage-PostConstruct.adoc | 2 +-
...nnotations_manpage-Property_domainEvent.adoc | 36 +-
.../guides/_rg_classes_lifecycleevent.adoc | 4 +-
.../asciidoc/guides/_rg_methods_lifecycle.adoc | 2 +-
...g_methods_prefixes_manpage-autoComplete.adoc | 4 +-
.../guides/_rg_runtime_configuring-core.adoc | 5 +-
...mainObjectContainer_object-creation-api.adoc | 2 +-
...rg_services-api_manpage-EventBusService.adoc | 23 +-
.../main/asciidoc/guides/_rg_services-spi.adoc | 2 +-
...vices-spi_manpage-ErrorReportingService.adoc | 2 +-
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../_tg_stop-scaffolding-start-coding.adoc | 2 +-
..._ug_getting-started_simpleapp-archetype.adoc | 4 +-
.../src/main/asciidoc/guides/_ug_how-tos.adoc | 3 +-
...placing-default-service-implementations.adoc | 64 +
..._more-advanced_decoupling_contributions.adoc | 2 +-
.../_ug_more-advanced_decoupling_mixins.adoc | 2 +-
...ore-advanced_tips-n-tricks_are-you-sure.adoc | 2 +-
...g_testing_fixture-scripts_api-and-usage.adoc | 4 +-
.../020-annotation-processor.png | Bin 57338 -> 67560 bytes
...10-dcevm-list-of-found-jdk-installations.png | Bin 0 -> 44267 bytes
.../070-advanced/020-dcevm-once-installed.png | Bin 0 -> 44435 bytes
.../030-dcevm-intellij-project-structure.png | Bin 0 -> 62740 bytes
.../040-dcevm-run-configuration.png | Bin 0 -> 47864 bytes
.../asciidoc/guides/simpleapp-archetype.adoc | 4 +-
.../src/main/asciidoc/guides/ug.adoc | 18 +-
.../images/powered-by/commapp/screenshot-1.png | Bin 0 -> 670918 bytes
.../images/powered-by/commapp/screenshot-2.png | Bin 0 -> 56933 bytes
.../asciidoc/images/powered-by/estatio-1.png | Bin 261553 -> 0 bytes
.../images/powered-by/estatio/estatio-1.png | Bin 0 -> 261553 bytes
.../gesconsultor-grc/fig-1-custom-viewer.png | Bin 0 -> 1169636 bytes
.../fig-2-custom-drag-n-drop-interface.png | Bin 0 -> 1495279 bytes
...fig-3-custom-ui-analyzing-risk-scenarios.png | Bin 0 -> 2218476 bytes
.../fig-4-managing-projects.png | Bin 0 -> 995701 bytes
.../documentation/src/main/asciidoc/index.html | 17 +-
.../src/main/asciidoc/migration-notes.adoc | 2 +
.../src/main/asciidoc/powered-by.adoc | 84 +-
.../src/main/asciidoc/release-notes.adoc | 1537 +-----------------
core/applib/pom.xml | 2 +-
.../applib/annotation/CollectionLayout.java | 14 +
core/integtestsupport/pom.xml | 2 +-
.../IntegrationTestAbstract.java | 16 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
.../defaultview/DefaultViewFacet.java | 26 +
.../defaultview/DefaultViewFacetAbstract.java | 35 +
...tViewFacetForCollectionLayoutAnnotation.java | 41 +
...ewFacetOnCollectionFromLayoutProperties.java | 46 +
.../layout/CollectionLayoutFacetFactory.java | 11 +
.../CollectionLayoutFacetRepr.java | 1 +
.../layoutmetadata/DefaultViewFacetRepr.java | 24 +
.../json/LayoutMetadataReaderFromJson.java | 10 +
.../specimpl/ObjectSpecificationAbstract.java | 8 +-
core/pom.xml | 147 +-
core/runtime/pom.xml | 2 +-
.../eventbus/EventBusServiceDefault.java | 5 +-
.../system/persistence/PersistenceSession.java | 46 +-
.../jdo/service/RegisterEntities.java | 10 +
core/schema/pom.xml | 4 +-
core/security-shiro/pom.xml | 6 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 17 +-
.../ObjectCollectionReprRenderer.java | 12 +-
.../ObjectPropertyReprRenderer.java | 12 +-
.../service/RepresentationService.java | 23 +-
.../RepresentationServiceForRestfulObjects.java | 13 +
.../rendering/LinkFollowSpecsTest_follow.java | 14 +
core/viewer-restfulobjects-server/pom.xml | 2 +-
.../restfulobjects/server/ResourceContext.java | 8 +-
.../DomainObjectResourceServerside.java | 7 +-
.../server/resources/DomainResourceHelper.java | 15 +-
.../server/resources/ResourceAbstract.java | 1 +
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
.../wicket/WebRequestCycleForIsis.java | 2 -
core/viewer-wicket-model/pom.xml | 2 +-
.../model/mementos/PageParameterNames.java | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
.../entityactions/AdditionalLinksPanel.java | 26 +-
.../actions/ActionParametersFormPanel.java | 22 +-
.../selector/CollectionSelectorHelper.java | 75 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 99 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 34 +-
.../widgets/themepicker/ThemeChooser.java | 36 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 18 +-
.../accmngt/AccountManagementPageAbstract.java | 9 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 5 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 40 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 6 +-
example/application/simpleapp/app/pom.xml | 2 +-
example/application/simpleapp/dom/pom.xml | 2 +-
.../dom/simple/SimpleObject.layout.json | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 6 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 6 +-
.../dom/simple/SimpleObject.layout.json | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../projects/basic/archetype.properties | 2 +-
153 files changed, 3281 insertions(+), 2143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 6f58943,b3e5e94..35ca32c
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@@ -110,21 -114,44 +114,44 @@@ public class BreadcrumbModel implement
}
}
- public String titleFor(final EntityModel model) {
- return titleByEntityModel.get(model);
- public Object getId(final EntityModel choice) {
++ public RootOid getId(final EntityModel choice) {
+ try {
+ final PageParameters pageParameters = choice.getPageParameters();
+ final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
+ return RootOid.deString(oidStr, getOidMarshaller());
+ } catch (Exception ex) {
+ remove(choice);
+ return null;
+ }
+
}
- public EntityModel lookup(String oidStr) {
- if(oidStr == null) {
- return null;
+
+ void remove(final String rootOid) {
+ final EntityModel existingModel = entityModelByOidStr.get(rootOid);
+ if(existingModel != null) {
+ remove(rootOid, existingModel);
}
- final EntityModel entityModel = entityModelByOidStr.get(oidStr);
- return entityModel;
}
- public void detach() {
- for (EntityModel entityModel : list) {
- entityModel.detach();
+ public void remove(final EntityModel entityModel) {
+ final String oidStr = oidStrByEntityModel.get(entityModel);
+ if(oidStr != null) {
+ remove(oidStr, entityModel);
}
}
+
+ private void remove(final String rootOid, final EntityModel model) {
+ entityModelByOidStr.remove(rootOid);
+ oidStrByEntityModel.remove(model);
+ list.remove(model);
+ }
+
+
+
+ protected OidMarshaller getOidMarshaller() {
+ return IsisContext.getOidMarshaller();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 1653064,50c7367..815aaa1
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@@ -23,14 -27,13 +27,14 @@@ import org.apache.wicket.ajax.AjaxReque
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
- import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Settings;
-import org.wicketstuff.select2.TextChoiceProvider;
+
import org.apache.isis.core.commons.authentication.MessageBroker;
++import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
- import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@@ -53,8 -56,8 +57,8 @@@ public class BreadcrumbPanel extends Pa
final BreadcrumbModelProvider session = (BreadcrumbModelProvider) getSession();
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
-- final IModel<EntityModel> entityModel = new Model<EntityModel>();
- TextChoiceProvider<EntityModel> choiceProvider = new TextChoiceProvider<EntityModel>() {
++ final IModel<EntityModel> entityModel = new Model<>();
+ ChoiceProvider<EntityModel> choiceProvider = new ChoiceProvider<EntityModel>() {
private static final long serialVersionUID = 1L;
@@@ -64,21 -67,23 +68,25 @@@
}
@Override
- protected Object getId(EntityModel choice) {
- return breadcrumbModel.getId(choice);
+ public String getIdValue(EntityModel choice) {
- try {
- final PageParameters pageParameters = choice.getPageParameters();
- final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
- return oidStr;
- } catch (Exception ex) {
- breadcrumbModel.remove(choice);
- return null;
- }
++ RootOid rootOid = breadcrumbModel.getId(choice);
++ String id = IsisContext.getOidMarshaller().marshal(rootOid);
++ return id;
}
@Override
public void query(String term, int page, Response<EntityModel> response) {
- final List<EntityModel> list = breadcrumbModel.getList();
- response.addAll(list);
+ final List<EntityModel> breadCrumbList = Lists.newArrayList(breadcrumbModel.getList());
+ final List<EntityModel> checkedList = Lists.newArrayList(
+ Iterables.filter(breadCrumbList, new Predicate<EntityModel>() {
+ @Override
+ public boolean apply(final EntityModel input) {
- final Object id = getId(input);
++ final Object id = getIdValue(input);
+ return id != null;
+ }
+ })
+ );
+ response.addAll(checkedList);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/009b930a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
[18/21] isis git commit: ISIS-1223: merges remote-tracking branch
'origin/ISIS-1223-upgrade-to-wicket-7'
Posted by da...@apache.org.
ISIS-1223: merges remote-tracking branch 'origin/ISIS-1223-upgrade-to-wicket-7'
# Fixed conflicts:
# core/pom.xml
# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/04d8842f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/04d8842f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/04d8842f
Branch: refs/heads/master
Commit: 04d8842f8a162e60a94d303296dc2c0218071348
Parents: 3b2c552 0840943
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 27 10:47:49 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 27 10:47:49 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 19 ++++--
core/viewer-wicket-applib/pom.xml | 18 +++---
.../wicket/viewer/IsisWicketApplication.java | 43 +++++++++++--
.../viewer/settings/IsisResourceSettings.java | 15 +++--
core/viewer-wicket-model/pom.xml | 16 ++---
.../model/models/BookmarkedPagesModel.java | 2 +-
.../components/about/JarManifestListView.java | 4 +-
.../IsisAjaxFallbackOrderByBorder.java | 3 +-
.../scalars/IsisConverterLocator.java | 4 +-
.../scalars/jdkmath/BigIntegerConverter.java | 68 --------------------
.../jdkmath/JavaMathBigIntegerPanel.java | 5 +-
.../reference/EntityLinkSelect2Panel.java | 2 +-
.../select2/Select2BootstrapCssReference.java | 5 +-
.../widgets/select2/Select2ChoiceUtil.java | 7 +-
.../widgets/select2/Select2JsReference.java | 5 +-
.../wicket/ui/errors/StackTraceListView.java | 4 +-
.../wicket/ui/pages/login/IsisSignInPanel.html | 2 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 6 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 7 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 7 +-
20 files changed, 114 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index a02eaad,c958782..ceec979
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -133,29 -133,28 +133,30 @@@
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
- <hsqldb.version>2.3.1</hsqldb.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
- <jetty.version>9.3.6.v20151106</jetty.version>
+ <jetty.version>9.3.10.v20160621</jetty.version>
- <wicket.version>6.23.0</wicket.version>
+ <wicket.version>7.3.0</wicket.version>
- <wicketstuff.version>7.3.0</wicketstuff.version>
- <wicket-webjars.version>0.4.9</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.16</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.4</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.7</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
+
++ <wicketstuff.version>7.3.0</wicketstuff.version>
+ <select2.version>4.0.0-2</select2.version>
+
- <wicket-select2.version>6.23.0</wicket-select2.version>
- <select2.version>3.5.4</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>4.0</guice.version>
+ <guice.version>4.1.0</guice.version>
<picocontainer.version>2.15</picocontainer.version>
+
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.9</xstream.version>
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index c40b7d9,0f78f39..e3dedd5
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@@ -23,50 -23,25 +23,51 @@@ import java.util.Collections
import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
-import javax.servlet.ServletContext;
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+import org.apache.wicket.Application;
+import org.apache.wicket.ConverterLocator;
+import org.apache.wicket.IConverterLocator;
+import org.apache.wicket.Page;
+import org.apache.wicket.RuntimeConfigurationType;
+import org.apache.wicket.SharedResources;
+import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
+import org.apache.wicket.core.request.mapper.MountedMapper;
+import org.apache.wicket.guice.GuiceComponentInjector;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponseDecorator;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
+import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
+import org.apache.wicket.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.wicketstuff.select2.ApplicationSettings;
+ import net.ftlines.wicketsource.WicketSource;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
@@@ -410,11 -320,10 +442,10 @@@ public class IsisWicketApplicatio
ApplicationSettings select2Settings = ApplicationSettings.get();
select2Settings.setCssReference(new Select2BootstrapCssReference());
select2Settings.setJavaScriptReference(new Select2JsReference());
- select2Settings.setIncludeJqueryUI(false);
}
- protected void configureWicketSourcePluginIfNecessary(final IsisConfiguration configuration) {
- if(isWicketSourcePluginEnabled(configuration)) {
+ protected void configureWicketSourcePluginIfNecessary() {
+ if(isWicketSourcePluginEnabled(this.configuration)) {
configureWicketSourcePlugin();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index af9aff2,077c0d6..6d46269
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@@ -22,17 -22,15 +22,17 @@@ package org.apache.isis.viewer.wicket.m
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
- public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkTreeNode>> {
+ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 955cfb5,5c6531f..f1254cb
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@@ -79,11 -76,7 +79,11 @@@ public class MmvErrorPage extends WebPa
private static final String ID_ERROR = "error";
private static final String ID_ERROR_MESSAGE = "errorMessage";
+ public MmvErrorPage(Set<String> validationErrors) {
+ this(Model.ofList(Lists.newArrayList(validationErrors)));
+ }
+
- public MmvErrorPage(final IModel<List<? extends String>> model) {
+ public MmvErrorPage(final IModel<List<String>> model) {
super(model);
addPageTitle();
addApplicationName();
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 3335a45,95e715a..00d5fe0
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@@ -19,7 -19,8 +19,12 @@@
package org.apache.isis.viewer.wicket.ui.panels;
++<<<<<<< HEAD
+import org.apache.wicket.markup.html.IHeaderContributor;
++=======
+ import java.util.List;
+
++>>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
@@@ -36,7 -42,8 +41,7 @@@ import org.apache.isis.viewer.wicket.ui
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
- implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
- implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- AuthenticationSessionProvider, DeploymentCategoryProvider, PersistenceSessionProvider {
++ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index a7ce4bb,2d07889..c1463da
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@@ -20,7 -20,7 +20,11 @@@
package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
++<<<<<<< HEAD
+import org.apache.wicket.markup.html.IHeaderContributor;
++=======
+ import org.apache.wicket.Session;
++>>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@@ -49,8 -51,8 +53,7 @@@ import de.agilecoders.wicket.extensions
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
- public abstract class PanelAbstract<T extends IModel<?>> extends Panel
- implements IHeaderContributor {
-public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements PersistenceSessionProvider, AuthenticationSessionProvider,
- DeploymentCategoryProvider {
++public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
private static final long serialVersionUID = 1L;
[17/21] isis git commit: Update Wicket to 7.3.0 Also update Wicket
Webjars and Wicket Bootstrap
Posted by da...@apache.org.
Update Wicket to 7.3.0
Also update Wicket Webjars and Wicket Bootstrap
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/08409435
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/08409435
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/08409435
Branch: refs/heads/master
Commit: 0840943595cd626846142a856ffd1a8a8e82fce9
Parents: f4697c6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu May 12 22:29:08 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 12 22:29:08 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/08409435/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6b0c876..c958782 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -139,11 +139,11 @@
<jetty.version>9.3.6.v20151106</jetty.version>
- <wicket.version>7.2.0</wicket.version>
- <wicketstuff.version>7.2.0</wicketstuff.version>
+ <wicket.version>7.3.0</wicket.version>
+ <wicketstuff.version>7.3.0</wicketstuff.version>
- <wicket-webjars.version>0.5.3</wicket-webjars.version>
- <wicket-bootstrap.version>0.10.6</wicket-bootstrap.version>
+ <wicket-webjars.version>0.5.4</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.7</wicket-bootstrap.version>
<wicket-source.version>7.0.0</wicket-source.version>
<select2.version>4.0.0-2</select2.version>
[11/21] isis git commit: Merge branch 'master' into
ISIS-1223-upgrade-to-wicket-7
Posted by da...@apache.org.
Merge branch 'master' into ISIS-1223-upgrade-to-wicket-7
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/803fbc14
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/803fbc14
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/803fbc14
Branch: refs/heads/master
Commit: 803fbc14c825de91204d2ba5a73712c963f56322
Parents: d483b2c 4e21fbc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 13 10:37:12 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 13 10:37:12 2015 +0100
----------------------------------------------------------------------
README.adoc | 8 +-
STATUS | 3 +
adocs/documentation/Gemfile | 3 +
adocs/documentation/Gemfile.lock | 2 +
adocs/documentation/monitor.rb | 70 +-
adocs/documentation/publish.sh | 8 +-
.../_migration-notes_1.10.0-to-1.11.0.adoc | 58 +
.../_migration-notes_1.7.0-to-1.8.0.adoc | 5 +-
...o-1.9.0_bootstrapping-using-AppManifest.adoc | 4 +-
...tes_1.8.0-to-1.9.0_exception-recognizer.adoc | 6 +-
..._fixture-scripts-specification-provider.adoc | 4 +-
...1.8.0-to-1.9.0_specify-all-dom-packages.adoc | 6 +-
...n-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc | 2 +-
...tion-notes_1.8.0-to-1.9.0_war-packaging.adoc | 4 +-
.../_migration-notes_1.9.0-to-1.10.0.adoc | 136 ++
.../src/main/asciidoc/_powered-by_commapp.adoc | 45 +
.../src/main/asciidoc/_powered-by_estatio.adoc | 41 +
.../asciidoc/_powered-by_gesconsultor-grc.adoc | 109 ++
.../asciidoc/_powered-by_transport-planner.adoc | 55 +
.../src/main/asciidoc/_release-notes_1.0.0.adoc | 126 ++
.../src/main/asciidoc/_release-notes_1.0.1.adoc | 22 +
.../src/main/asciidoc/_release-notes_1.1.0.adoc | 141 ++
.../main/asciidoc/_release-notes_1.10.0.adoc | 93 ++
.../src/main/asciidoc/_release-notes_1.2.0.adoc | 136 ++
.../src/main/asciidoc/_release-notes_1.3.0.adoc | 256 +++
.../src/main/asciidoc/_release-notes_1.3.1.adoc | 30 +
.../src/main/asciidoc/_release-notes_1.4.0.adoc | 238 +++
.../src/main/asciidoc/_release-notes_1.4.1.adoc | 30 +
.../src/main/asciidoc/_release-notes_1.5.0.adoc | 125 ++
.../src/main/asciidoc/_release-notes_1.6.0.adoc | 93 ++
.../src/main/asciidoc/_release-notes_1.7.0.adoc | 122 ++
.../src/main/asciidoc/_release-notes_1.8.0.adoc | 127 ++
.../src/main/asciidoc/_release-notes_1.9.0.adoc | 140 ++
.../src/main/asciidoc/common-use-cases.adoc | 4 +-
.../documentation/src/main/asciidoc/demos.adoc | 18 -
.../src/main/asciidoc/doap_isis.rdf | 19 +-
.../src/main/asciidoc/documentation.adoc | 73 +-
.../src/main/asciidoc/downloads.adoc | 10 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 257 ++-
.../main/asciidoc/guides/_cg_building-isis.adoc | 28 +-
.../_cg_committers_cutting-a-release.adoc | 64 +-
.../_cg_committers_post-release-successful.adoc | 70 +-
...cg_committers_post-release-unsuccessful.adoc | 16 +-
...ommitters_release-process-for-snapshots.adoc | 26 +-
.../_cg_committers_verifying-releases.adoc | 2 +-
.../main/asciidoc/guides/_cg_ide-templates.adoc | 62 +-
.../src/main/asciidoc/guides/_cg_ide.adoc | 1 +
.../main/asciidoc/guides/_cg_ide_agilej.adoc | 55 +
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 28 +-
.../main/asciidoc/guides/_cg_ide_intellij.adoc | 65 +-
.../asciidoc/guides/_cg_ide_project-lombok.adoc | 4 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 231 +--
.../guides/_cg_isis-maven-plugin_validate.adoc | 241 +++
.../guides/_cg_isis-maven-plugin_xsd.adoc | 329 ++++
.../main/asciidoc/guides/_rg_annotations.adoc | 63 -
.../asciidoc/guides/_rg_annotations_aaa.adoc | 17 -
.../guides/_rg_annotations_aaa_deprecated.adoc | 342 ----
.../guides/_rg_annotations_aaa_jdo.adoc | 113 --
.../guides/_rg_annotations_aaa_jee.adoc | 59 -
.../guides/_rg_annotations_aaa_main.adoc | 103 --
.../guides/_rg_annotations_aaa_other.adoc | 57 -
.../guides/_rg_annotations_aaa_partial.adoc | 92 --
.../guides/_rg_annotations_manpage-Action.adoc | 137 --
.../_rg_annotations_manpage-ActionLayout.adoc | 133 --
...ations_manpage-ActionLayout_bookmarking.adoc | 64 -
...ions_manpage-ActionLayout_contributedAs.adoc | 54 -
...notations_manpage-ActionLayout_cssClass.adoc | 41 -
...tations_manpage-ActionLayout_cssClassFa.adoc | 59 -
...ations_manpage-ActionLayout_describedAs.adoc | 37 -
...annotations_manpage-ActionLayout_hidden.adoc | 57 -
..._annotations_manpage-ActionLayout_named.adoc | 45 -
...notations_manpage-ActionLayout_position.adoc | 80 -
.../_rg_annotations_manpage-Action_command.adoc | 134 --
..._annotations_manpage-Action_domainEvent.adoc | 160 --
.../_rg_annotations_manpage-Action_hidden.adoc | 49 -
..._rg_annotations_manpage-Action_invokeOn.adoc | 64 -
...g_annotations_manpage-Action_publishing.adoc | 53 -
...g_annotations_manpage-Action_restrictTo.adoc | 30 -
...rg_annotations_manpage-Action_semantics.adoc | 91 --
.../_rg_annotations_manpage-Action_typeOf.adoc | 31 -
.../_rg_annotations_manpage-Collection.adoc | 105 --
...rg_annotations_manpage-CollectionLayout.adoc | 128 --
...tions_manpage-CollectionLayout_cssClass.adoc | 36 -
...ns_manpage-CollectionLayout_describedAs.adoc | 37 -
...tations_manpage-CollectionLayout_hidden.adoc | 58 -
...otations_manpage-CollectionLayout_named.adoc | 53 -
...otations_manpage-CollectionLayout_paged.adoc | 45 -
...tations_manpage-CollectionLayout_render.adoc | 40 -
...tions_manpage-CollectionLayout_sortedBy.adoc | 59 -
...otations_manpage-Collection_domainEvent.adoc | 178 --
..._annotations_manpage-Collection_editing.adoc | 48 -
...g_annotations_manpage-Collection_hidden.adoc | 54 -
...tations_manpage-Collection_notPersisted.adoc | 57 -
...g_annotations_manpage-Collection_typeOf.adoc | 26 -
.../guides/_rg_annotations_manpage-Column.adoc | 154 --
.../guides/_rg_annotations_manpage-Digits.adoc | 35 -
.../_rg_annotations_manpage-Discriminator.adoc | 59 -
.../_rg_annotations_manpage-DomainObject.adoc | 105 --
..._annotations_manpage-DomainObjectLayout.adoc | 115 --
..._manpage-DomainObjectLayout_bookmarking.adoc | 66 -
...ons_manpage-DomainObjectLayout_cssClass.adoc | 34 -
...s_manpage-DomainObjectLayout_cssClassFa.adoc | 40 -
..._manpage-DomainObjectLayout_describedAs.adoc | 22 -
...ations_manpage-DomainObjectLayout_named.adoc | 37 -
...ations_manpage-DomainObjectLayout_paged.adoc | 33 -
...tions_manpage-DomainObjectLayout_plural.adoc | 28 -
...notations_manpage-DomainObject_auditing.adoc | 38 -
...age-DomainObject_autoCompleteRepository.adoc | 81 -
...nnotations_manpage-DomainObject_bounded.adoc | 36 -
...nnotations_manpage-DomainObject_editing.adoc | 61 -
...annotations_manpage-DomainObject_nature.adoc | 66 -
...tations_manpage-DomainObject_objectType.adoc | 46 -
...tations_manpage-DomainObject_publishing.adoc | 49 -
.../_rg_annotations_manpage-DomainService.adoc | 64 -
...annotations_manpage-DomainServiceLayout.adoc | 78 -
...ons_manpage-DomainServiceLayout_menuBar.adoc | 43 -
...s_manpage-DomainServiceLayout_menuOrder.adoc | 74 -
...tions_manpage-DomainServiceLayout_named.adoc | 29 -
...nnotations_manpage-DomainService_nature.adoc | 89 -
...ons_manpage-DomainService_repositoryFor.adoc | 26 -
.../guides/_rg_annotations_manpage-Facets.adoc | 15 -
.../_rg_annotations_manpage-HomePage.adoc | 52 -
.../guides/_rg_annotations_manpage-Inject.adoc | 154 --
...g_annotations_manpage-MemberGroupLayout.adoc | 20 -
.../_rg_annotations_manpage-MemberOrder.adoc | 35 -
.../_rg_annotations_manpage-MinLength.adoc | 32 -
.../guides/_rg_annotations_manpage-Mixin.adoc | 40 -
.../_rg_annotations_manpage-NotPersistent.adoc | 18 -
.../_rg_annotations_manpage-Parameter.adoc | 96 --
..._rg_annotations_manpage-ParameterLayout.adoc | 112 --
...ations_manpage-ParameterLayout_cssClass.adoc | 29 -
...ons_manpage-ParameterLayout_describedAs.adoc | 38 -
...s_manpage-ParameterLayout_labelPosition.adoc | 41 -
...tions_manpage-ParameterLayout_multiLine.adoc | 32 -
...notations_manpage-ParameterLayout_named.adoc | 44 -
...age-ParameterLayout_renderedAsDayBefore.adoc | 35 -
...s_manpage-ParameterLayout_typicalLength.adoc | 36 -
...annotations_manpage-Parameter_maxLength.adoc | 35 -
...notations_manpage-Parameter_mustSatisfy.adoc | 65 -
...notations_manpage-Parameter_optionality.adoc | 36 -
...otations_manpage-Parameter_regexPattern.adoc | 31 -
..._annotations_manpage-PersistenceCapable.adoc | 90 -
.../_rg_annotations_manpage-PostConstruct.adoc | 71 -
.../_rg_annotations_manpage-PreDestroy.adoc | 53 -
.../_rg_annotations_manpage-PrimaryKey.adoc | 19 -
.../_rg_annotations_manpage-Programmatic.adoc | 27 -
.../_rg_annotations_manpage-Property.adoc | 134 --
.../_rg_annotations_manpage-PropertyLayout.adoc | 142 --
...tations_manpage-PropertyLayout_cssClass.adoc | 36 -
...ions_manpage-PropertyLayout_describedAs.adoc | 33 -
...notations_manpage-PropertyLayout_hidden.adoc | 78 -
...ns_manpage-PropertyLayout_labelPosition.adoc | 96 --
...ations_manpage-PropertyLayout_multiLine.adoc | 44 -
...nnotations_manpage-PropertyLayout_named.adoc | 51 -
...page-PropertyLayout_renderedAsDayBefore.adoc | 45 -
...ns_manpage-PropertyLayout_typicalLength.adoc | 25 -
...nnotations_manpage-Property_domainEvent.adoc | 164 --
...rg_annotations_manpage-Property_editing.adoc | 43 -
..._rg_annotations_manpage-Property_hidden.adoc | 66 -
..._annotations_manpage-Property_maxLength.adoc | 49 -
...nnotations_manpage-Property_mustSatisfy.adoc | 57 -
...notations_manpage-Property_notPersisted.adoc | 61 -
...nnotations_manpage-Property_optionality.adoc | 129 --
...notations_manpage-Property_regexPattern.adoc | 28 -
.../_rg_annotations_manpage-RequestScoped.adoc | 50 -
.../guides/_rg_annotations_manpage-Title.adoc | 38 -
.../_rg_annotations_manpage-ViewModel.adoc | 44 -
..._rg_annotations_manpage-ViewModelLayout.adoc | 102 --
...ations_manpage-ViewModelLayout_cssClass.adoc | 30 -
...ions_manpage-ViewModelLayout_cssClassFa.adoc | 41 -
...ons_manpage-ViewModelLayout_describedAs.adoc | 23 -
...notations_manpage-ViewModelLayout_named.adoc | 35 -
...notations_manpage-ViewModelLayout_paged.adoc | 34 -
...otations_manpage-ViewModelLayout_plural.adoc | 24 -
.../src/main/asciidoc/guides/_rg_classes.adoc | 22 -
.../_rg_classes_AppManifest-bootstrapping.adoc | 282 ----
.../guides/_rg_classes_contributee.adoc | 13 -
...es_contributee_manpage-HasTransactionId.adoc | 31 -
...classes_contributee_manpage-HasUserName.adoc | 27 -
.../guides/_rg_classes_domainevent.adoc | 76 -
...domainevent_manpage-AbstractDomainEvent.adoc | 20 -
...s_domainevent_manpage-ActionDomainEvent.adoc | 20 -
...mainevent_manpage-CollectionDomainEvent.adoc | 21 -
...domainevent_manpage-PropertyDomainEvent.adoc | 17 -
.../main/asciidoc/guides/_rg_classes_i18n.adoc | 11 -
...classes_i18n_manpage-TranslatableString.adoc | 13 -
.../guides/_rg_classes_lifecycleevent.adoc | 130 --
...cleevent_manpage-AbstractLifecycleEvent.adoc | 27 -
...fecycleevent_manpage-ObjectCreatedEvent.adoc | 20 -
...ifecycleevent_manpage-ObjectLoadedEvent.adoc | 17 -
...cycleevent_manpage-ObjectPersistedEvent.adoc | 19 -
...ycleevent_manpage-ObjectPersistingEvent.adoc | 21 -
...ecycleevent_manpage-ObjectRemovingEvent.adoc | 20 -
...fecycleevent_manpage-ObjectUpdatedEvent.adoc | 21 -
...ecycleevent_manpage-ObjectUpdatingEvent.adoc | 22 -
.../main/asciidoc/guides/_rg_classes_roles.adoc | 15 -
...rg_classes_roles_manpage-HoldsUpdatedAt.adoc | 45 -
...rg_classes_roles_manpage-HoldsUpdatedBy.adoc | 19 -
..._rg_classes_roles_manpage-Timestampable.adoc | 23 -
.../main/asciidoc/guides/_rg_classes_spec.adoc | 108 --
.../main/asciidoc/guides/_rg_classes_super.adoc | 105 --
...s_super_manpage-AbstractContainedObject.adoc | 32 -
...sses_super_manpage-AbstractDomainObject.adoc | 14 -
...er_manpage-AbstractFactoryAndRepository.adoc | 15 -
...g_classes_super_manpage-AbstractService.adoc | 10 -
...lasses_super_manpage-AbstractSubscriber.adoc | 8 -
...classes_super_manpage-AbstractViewModel.adoc | 15 -
..._rg_classes_super_manpage-FixtureScript.adoc | 21 -
...rg_classes_super_manpage-FixtureScripts.adoc | 12 -
.../asciidoc/guides/_rg_classes_utility.adoc | 16 -
.../_rg_classes_utility_manpage-Enums.adoc | 8 -
...classes_utility_manpage-ObjectContracts.adoc | 107 --
.../_rg_classes_utility_manpage-Reasons.adoc | 31 -
..._rg_classes_utility_manpage-TitleBuffer.adoc | 13 -
.../guides/_rg_classes_value-types.adoc | 119 --
.../_rg_classes_value-types_manpage-Blob.adoc | 8 -
.../_rg_classes_value-types_manpage-Clob.adoc | 8 -
.../_rg_classes_value-types_manpage-Color.adoc | 9 -
.../_rg_classes_value-types_manpage-Money.adoc | 8 -
...rg_classes_value-types_manpage-Password.adoc | 8 -
.../src/main/asciidoc/guides/_rg_methods.adoc | 17 -
.../asciidoc/guides/_rg_methods_lifecycle.adoc | 102 --
.../guides/_rg_methods_lifecycle_jdo-api.adoc | 53 -
.../_rg_methods_lifecycle_manpage-created.adoc | 17 -
.../_rg_methods_lifecycle_manpage-loaded.adoc | 15 -
..._rg_methods_lifecycle_manpage-persisted.adoc | 16 -
...rg_methods_lifecycle_manpage-persisting.adoc | 16 -
.../_rg_methods_lifecycle_manpage-removed.adoc | 16 -
.../_rg_methods_lifecycle_manpage-removing.adoc | 16 -
.../_rg_methods_lifecycle_manpage-updated.adoc | 18 -
.../_rg_methods_lifecycle_manpage-updating.adoc | 15 -
.../asciidoc/guides/_rg_methods_prefixes.adoc | 219 ---
.../_rg_methods_prefixes_manpage-addTo.adoc | 37 -
...g_methods_prefixes_manpage-autoComplete.adoc | 96 --
.../_rg_methods_prefixes_manpage-choices.adoc | 143 --
.../_rg_methods_prefixes_manpage-clear.adoc | 32 -
.../_rg_methods_prefixes_manpage-default.adoc | 129 --
.../_rg_methods_prefixes_manpage-disable.adoc | 93 --
.../_rg_methods_prefixes_manpage-get.adoc | 19 -
.../_rg_methods_prefixes_manpage-hide.adoc | 82 -
.../_rg_methods_prefixes_manpage-modify.adoc | 37 -
..._rg_methods_prefixes_manpage-removeFrom.adoc | 37 -
.../_rg_methods_prefixes_manpage-set.adoc | 13 -
.../_rg_methods_prefixes_manpage-validate.adoc | 113 --
..._methods_prefixes_manpage-validateAddTo.adoc | 45 -
...ods_prefixes_manpage-validateRemoveFrom.adoc | 45 -
.../asciidoc/guides/_rg_methods_reserved.adoc | 58 -
.../_rg_methods_reserved_manpage-cssClass.adoc | 46 -
.../_rg_methods_reserved_manpage-disable.adoc | 102 --
.../_rg_methods_reserved_manpage-getId.adoc | 19 -
.../_rg_methods_reserved_manpage-hide.adoc | 39 -
.../_rg_methods_reserved_manpage-iconName.adoc | 36 -
.../_rg_methods_reserved_manpage-title.adoc | 65 -
.../_rg_methods_reserved_manpage-validate.adoc | 27 -
.../main/asciidoc/guides/_rg_object-layout.adoc | 18 -
.../_rg_object-layout_application-menu.adoc | 171 --
.../guides/_rg_object-layout_dynamic.adoc | 113 --
.../_rg_object-layout_static-vs-dynamic.adoc | 26 -
.../guides/_rg_object-layout_static.adoc | 159 --
.../src/main/asciidoc/guides/_rg_runtime.adoc | 28 -
.../_rg_runtime_application-specific.adoc | 13 -
...me_application-specific_application-css.adoc | 8 -
...ime_application-specific_application-js.adoc | 9 -
.../guides/_rg_runtime_configuration-files.adoc | 40 -
.../guides/_rg_runtime_configuring-core.adoc | 333 ----
.../_rg_runtime_configuring-datanucleus.adoc | 18 -
...s_disabling-persistence-by-reachability.adoc | 88 -
...atanucleus_eagerly-registering-entities.adoc | 23 -
...configuring-datanucleus_persistence-xml.adoc | 10 -
...time_configuring-datanucleus_properties.adoc | 66 -
...ring-datanucleus_using-jndi-data-source.adoc | 75 -
.../guides/_rg_runtime_deployment-types.adoc | 111 --
.../_rg_runtime_specifying-components.adoc | 110 --
.../main/asciidoc/guides/_rg_services-api.adoc | 295 ----
...ces-api_manpage-ActionInvocationContext.adoc | 99 --
..._services-api_manpage-BackgroundService.adoc | 124 --
...roundService_BackgroundCommandExecution.adoc | 25 -
...es-api_manpage-BackgroundService_Quartz.adoc | 162 --
...rg_services-api_manpage-BookmarkService.adoc | 118 --
...ices-api_manpage-BulkInteractionContext.adoc | 9 -
.../_rg_services-api_manpage-ClockService.adoc | 105 --
..._rg_services-api_manpage-CommandContext.adoc | 218 ---
...rg_services-api_manpage-DeepLinkService.adoc | 58 -
...vices-api_manpage-DomainObjectContainer.adoc | 44 -
...nObjectContainer_generic-repository-api.adoc | 89 -
...page-DomainObjectContainer_messages-api.adoc | 50 -
...mainObjectContainer_object-creation-api.adoc | 49 -
...nObjectContainer_object-persistence-api.adoc | 62 -
...-DomainObjectContainer_presentation-api.adoc | 46 -
...ge-DomainObjectContainer_properties-api.adoc | 54 -
...page-DomainObjectContainer_security-api.adoc | 48 -
...page-DomainObjectContainer_services-api.adoc | 37 -
...ge-DomainObjectContainer_validation-api.adoc | 26 -
.../_rg_services-api_manpage-EmailService.adoc | 99 --
...rg_services-api_manpage-EventBusService.adoc | 392 -----
...vices-api_manpage-FixtureScriptsDefault.adoc | 50 -
..._services-api_manpage-GuiceBeanProvider.adoc | 91 --
..._rg_services-api_manpage-IsisJdoSupport.adoc | 277 ----
..._rg_services-api_manpage-MementoService.adoc | 132 --
...g_services-api_manpage-MetamodelService.adoc | 43 -
..._services-api_manpage-QueryResultsCache.adoc | 128 --
.../_rg_services-api_manpage-Scratchpad.adoc | 130 --
.../_rg_services-api_manpage-SudoService.adoc | 69 -
..._rg_services-api_manpage-WrapperFactory.adoc | 163 --
...services-api_manpage-XmlSnapshotService.adoc | 215 ---
.../main/asciidoc/guides/_rg_services-spi.adoc | 287 ----
...rg_services-spi_manpage-AuditingService.adoc | 85 -
...es-spi_manpage-BackgroundCommandService.adoc | 130 --
...vices-spi_manpage-ClassDiscoveryService.adoc | 84 -
..._rg_services-spi_manpage-CommandService.adoc | 100 --
...vices-spi_manpage-ContentMappingService.adoc | 106 --
...s-spi_manpage-ContentNegotiationService.adoc | 206 ---
...es-spi_manpage-EmailNotificationService.adoc | 81 -
...vices-spi_manpage-ErrorReportingService.adoc | 105 --
...rg_services-spi_manpage-EventSerializer.adoc | 73 -
...ervices-spi_manpage-ExceptionRecognizer.adoc | 126 --
...age-FixtureScriptsSpecificationProvider.adoc | 70 -
..._rg_services-spi_manpage-LocaleProvider.adoc | 72 -
..._services-spi_manpage-PublishingService.adoc | 164 --
...vices-spi_manpage-RepresentationService.adoc | 107 --
...services-spi_manpage-TranslationService.adoc | 80 -
...rvices-spi_manpage-TranslationsResolver.adoc | 68 -
...services-spi_manpage-UserProfileService.adoc | 44 -
...ces-spi_manpage-UserRegistrationService.adoc | 82 -
.../src/main/asciidoc/guides/_rg_web-xml.adoc | 458 ------
.../src/main/asciidoc/guides/_rgant-Action.adoc | 133 ++
.../asciidoc/guides/_rgant-ActionLayout.adoc | 133 ++
.../guides/_rgant-ActionLayout_bookmarking.adoc | 64 +
.../_rgant-ActionLayout_contributedAs.adoc | 54 +
.../guides/_rgant-ActionLayout_cssClass.adoc | 41 +
.../guides/_rgant-ActionLayout_cssClassFa.adoc | 59 +
.../guides/_rgant-ActionLayout_describedAs.adoc | 37 +
.../guides/_rgant-ActionLayout_hidden.adoc | 57 +
.../guides/_rgant-ActionLayout_named.adoc | 45 +
.../guides/_rgant-ActionLayout_position.adoc | 80 +
.../asciidoc/guides/_rgant-Action_command.adoc | 134 ++
.../guides/_rgant-Action_domainEvent.adoc | 164 ++
.../asciidoc/guides/_rgant-Action_hidden.adoc | 49 +
.../asciidoc/guides/_rgant-Action_invokeOn.adoc | 64 +
.../guides/_rgant-Action_publishing.adoc | 53 +
.../guides/_rgant-Action_restrictTo.adoc | 30 +
.../guides/_rgant-Action_semantics.adoc | 91 ++
.../asciidoc/guides/_rgant-Action_typeOf.adoc | 31 +
.../main/asciidoc/guides/_rgant-Collection.adoc | 105 ++
.../guides/_rgant-CollectionLayout.adoc | 137 ++
.../_rgant-CollectionLayout_cssClass.adoc | 36 +
.../_rgant-CollectionLayout_defaultView.adoc | 43 +
.../_rgant-CollectionLayout_describedAs.adoc | 38 +
.../guides/_rgant-CollectionLayout_hidden.adoc | 58 +
.../guides/_rgant-CollectionLayout_named.adoc | 53 +
.../guides/_rgant-CollectionLayout_paged.adoc | 45 +
.../guides/_rgant-CollectionLayout_render.adoc | 42 +
.../_rgant-CollectionLayout_sortedBy.adoc | 59 +
.../guides/_rgant-Collection_domainEvent.adoc | 174 ++
.../guides/_rgant-Collection_editing.adoc | 48 +
.../guides/_rgant-Collection_hidden.adoc | 54 +
.../guides/_rgant-Collection_notPersisted.adoc | 57 +
.../guides/_rgant-Collection_typeOf.adoc | 26 +
.../src/main/asciidoc/guides/_rgant-Column.adoc | 154 ++
.../src/main/asciidoc/guides/_rgant-Digits.adoc | 35 +
.../asciidoc/guides/_rgant-Discriminator.adoc | 59 +
.../asciidoc/guides/_rgant-DomainObject.adoc | 154 ++
.../guides/_rgant-DomainObjectLayout.adoc | 132 ++
.../_rgant-DomainObjectLayout_bookmarking.adoc | 66 +
.../_rgant-DomainObjectLayout_cssClass.adoc | 34 +
.../_rgant-DomainObjectLayout_cssClassFa.adoc | 40 +
...gant-DomainObjectLayout_cssClassUiEvent.adoc | 126 ++
.../_rgant-DomainObjectLayout_describedAs.adoc | 22 +
.../_rgant-DomainObjectLayout_iconUiEvent.adoc | 122 ++
.../guides/_rgant-DomainObjectLayout_named.adoc | 37 +
.../guides/_rgant-DomainObjectLayout_paged.adoc | 33 +
.../_rgant-DomainObjectLayout_plural.adoc | 28 +
.../_rgant-DomainObjectLayout_titleUiEvent.adoc | 120 ++
.../guides/_rgant-DomainObject_auditing.adoc | 38 +
...ant-DomainObject_autoCompleteRepository.adoc | 81 +
.../guides/_rgant-DomainObject_bounded.adoc | 36 +
...gant-DomainObject_createdLifecycleEvent.adoc | 108 ++
.../guides/_rgant-DomainObject_editing.adoc | 61 +
...rgant-DomainObject_loadedLifecycleEvent.adoc | 105 ++
.../guides/_rgant-DomainObject_nature.adoc | 66 +
.../guides/_rgant-DomainObject_objectType.adoc | 46 +
...nt-DomainObject_persistedLifecycleEvent.adoc | 111 ++
...t-DomainObject_persistingLifecycleEvent.adoc | 114 ++
.../guides/_rgant-DomainObject_publishing.adoc | 49 +
...ant-DomainObject_removingLifecycleEvent.adoc | 114 ++
...gant-DomainObject_updatedLifecycleEvent.adoc | 110 ++
...ant-DomainObject_updatingLifecycleEvent.adoc | 114 ++
.../asciidoc/guides/_rgant-DomainService.adoc | 64 +
.../guides/_rgant-DomainServiceLayout.adoc | 78 +
.../_rgant-DomainServiceLayout_menuBar.adoc | 43 +
.../_rgant-DomainServiceLayout_menuOrder.adoc | 74 +
.../_rgant-DomainServiceLayout_named.adoc | 29 +
.../guides/_rgant-DomainService_nature.adoc | 89 +
.../_rgant-DomainService_repositoryFor.adoc | 26 +
.../src/main/asciidoc/guides/_rgant-Facets.adoc | 15 +
.../main/asciidoc/guides/_rgant-HomePage.adoc | 52 +
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 154 ++
.../guides/_rgant-MemberGroupLayout.adoc | 20 +
.../asciidoc/guides/_rgant-MemberOrder.adoc | 35 +
.../main/asciidoc/guides/_rgant-MinLength.adoc | 32 +
.../src/main/asciidoc/guides/_rgant-Mixin.adoc | 40 +
.../asciidoc/guides/_rgant-NotPersistent.adoc | 18 +
.../main/asciidoc/guides/_rgant-Parameter.adoc | 96 ++
.../asciidoc/guides/_rgant-ParameterLayout.adoc | 112 ++
.../guides/_rgant-ParameterLayout_cssClass.adoc | 29 +
.../_rgant-ParameterLayout_describedAs.adoc | 38 +
.../_rgant-ParameterLayout_labelPosition.adoc | 41 +
.../_rgant-ParameterLayout_multiLine.adoc | 32 +
.../guides/_rgant-ParameterLayout_named.adoc | 44 +
...ant-ParameterLayout_renderedAsDayBefore.adoc | 35 +
.../_rgant-ParameterLayout_typicalLength.adoc | 36 +
.../guides/_rgant-Parameter_maxLength.adoc | 35 +
.../guides/_rgant-Parameter_mustSatisfy.adoc | 65 +
.../guides/_rgant-Parameter_optionality.adoc | 36 +
.../guides/_rgant-Parameter_regexPattern.adoc | 37 +
.../guides/_rgant-PersistenceCapable.adoc | 90 +
.../asciidoc/guides/_rgant-PostConstruct.adoc | 71 +
.../main/asciidoc/guides/_rgant-PreDestroy.adoc | 53 +
.../main/asciidoc/guides/_rgant-PrimaryKey.adoc | 19 +
.../asciidoc/guides/_rgant-Programmatic.adoc | 27 +
.../main/asciidoc/guides/_rgant-Property.adoc | 134 ++
.../asciidoc/guides/_rgant-PropertyLayout.adoc | 142 ++
.../guides/_rgant-PropertyLayout_cssClass.adoc | 36 +
.../_rgant-PropertyLayout_describedAs.adoc | 33 +
.../guides/_rgant-PropertyLayout_hidden.adoc | 78 +
.../_rgant-PropertyLayout_labelPosition.adoc | 96 ++
.../guides/_rgant-PropertyLayout_multiLine.adoc | 44 +
.../guides/_rgant-PropertyLayout_named.adoc | 51 +
...gant-PropertyLayout_renderedAsDayBefore.adoc | 45 +
.../_rgant-PropertyLayout_typicalLength.adoc | 25 +
.../guides/_rgant-Property_domainEvent.adoc | 154 ++
.../guides/_rgant-Property_editing.adoc | 43 +
.../asciidoc/guides/_rgant-Property_hidden.adoc | 66 +
.../guides/_rgant-Property_maxLength.adoc | 49 +
.../guides/_rgant-Property_mustSatisfy.adoc | 57 +
.../guides/_rgant-Property_notPersisted.adoc | 61 +
.../guides/_rgant-Property_optionality.adoc | 129 ++
.../guides/_rgant-Property_regexPattern.adoc | 35 +
.../asciidoc/guides/_rgant-RequestScoped.adoc | 50 +
.../src/main/asciidoc/guides/_rgant-Title.adoc | 62 +
.../main/asciidoc/guides/_rgant-ViewModel.adoc | 44 +
.../asciidoc/guides/_rgant-ViewModelLayout.adoc | 102 ++
.../guides/_rgant-ViewModelLayout_cssClass.adoc | 30 +
.../_rgant-ViewModelLayout_cssClassFa.adoc | 41 +
.../_rgant-ViewModelLayout_describedAs.adoc | 23 +
.../guides/_rgant-ViewModelLayout_named.adoc | 35 +
.../guides/_rgant-ViewModelLayout_paged.adoc | 34 +
.../guides/_rgant-ViewModelLayout_plural.adoc | 24 +
.../guides/_rgant-XmlJavaTypeAdapter.adoc | 27 +
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 83 +
.../src/main/asciidoc/guides/_rgant_aaa.adoc | 17 +
.../asciidoc/guides/_rgant_aaa_deprecated.adoc | 342 ++++
.../main/asciidoc/guides/_rgant_aaa_jdo.adoc | 113 ++
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 73 +
.../main/asciidoc/guides/_rgant_aaa_main.adoc | 103 ++
.../main/asciidoc/guides/_rgant_aaa_other.adoc | 57 +
.../asciidoc/guides/_rgant_aaa_partial.adoc | 92 ++
.../guides/_rgcfg_configuration-files.adoc | 40 +
.../guides/_rgcfg_configuring-core.adoc | 455 ++++++
.../guides/_rgcfg_configuring-datanucleus.adoc | 18 +
...s_disabling-persistence-by-reachability.adoc | 88 +
...atanucleus_eagerly-registering-entities.adoc | 23 +
...configuring-datanucleus_persistence-xml.adoc | 10 +
...gcfg_configuring-datanucleus_properties.adoc | 66 +
...ring-datanucleus_using-jndi-data-source.adoc | 75 +
.../guides/_rgcfg_deployment-types.adoc | 111 ++
.../guides/_rgcfg_specifying-components.adoc | 110 ++
.../main/asciidoc/guides/_rgcms_classes.adoc | 23 +
...rgcms_classes_AppManifest-bootstrapping.adoc | 282 ++++
.../guides/_rgcms_classes_contributee.adoc | 13 +
...ms_classes_contributee_HasTransactionId.adoc | 31 +
.../_rgcms_classes_contributee_HasUserName.adoc | 27 +
.../guides/_rgcms_classes_domainevent.adoc | 76 +
...classes_domainevent_AbstractDomainEvent.adoc | 20 +
...s_classes_domainevent_ActionDomainEvent.adoc | 20 +
...asses_domainevent_CollectionDomainEvent.adoc | 21 +
...classes_domainevent_PropertyDomainEvent.adoc | 17 +
.../asciidoc/guides/_rgcms_classes_i18n.adoc | 11 +
.../_rgcms_classes_i18n_TranslatableString.adoc | 13 +
.../guides/_rgcms_classes_lifecycleevent.adoc | 130 ++
...s_lifecycleevent_AbstractLifecycleEvent.adoc | 27 +
...asses_lifecycleevent_ObjectCreatedEvent.adoc | 20 +
...lasses_lifecycleevent_ObjectLoadedEvent.adoc | 17 +
...ses_lifecycleevent_ObjectPersistedEvent.adoc | 19 +
...es_lifecycleevent_ObjectPersistingEvent.adoc | 21 +
...sses_lifecycleevent_ObjectRemovingEvent.adoc | 20 +
...asses_lifecycleevent_ObjectUpdatedEvent.adoc | 21 +
...sses_lifecycleevent_ObjectUpdatingEvent.adoc | 22 +
.../asciidoc/guides/_rgcms_classes_roles.adoc | 18 +
.../guides/_rgcms_classes_roles_Dto.adoc | 61 +
.../_rgcms_classes_roles_HoldsUpdatedAt.adoc | 44 +
.../_rgcms_classes_roles_HoldsUpdatedBy.adoc | 19 +
.../_rgcms_classes_roles_Persistable.adoc | 34 +
.../_rgcms_classes_roles_Timestampable.adoc | 23 +
.../asciidoc/guides/_rgcms_classes_spec.adoc | 108 ++
.../asciidoc/guides/_rgcms_classes_super.adoc | 105 ++
...s_classes_super_AbstractContainedObject.adoc | 32 +
...gcms_classes_super_AbstractDomainObject.adoc | 14 +
...sses_super_AbstractFactoryAndRepository.adoc | 15 +
.../_rgcms_classes_super_AbstractService.adoc | 10 +
..._rgcms_classes_super_AbstractSubscriber.adoc | 18 +
.../_rgcms_classes_super_AbstractViewModel.adoc | 15 +
.../_rgcms_classes_super_FixtureScript.adoc | 21 +
.../_rgcms_classes_super_FixtureScripts.adoc | 12 +
.../asciidoc/guides/_rgcms_classes_uievent.adoc | 62 +
.../_rgcms_classes_uievent_CssClassUiEvent.adoc | 22 +
.../_rgcms_classes_uievent_IconUiEvent.adoc | 23 +
.../_rgcms_classes_uievent_TitleUiEvent.adoc | 22 +
.../asciidoc/guides/_rgcms_classes_utility.adoc | 16 +
.../guides/_rgcms_classes_utility_Enums.adoc | 8 +
.../_rgcms_classes_utility_ObjectContracts.adoc | 107 ++
.../guides/_rgcms_classes_utility_Reasons.adoc | 31 +
.../_rgcms_classes_utility_TitleBuffer.adoc | 13 +
.../guides/_rgcms_classes_value-types.adoc | 119 ++
.../guides/_rgcms_classes_value-types_Blob.adoc | 8 +
.../guides/_rgcms_classes_value-types_Clob.adoc | 8 +
.../_rgcms_classes_value-types_Color.adoc | 8 +
.../_rgcms_classes_value-types_Money.adoc | 8 +
.../_rgcms_classes_value-types_Password.adoc | 8 +
.../main/asciidoc/guides/_rgcms_methods.adoc | 17 +
.../guides/_rgcms_methods_lifecycle.adoc | 102 ++
.../_rgcms_methods_lifecycle_created.adoc | 17 +
.../_rgcms_methods_lifecycle_jdo-api.adoc | 53 +
.../guides/_rgcms_methods_lifecycle_loaded.adoc | 15 +
.../_rgcms_methods_lifecycle_persisted.adoc | 16 +
.../_rgcms_methods_lifecycle_persisting.adoc | 16 +
.../_rgcms_methods_lifecycle_removed.adoc | 16 +
.../_rgcms_methods_lifecycle_removing.adoc | 16 +
.../_rgcms_methods_lifecycle_updated.adoc | 18 +
.../_rgcms_methods_lifecycle_updating.adoc | 15 +
.../guides/_rgcms_methods_prefixes.adoc | 219 +++
.../guides/_rgcms_methods_prefixes_addTo.adoc | 37 +
.../_rgcms_methods_prefixes_autoComplete.adoc | 96 ++
.../guides/_rgcms_methods_prefixes_choices.adoc | 143 ++
.../guides/_rgcms_methods_prefixes_clear.adoc | 32 +
.../guides/_rgcms_methods_prefixes_default.adoc | 129 ++
.../guides/_rgcms_methods_prefixes_disable.adoc | 93 ++
.../guides/_rgcms_methods_prefixes_get.adoc | 19 +
.../guides/_rgcms_methods_prefixes_hide.adoc | 82 +
.../guides/_rgcms_methods_prefixes_modify.adoc | 37 +
.../_rgcms_methods_prefixes_removeFrom.adoc | 37 +
.../guides/_rgcms_methods_prefixes_set.adoc | 13 +
.../_rgcms_methods_prefixes_validate.adoc | 113 ++
.../_rgcms_methods_prefixes_validateAddTo.adoc | 45 +
...cms_methods_prefixes_validateRemoveFrom.adoc | 45 +
.../guides/_rgcms_methods_reserved.adoc | 58 +
.../_rgcms_methods_reserved_cssClass.adoc | 46 +
.../guides/_rgcms_methods_reserved_disable.adoc | 102 ++
.../guides/_rgcms_methods_reserved_getId.adoc | 19 +
.../guides/_rgcms_methods_reserved_hide.adoc | 39 +
.../_rgcms_methods_reserved_iconName.adoc | 36 +
.../guides/_rgcms_methods_reserved_title.adoc | 65 +
.../_rgcms_methods_reserved_validate.adoc | 27 +
.../main/asciidoc/guides/_rgcms_schema-aim.adoc | 97 ++
.../asciidoc/guides/_rgcms_schema-common.adoc | 103 ++
.../src/main/asciidoc/guides/_rgcms_schema.adoc | 24 +
.../src/main/asciidoc/guides/_rgsvc-api.adoc | 306 ++++
.../_rgsvc-api_ActionInvocationContext.adoc | 98 ++
.../guides/_rgsvc-api_BackgroundService.adoc | 123 ++
...roundService_BackgroundCommandExecution.adoc | 25 +
.../_rgsvc-api_BackgroundService_Quartz.adoc | 162 ++
.../guides/_rgsvc-api_BookmarkService.adoc | 116 ++
.../_rgsvc-api_BulkInteractionContext.adoc | 9 +
.../guides/_rgsvc-api_ClockService.adoc | 101 ++
.../guides/_rgsvc-api_CommandContext.adoc | 216 +++
.../guides/_rgsvc-api_DeepLinkService.adoc | 56 +
.../_rgsvc-api_DomainObjectContainer.adoc | 40 +
...nObjectContainer_generic-repository-api.adoc | 89 +
...-api_DomainObjectContainer_messages-api.adoc | 50 +
...mainObjectContainer_object-creation-api.adoc | 49 +
...nObjectContainer_object-persistence-api.adoc | 62 +
..._DomainObjectContainer_presentation-api.adoc | 46 +
...pi_DomainObjectContainer_properties-api.adoc | 54 +
...-api_DomainObjectContainer_security-api.adoc | 48 +
...-api_DomainObjectContainer_services-api.adoc | 37 +
...pi_DomainObjectContainer_validation-api.adoc | 26 +
.../guides/_rgsvc-api_EmailService.adoc | 95 ++
.../guides/_rgsvc-api_EventBusService.adoc | 405 +++++
.../_rgsvc-api_FixtureScriptsDefault.adoc | 50 +
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 91 ++
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 276 ++++
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 67 +
.../guides/_rgsvc-api_MementoService.adoc | 131 ++
.../guides/_rgsvc-api_MetamodelService.adoc | 42 +
.../guides/_rgsvc-api_QueryResultsCache.adoc | 126 ++
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 128 ++
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 69 +
.../guides/_rgsvc-api_WrapperFactory.adoc | 162 ++
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 220 +++
.../src/main/asciidoc/guides/_rgsvc-spi.adoc | 299 ++++
.../guides/_rgsvc-spi_AuditingService.adoc | 85 +
.../_rgsvc-spi_BackgroundCommandService.adoc | 131 ++
.../_rgsvc-spi_ClassDiscoveryService.adoc | 82 +
.../guides/_rgsvc-spi_CommandService.adoc | 100 ++
.../_rgsvc-spi_ContentMappingService.adoc | 107 ++
.../_rgsvc-spi_ContentNegotiationService.adoc | 204 +++
.../_rgsvc-spi_EmailNotificationService.adoc | 81 +
.../_rgsvc-spi_ErrorReportingService.adoc | 106 ++
.../guides/_rgsvc-spi_EventSerializer.adoc | 74 +
.../guides/_rgsvc-spi_ExceptionRecognizer.adoc | 119 ++
...spi_FixtureScriptsSpecificationProvider.adoc | 76 +
.../guides/_rgsvc-spi_LocaleProvider.adoc | 70 +
.../guides/_rgsvc-spi_PublishingService.adoc | 192 +++
.../_rgsvc-spi_RepresentationService.adoc | 103 ++
.../guides/_rgsvc-spi_TranslationService.adoc | 80 +
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 67 +
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 59 +
.../guides/_rgsvc-spi_UserProfileService.adoc | 47 +
.../_rgsvc-spi_UserRegistrationService.adoc | 98 ++
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 4 +-
.../_tg_stop-scaffolding-start-coding.adoc | 136 +-
.../main/asciidoc/guides/_ug_core-concepts.adoc | 22 -
.../guides/_ug_core-concepts_add-ons.adoc | 35 -
.../_ug_core-concepts_building-blocks.adoc | 267 ---
...re-concepts_framework-provided-services.adoc | 54 -
..._core-concepts_other-deployment-options.adoc | 81 -
.../guides/_ug_core-concepts_philosophy.adoc | 21 -
.../_ug_core-concepts_philosophy_aop.adoc | 36 -
.../_ug_core-concepts_philosophy_dci.adoc | 9 -
...oncepts_philosophy_domain-driven-design.adoc | 78 -
...cepts_philosophy_hexagonal-architecture.adoc | 29 -
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 -
...ncepts_philosophy_naked-objects-pattern.adoc | 60 -
...bjects-pattern_object-interface-mapping.adoc | 18 -
.../guides/_ug_core-concepts_principles.adoc | 16 -
...core-concepts_principles_apache-isis-vs.adoc | 16 -
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 -
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 -
...ts_principles_apache-isis-vs_metawidget.adoc | 16 -
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 -
...ug_core-concepts_principles_isis-itself.adoc | 47 -
.../_ug_core-concepts_principles_your-apps.adoc | 39 -
.../main/asciidoc/guides/_ug_deployment.adoc | 19 -
.../guides/_ug_deployment_cmd-line.adoc | 113 --
...g_deployment_externalized-configuration.adoc | 245 ---
.../asciidoc/guides/_ug_deployment_gae.adoc | 50 -
.../guides/_ug_deployment_jvm-flags.adoc | 52 -
.../asciidoc/guides/_ug_deployment_neo4j.adoc | 59 -
.../asciidoc/guides/_ug_deployment_tomcat.adoc | 28 -
.../src/main/asciidoc/guides/_ug_extending.adoc | 14 -
.../guides/_ug_extending_programming-model.adoc | 13 -
...ding_programming-model_custom-validator.adoc | 107 --
..._extending_programming-model_finetuning.adoc | 80 -
...rogramming-model_layout-metadata-reader.adoc | 82 -
.../_ug_extending_restfulobjects-viewer.adoc | 51 -
.../guides/_ug_extending_wicket-viewer.adoc | 25 -
...ng_wicket-viewer_custom-bootstrap-theme.adoc | 34 -
...ug_extending_wicket-viewer_custom-pages.adoc | 92 --
...ng_wicket-viewer_isis-addons-extensions.adoc | 17 -
...viewer_login-via-query-args-prototyping.adoc | 49 -
...g_wicket-viewer_replacing-page-elements.adoc | 167 --
.../asciidoc/guides/_ug_getting-started.adoc | 37 -
...ug_getting-started_datanucleus-enhancer.adoc | 107 --
..._ug_getting-started_simpleapp-archetype.adoc | 304 ----
.../asciidoc/guides/_ug_headless-access.adoc | 27 -
...less-access_AbstractIsisSessionTemplate.adoc | 40 -
...dless-access_BackgroundCommandExecution.adoc | 45 -
.../src/main/asciidoc/guides/_ug_how-tos.adoc | 20 -
.../guides/_ug_how-tos_business-rules.adoc | 72 -
.../guides/_ug_how-tos_class-structure.adoc | 38 -
...w-tos_class-structure_action-parameters.adoc | 26 -
.../_ug_how-tos_class-structure_actions.adoc | 19 -
...ow-tos_class-structure_class-definition.adoc | 24 -
..._ug_how-tos_class-structure_collections.adoc | 26 -
...ow-tos_class-structure_ignoring-methods.adoc | 16 -
...how-tos_class-structure_inject-services.adoc | 83 -
...lass-structure_properties-vs-parameters.adoc | 45 -
.../_ug_how-tos_class-structure_properties.adoc | 299 ----
.../guides/_ug_how-tos_contributed-members.adoc | 69 -
.../main/asciidoc/guides/_ug_how-tos_crud.adoc | 29 -
.../guides/_ug_how-tos_derived-members.adoc | 48 -
.../guides/_ug_how-tos_domain-services.adoc | 313 ----
.../_ug_how-tos_drop-downs-and-defaults.adoc | 65 -
.../_ug_how-tos_entity-relationships.adoc | 15 -
...aged-1-to-m-bidirectional-relationships.adoc | 58 -
.../guides/_ug_how-tos_persisted-title.adoc | 56 -
.../asciidoc/guides/_ug_how-tos_ui-hints.adoc | 15 -
...g_how-tos_ui-hints_action-icons-and-css.adoc | 58 -
.../_ug_how-tos_ui-hints_eager-rendering.adoc | 58 -
.../guides/_ug_how-tos_ui-hints_layout.adoc | 9 -
...how-tos_ui-hints_names-and-descriptions.adoc | 47 -
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 --
.../main/asciidoc/guides/_ug_more-advanced.adoc | 26 -
.../guides/_ug_more-advanced_bulk-actions.adoc | 8 -
.../guides/_ug_more-advanced_decoupling.adoc | 28 -
..._more-advanced_decoupling_contributions.adoc | 23 -
..._ug_more-advanced_decoupling_db-schemas.adoc | 141 --
.../_ug_more-advanced_decoupling_event-bus.adoc | 11 -
.../_ug_more-advanced_decoupling_mixins.adoc | 191 ---
...ore-advanced_decoupling_pushing-changes.adoc | 140 --
...-advanced_decoupling_vetoing-visibility.adoc | 15 -
.../asciidoc/guides/_ug_more-advanced_i18n.adoc | 378 -----
.../_ug_more-advanced_mapping-rdbms-views.adoc | 9 -
.../guides/_ug_more-advanced_multi-tenancy.adoc | 8 -
...ore-advanced_overriding-jdo-annotations.adoc | 55 -
..._ug_more-advanced_persistence-lifecycle.adoc | 8 -
.../guides/_ug_more-advanced_tips-n-tricks.adoc | 15 -
...ore-advanced_tips-n-tricks_are-you-sure.adoc | 76 -
...ore-advanced_tips-n-tricks_enhance-only.adoc | 17 -
...-advanced_tips-n-tricks_per-user-themes.adoc | 85 -
...-tricks_render-all-properties-in-tables.adoc | 49 -
...tricks_simulating-collections-of-values.adoc | 23 -
...g_more-advanced_transactions-and-errors.adoc | 33 -
.../guides/_ug_more-advanced_view-models.adoc | 22 -
.../guides/_ug_restfulobjects-viewer.adoc | 25 -
...objects-viewer_configuration-properties.adoc | 72 -
...configuration-properties_honor-ui-hints.adoc | 27 -
...erties_simplified-object-representation.adoc | 68 -
...uration-properties_suppressing-elements.adoc | 39 -
.../_ug_restfulobjects-viewer_features.adoc | 23 -
...ug_restfulobjects-viewer_hints-and-tips.adoc | 85 -
.../src/main/asciidoc/guides/_ug_security.adoc | 53 -
.../_ug_security_api-for-applications.adoc | 63 -
...security_configuring-isis-to-use-bypass.adoc | 23 -
..._security_configuring-isis-to-use-shiro.adoc | 76 -
.../guides/_ug_security_shiro-caching.adoc | 41 -
.../guides/_ug_security_shiro-ini-realm.adoc | 133 --
...shiro-isis-enhanced-wildcard-permission.adoc | 61 -
.../_ug_security_shiro-isis-ldap-realm.adoc | 146 --
..._shiro-isisaddons-security-module-realm.adoc | 36 -
.../guides/_ug_security_shiro-jdbc-realm.adoc | 113 --
.../_ug_security_usage-by-isis-viewers.adoc | 208 ---
.../src/main/asciidoc/guides/_ug_testing.adoc | 17 -
.../main/asciidoc/guides/_ug_testing_aaa.adoc | 166 --
.../guides/_ug_testing_bdd-spec-support.adoc | 22 -
...ug_testing_bdd-spec-support_bdd-tooling.adoc | 14 -
...g_testing_bdd-spec-support_how-it-works.adoc | 20 -
...ug_testing_bdd-spec-support_key-classes.adoc | 59 -
...ng_bdd-spec-support_maven-configuration.adoc | 73 -
...ing_bdd-spec-support_writing-a-bdd-spec.adoc | 141 --
.../guides/_ug_testing_fixture-scripts.adoc | 44 -
...g_testing_fixture-scripts_api-and-usage.adoc | 352 ----
...ug_testing_fixture-scripts_sudo-service.adoc | 59 -
.../guides/_ug_testing_integ-test-support.adoc | 24 -
...esting_integ-test-support_bootstrapping.adoc | 260 ---
..._integ-test-support_maven-configuration.adoc | 46 -
...esting_integ-test-support_typical-usage.adoc | 124 --
...ting_integ-test-support_wrapper-factory.adoc | 162 --
.../guides/_ug_testing_unit-test-support.adoc | 14 -
...esting_unit-test-support_contract-tests.adoc | 171 --
...ting_unit-test-support_jmock-extensions.adoc | 59 -
...g_unit-test-support_maven-configuration.adoc | 46 -
...est-support_soap-fake-server-junit-rule.adoc | 113 --
.../asciidoc/guides/_ug_troubleshooting.adoc | 14 -
.../_ug_troubleshooting_enabling-logging.adoc | 39 -
.../main/asciidoc/guides/_ug_wicket-viewer.adoc | 30 -
..._wicket-viewer_configuration-properties.adoc | 112 --
...guration-properties_abbreviating-titles.adoc | 33 -
...ration-properties_showing-theme-chooser.adoc | 43 -
...uration-properties_stripped-wicket-tags.adoc | 26 -
...n-properties_suppressing-password-reset.adoc | 47 -
...tion-properties_suppressing-remember-me.adoc | 35 -
...guration-properties_suppressing-sign-up.adoc | 49 -
.../guides/_ug_wicket-viewer_customisation.adoc | 18 -
..._wicket-viewer_customisation_about-page.adoc | 121 --
...icket-viewer_customisation_auto-refresh.adoc | 35 -
..._wicket-viewer_customisation_brand-logo.adoc | 71 -
...er_customisation_cheap-n-cheerful-theme.adoc | 29 -
...-viewer_customisation_custom-javascript.adoc | 42 -
...cket-viewer_customisation_default-theme.adoc | 29 -
...ewer_customisation_tweaking-css-classes.adoc | 107 --
..._customisation_using-different-css-file.adoc | 36 -
...icket-viewer_customisation_welcome-page.adoc | 42 -
.../guides/_ug_wicket-viewer_features.adoc | 26 -
...wicket-viewer_features_blob-attachments.adoc | 121 --
...wicket-viewer_features_bookmarked-pages.adoc | 108 --
...cket-viewer_features_hints-and-copy-url.adoc | 79 -
..._ug_wicket-viewer_features_recent-pages.adoc | 53 -
...wicket-viewer_features_titles-in-tables.adoc | 76 -
...icket-viewer_features_user-registration.adoc | 81 -
.../guides/_ug_wicket-viewer_isis-addons.adoc | 33 -
.../guides/_ug_wicket-viewer_layout.adoc | 97 --
.../_ug_wicket-viewer_request-parameters.adoc | 53 -
.../main/asciidoc/guides/_ugbtb_deployment.adoc | 19 +
.../guides/_ugbtb_deployment_cmd-line.adoc | 113 ++
...b_deployment_externalized-configuration.adoc | 245 +++
.../asciidoc/guides/_ugbtb_deployment_gae.adoc | 50 +
.../guides/_ugbtb_deployment_jvm-flags.adoc | 52 +
.../guides/_ugbtb_deployment_neo4j.adoc | 59 +
.../guides/_ugbtb_deployment_tomcat.adoc | 28 +
.../asciidoc/guides/_ugbtb_more-advanced.adoc | 26 +
.../guides/_ugbtb_more-advanced_decoupling.adoc | 28 +
..._more-advanced_decoupling_contributions.adoc | 23 +
...btb_more-advanced_decoupling_db-schemas.adoc | 141 ++
...gbtb_more-advanced_decoupling_event-bus.adoc | 11 +
.../_ugbtb_more-advanced_decoupling_mixins.adoc | 191 +++
...ore-advanced_decoupling_pushing-changes.adoc | 140 ++
...-advanced_decoupling_vetoing-visibility.adoc | 15 +
.../_ugbtb_more-advanced_headless-access.adoc | 27 +
...less-access_AbstractIsisSessionTemplate.adoc | 40 +
...dless-access_BackgroundCommandExecution.adoc | 45 +
.../guides/_ugbtb_more-advanced_i18n.adoc | 378 +++++
...ugbtb_more-advanced_mapping-rdbms-views.adoc | 9 +
.../_ugbtb_more-advanced_multi-tenancy.adoc | 8 +
...ore-advanced_overriding-jdo-annotations.adoc | 64 +
.../_ugbtb_more-advanced_persisted-title.adoc | 82 +
...placing-default-service-implementations.adoc | 64 +
...b_more-advanced_transactions-and-errors.adoc | 33 +
.../_ugbtb_more-advanced_view-models.adoc | 19 +
.../_ugbtb_more-advanced_view-models_jaxb.adoc | 240 +++
...-advanced_view-models_programming-model.adoc | 87 +
...btb_more-advanced_view-models_use-cases.adoc | 142 ++
.../guides/_ugbtb_programming-model.adoc | 14 +
...gbtb_programming-model_custom-validator.adoc | 107 ++
.../_ugbtb_programming-model_finetuning.adoc | 80 +
...rogramming-model_layout-metadata-reader.adoc | 82 +
.../main/asciidoc/guides/_ugbtb_web-xml.adoc | 473 ++++++
.../asciidoc/guides/_ugfun_core-concepts.adoc | 22 +
.../guides/_ugfun_core-concepts_add-ons.adoc | 35 +
.../_ugfun_core-concepts_building-blocks.adoc | 335 ++++
...re-concepts_framework-provided-services.adoc | 54 +
..._core-concepts_other-deployment-options.adoc | 81 +
.../guides/_ugfun_core-concepts_philosophy.adoc | 21 +
.../_ugfun_core-concepts_philosophy_aop.adoc | 36 +
.../_ugfun_core-concepts_philosophy_dci.adoc | 9 +
...oncepts_philosophy_domain-driven-design.adoc | 79 +
...cepts_philosophy_hexagonal-architecture.adoc | 29 +
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 +
...ncepts_philosophy_naked-objects-pattern.adoc | 60 +
...bjects-pattern_object-interface-mapping.adoc | 18 +
.../guides/_ugfun_core-concepts_principles.adoc | 16 +
...core-concepts_principles_apache-isis-vs.adoc | 16 +
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 +
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 +
...ts_principles_apache-isis-vs_metawidget.adoc | 16 +
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 +
...un_core-concepts_principles_isis-itself.adoc | 47 +
...gfun_core-concepts_principles_your-apps.adoc | 39 +
.../src/main/asciidoc/guides/_ugfun_faqs.adoc | 18 +
.../guides/_ugfun_faqs_enabling-logging.adoc | 39 +
.../guides/_ugfun_faqs_enhance-only.adoc | 17 +
..._ugfun_faqs_i18n-label-in-wicket-viewer.adoc | 16 +
.../guides/_ugfun_faqs_per-user-themes.adoc | 85 +
.../_ugfun_faqs_restful-image-property.adoc | 20 +
...faqs_subtype-entity-not-fully-populated.adoc | 67 +
.../asciidoc/guides/_ugfun_getting-started.adoc | 37 +
...un_getting-started_datanucleus-enhancer.adoc | 107 ++
...fun_getting-started_simpleapp-archetype.adoc | 304 ++++
.../main/asciidoc/guides/_ugfun_how-tos.adoc | 22 +
.../guides/_ugfun_how-tos_bulk-actions.adoc | 8 +
.../guides/_ugfun_how-tos_business-rules.adoc | 72 +
.../guides/_ugfun_how-tos_class-structure.adoc | 38 +
...w-tos_class-structure_action-parameters.adoc | 26 +
.../_ugfun_how-tos_class-structure_actions.adoc | 19 +
...ow-tos_class-structure_class-definition.adoc | 24 +
...fun_how-tos_class-structure_collections.adoc | 26 +
...ow-tos_class-structure_ignoring-methods.adoc | 16 +
...how-tos_class-structure_inject-services.adoc | 83 +
...lass-structure_properties-vs-parameters.adoc | 45 +
...gfun_how-tos_class-structure_properties.adoc | 299 ++++
.../_ugfun_how-tos_contributed-members.adoc | 69 +
.../asciidoc/guides/_ugfun_how-tos_crud.adoc | 29 +
.../guides/_ugfun_how-tos_derived-members.adoc | 48 +
.../guides/_ugfun_how-tos_domain-services.adoc | 313 ++++
.../_ugfun_how-tos_drop-downs-and-defaults.adoc | 65 +
.../_ugfun_how-tos_entity-relationships.adoc | 15 +
...aged-1-to-m-bidirectional-relationships.adoc | 59 +
...how-tos_render-all-properties-in-tables.adoc | 49 +
...ow-tos_simulating-collections-of-values.adoc | 23 +
.../guides/_ugfun_how-tos_ui-hints.adoc | 15 +
...n_how-tos_ui-hints_action-icons-and-css.adoc | 58 +
..._ugfun_how-tos_ui-hints_eager-rendering.adoc | 58 +
.../guides/_ugfun_how-tos_ui-hints_layout.adoc | 9 +
...how-tos_ui-hints_names-and-descriptions.adoc | 47 +
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 ++
.../guides/_ugfun_how-tos_ui_are-you-sure.adoc | 76 +
.../asciidoc/guides/_ugfun_object-layout.adoc | 18 +
.../_ugfun_object-layout_application-menu.adoc | 171 ++
.../guides/_ugfun_object-layout_dynamic.adoc | 113 ++
.../_ugfun_object-layout_static-vs-dynamic.adoc | 26 +
.../guides/_ugfun_object-layout_static.adoc | 159 ++
.../guides/_ugsec_api-for-applications.adoc | 63 +
.../_ugsec_configuring-isis-to-use-bypass.adoc | 23 +
.../_ugsec_configuring-isis-to-use-shiro.adoc | 76 +
.../asciidoc/guides/_ugsec_shiro-caching.adoc | 41 +
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 133 ++
...shiro-isis-enhanced-wildcard-permission.adoc | 61 +
.../guides/_ugsec_shiro-isis-ldap-realm.adoc | 146 ++
..._shiro-isisaddons-security-module-realm.adoc | 36 +
.../guides/_ugsec_shiro-jdbc-realm.adoc | 113 ++
.../guides/_ugsec_usage-by-isis-viewers.adoc | 208 +++
.../src/main/asciidoc/guides/_ugtst_aaa.adoc | 166 ++
.../guides/_ugtst_bdd-spec-support.adoc | 22 +
.../_ugtst_bdd-spec-support_bdd-tooling.adoc | 14 +
.../_ugtst_bdd-spec-support_how-it-works.adoc | 20 +
.../_ugtst_bdd-spec-support_key-classes.adoc | 59 +
...st_bdd-spec-support_maven-configuration.adoc | 73 +
...tst_bdd-spec-support_writing-a-bdd-spec.adoc | 141 ++
.../asciidoc/guides/_ugtst_fixture-scripts.adoc | 44 +
.../_ugtst_fixture-scripts_api-and-usage.adoc | 352 ++++
.../_ugtst_fixture-scripts_sudo-service.adoc | 59 +
.../guides/_ugtst_integ-test-support.adoc | 24 +
..._ugtst_integ-test-support_bootstrapping.adoc | 260 +++
..._integ-test-support_maven-configuration.adoc | 46 +
..._ugtst_integ-test-support_typical-usage.adoc | 124 ++
...gtst_integ-test-support_wrapper-factory.adoc | 162 ++
.../guides/_ugtst_unit-test-support.adoc | 14 +
..._ugtst_unit-test-support_contract-tests.adoc | 171 ++
...gtst_unit-test-support_jmock-extensions.adoc | 59 +
...t_unit-test-support_maven-configuration.adoc | 46 +
...est-support_soap-fake-server-junit-rule.adoc | 113 ++
.../asciidoc/guides/_ugvro_architecture.adoc | 57 +
.../guides/_ugvro_configuration-properties.adoc | 54 +
.../asciidoc/guides/_ugvro_hints-and-tips.adoc | 97 ++
.../main/asciidoc/guides/_ugvro_ro-spec.adoc | 201 +++
.../_ugvro_simplified-representations.adoc | 368 +++++
...epresentations_configuration-properties.adoc | 135 ++
.../guides/_ugvw_configuration-properties.adoc | 112 ++
...guration-properties_abbreviating-titles.adoc | 33 +
...ration-properties_showing-theme-chooser.adoc | 43 +
...uration-properties_stripped-wicket-tags.adoc | 26 +
...n-properties_suppressing-password-reset.adoc | 47 +
...tion-properties_suppressing-remember-me.adoc | 35 +
...guration-properties_suppressing-sign-up.adoc | 49 +
.../asciidoc/guides/_ugvw_customisation.adoc | 18 +
.../guides/_ugvw_customisation_about-page.adoc | 121 ++
.../_ugvw_customisation_auto-refresh.adoc | 35 +
.../guides/_ugvw_customisation_brand-logo.adoc | 71 +
...vw_customisation_cheap-n-cheerful-theme.adoc | 29 +
.../_ugvw_customisation_custom-javascript.adoc | 42 +
.../_ugvw_customisation_default-theme.adoc | 29 +
...ugvw_customisation_tweaking-css-classes.adoc | 107 ++
..._customisation_using-different-css-file.adoc | 36 +
.../_ugvw_customisation_welcome-page.adoc | 42 +
.../main/asciidoc/guides/_ugvw_extending.adoc | 25 +
.../_ugvw_extending_custom-bootstrap-theme.adoc | 34 +
.../guides/_ugvw_extending_custom-pages.adoc | 92 ++
.../_ugvw_extending_isis-addons-extensions.adoc | 17 +
...ending_login-via-query-args-prototyping.adoc | 49 +
..._ugvw_extending_replacing-page-elements.adoc | 167 ++
.../main/asciidoc/guides/_ugvw_features.adoc | 26 +
.../guides/_ugvw_features_blob-attachments.adoc | 121 ++
.../guides/_ugvw_features_bookmarked-pages.adoc | 108 ++
.../_ugvw_features_hints-and-copy-url.adoc | 79 +
.../guides/_ugvw_features_recent-pages.adoc | 53 +
.../guides/_ugvw_features_titles-in-tables.adoc | 76 +
.../_ugvw_features_user-registration.adoc | 81 +
.../main/asciidoc/guides/_ugvw_isis-addons.adoc | 33 +
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 97 ++
.../guides/_ugvw_request-parameters.adoc | 53 +
.../src/main/asciidoc/guides/cg.adoc | 30 +-
.../020-annotation-processor.png | Bin 57338 -> 67560 bytes
...10-dcevm-list-of-found-jdk-installations.png | Bin 0 -> 44267 bytes
.../070-advanced/020-dcevm-once-installed.png | Bin 0 -> 44435 bytes
.../030-dcevm-intellij-project-structure.png | Bin 0 -> 62740 bytes
.../040-dcevm-run-configuration.png | Bin 0 -> 47864 bytes
.../guides/images/maven-plugin/xsd-goal.png | Bin 0 -> 46790 bytes
.../guides/images/maven-plugin/xsd-goal.pptx | Bin 0 -> 64740 bytes
.../service-collaborations.png | Bin 10368 -> 28874 bytes
.../service-collaborations.pptx | Bin 52460 -> 51472 bytes
.../ro-spec-resources-and-representations.png | Bin 0 -> 139796 bytes
.../src/main/asciidoc/guides/rg.adoc | 33 +-
.../src/main/asciidoc/guides/rgant.adoc | 96 ++
.../src/main/asciidoc/guides/rgcfg.adoc | 62 +
.../src/main/asciidoc/guides/rgcms.adoc | 46 +
.../src/main/asciidoc/guides/rgsvc.adoc | 40 +
.../asciidoc/guides/simpleapp-archetype.adoc | 6 +-
.../src/main/asciidoc/guides/tg.adoc | 1 +
.../src/main/asciidoc/guides/ug.adoc | 42 +-
.../src/main/asciidoc/guides/ugbtb.adoc | 44 +
.../src/main/asciidoc/guides/ugfun.adoc | 50 +
.../src/main/asciidoc/guides/ugsec.adoc | 85 +
.../src/main/asciidoc/guides/ugtst.adoc | 50 +
.../src/main/asciidoc/guides/ugvro.adoc | 55 +
.../src/main/asciidoc/guides/ugvw.adoc | 55 +
.../src/main/asciidoc/how-isis-works.adoc | 2 +-
.../images/powered-by/commapp/screenshot-1.png | Bin 0 -> 670918 bytes
.../images/powered-by/commapp/screenshot-2.png | Bin 0 -> 56933 bytes
.../asciidoc/images/powered-by/estatio-1.png | Bin 261553 -> 0 bytes
.../images/powered-by/estatio/estatio-1.png | Bin 0 -> 261553 bytes
.../gesconsultor-grc/fig-1-custom-viewer.png | Bin 0 -> 1169636 bytes
.../fig-2-custom-drag-n-drop-interface.png | Bin 0 -> 1495279 bytes
...fig-3-custom-ui-analyzing-risk-scenarios.png | Bin 0 -> 2218476 bytes
.../fig-4-managing-projects.png | Bin 0 -> 995701 bytes
.../documentation/src/main/asciidoc/index.html | 19 +-
.../src/main/asciidoc/isis-in-pictures.adoc | 44 +-
.../src/main/asciidoc/migration-notes.adoc | 3 +
.../src/main/asciidoc/powered-by.adoc | 84 +-
.../src/main/asciidoc/release-notes.adoc | 1537 +-----------------
.../asciidoc/resources/templates/.gitignore | 1 +
.../templates/asciidoc-templates-idea.xml | 365 -----
...-settings-file-templates-for-apache-isis.jar | Bin 0 -> 9104 bytes
.../templates/isis-asciidoc-templates-idea.xml | 328 ++++
.../resources/templates/isis-template-idea.xml | 522 ++++++
.../resources/templates/isis-templates-idea.xml | 804 ---------
.../resources/templates/isis-templates2.xml | 479 ------
adocs/template/document.html.erb | 31 +
core/applib/pom.xml | 2 +-
.../apache/isis/applib/AbstractSubscriber.java | 14 +-
.../org/apache/isis/applib/AppManifest.java | 1 +
.../isis/applib/DomainObjectContainer.java | 11 +
.../applib/annotation/CollectionLayout.java | 14 +
.../isis/applib/annotation/DomainObject.java | 91 ++
.../applib/annotation/DomainObjectLayout.java | 38 +-
.../apache/isis/applib/annotation/Nature.java | 30 +-
.../isis/applib/annotation/NatureOfService.java | 22 +-
.../isis/applib/annotation/Parameter.java | 2 +-
.../apache/isis/applib/annotation/Property.java | 4 +
.../apache/isis/applib/annotation/Title.java | 2 +-
.../isis/applib/annotation/ViewModel.java | 22 +
.../apache/isis/applib/services/dto/Dto.java | 21 +
.../applib/services/dto/Dto_downloadXml.java | 67 +
.../applib/services/dto/Dto_downloadXsd.java | 125 ++
.../apache/isis/applib/services/dto/Util.java | 33 +
.../services/eventbus/AbstractUiEvent.java | 97 ++
.../services/eventbus/ActionDomainEvent.java | 32 +-
.../eventbus/ActionInteractionEvent.java | 8 +
.../eventbus/CollectionDomainEvent.java | 31 +-
.../eventbus/CollectionInteractionEvent.java | 7 +
.../services/eventbus/CssClassUiEvent.java | 102 ++
.../applib/services/eventbus/IconUiEvent.java | 101 ++
.../services/eventbus/ObjectCreatedEvent.java | 30 +
.../services/eventbus/ObjectLoadedEvent.java | 32 +
.../services/eventbus/ObjectPersistedEvent.java | 30 +
.../eventbus/ObjectPersistingEvent.java | 30 +
.../services/eventbus/ObjectRemovingEvent.java | 30 +
.../services/eventbus/ObjectUpdatedEvent.java | 30 +
.../services/eventbus/ObjectUpdatingEvent.java | 30 +
.../services/eventbus/PropertyDomainEvent.java | 30 +-
.../eventbus/PropertyInteractionEvent.java | 5 +
.../applib/services/eventbus/TitleUiEvent.java | 129 ++
.../services/i18n/TranslatableString.java | 1 +
.../isis/applib/services/jaxb/JaxbService.java | 64 +
.../applib/services/swagger/SwaggerService.java | 72 +
.../services/swagger/SwaggerServiceMenu.java | 80 +
.../isis/applib/services/swagger/Util.java | 46 +
.../urlencoding/UrlEncodingService.java | 29 +
.../UrlEncodingServiceUsingBaseEncoding.java | 57 +
core/integtestsupport/pom.xml | 2 +-
.../IntegrationTestAbstract.java | 16 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 24 +-
.../isis/tool/mavenplugin/IsisMojoValidate.java | 15 +-
.../isis/tool/mavenplugin/IsisMojoXsd.java | 155 ++
.../tool/mavenplugin/MetaModelProcessor.java | 2 +-
core/metamodel/pom.xml | 13 +-
.../isis/core/commons/lang/ClassExtensions.java | 7 +-
.../core/commons/lang/StringExtensions.java | 12 +-
.../isis/core/metamodel/facets/Annotations.java | 115 ++
.../facets/ContributeeMemberFacetFactory.java | 3 +-
.../action/ActionAnnotationFacetFactory.java | 10 +-
.../ActionDomainEventFacetAbstract.java | 3 -
.../CollectionAnnotationFacetFactory.java | 15 +-
.../defaultview/DefaultViewFacet.java | 26 +
.../defaultview/DefaultViewFacetAbstract.java | 35 +
...tViewFacetForCollectionLayoutAnnotation.java | 41 +
...ewFacetOnCollectionFromLayoutProperties.java | 46 +
.../layout/CollectionLayoutFacetFactory.java | 11 +
.../callbacks/CreatedCallbackFacetAbstract.java | 35 +
.../callbacks/CreatedCallbackFacetFactory.java | 62 +
.../CreatedCallbackFacetViaMethod.java | 65 +
.../callbacks/CreatedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 +
.../object/callbacks/LifecycleEventFacet.java | 28 +
.../callbacks/LoadCallbackFacetFactory.java | 68 +
.../callbacks/LoadedCallbackFacetAbstract.java | 37 +
.../callbacks/LoadedCallbackFacetViaMethod.java | 65 +
.../callbacks/LoadedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 +
.../callbacks/LoadingCallbackFacetAbstract.java | 41 +
.../LoadingCallbackFacetViaMethod.java | 69 +
.../callbacks/PersistCallbackFacetFactory.java | 78 +
...ersistCallbackViaSaveMethodFacetFactory.java | 78 +
.../PersistedCallbackFacetAbstract.java | 37 +
.../PersistedCallbackFacetViaMethod.java | 65 +
.../callbacks/PersistedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 49 +
.../PersistingCallbackFacetAbstract.java | 37 +
.../PersistingCallbackFacetViaMethod.java | 65 +
.../PersistingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 50 +
.../callbacks/RemoveCallbackFacetFactory.java | 78 +
...moveCallbackViaDeleteMethodFacetFactory.java | 78 +
.../object/callbacks/RemovedCallbackFacet.java | 2 +
.../callbacks/RemovedCallbackFacetAbstract.java | 39 +
.../RemovedCallbackFacetViaMethod.java | 69 +
.../RemovingCallbackFacetAbstract.java | 37 +
.../RemovingCallbackFacetViaMethod.java | 65 +
.../callbacks/RemovingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 +
.../callbacks/UpdateCallbackFacetFactory.java | 68 +
.../callbacks/UpdatedCallbackFacetAbstract.java | 37 +
.../UpdatedCallbackFacetViaMethod.java | 65 +
.../callbacks/UpdatedLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 +
.../UpdatingCallbackFacetAbstract.java | 37 +
.../UpdatingCallbackFacetViaMethod.java | 69 +
.../callbacks/UpdatingLifecycleEventFacet.java | 30 +
...ycleEventFacetForDomainObjectAnnotation.java | 51 +
.../create/CreatedCallbackFacetAbstract.java | 37 -
.../create/CreatedCallbackFacetFactory.java | 62 -
.../create/CreatedCallbackFacetViaMethod.java | 65 -
.../load/LoadCallbackFacetFactory.java | 68 -
.../load/LoadedCallbackFacetAbstract.java | 37 -
.../load/LoadedCallbackFacetViaMethod.java | 65 -
.../load/LoadingCallbackFacetAbstract.java | 41 -
.../load/LoadingCallbackFacetViaMethod.java | 69 -
.../persist/PersistCallbackFacetFactory.java | 80 -
...ersistCallbackViaSaveMethodFacetFactory.java | 80 -
.../persist/PersistedCallbackFacetAbstract.java | 37 -
.../PersistedCallbackFacetViaMethod.java | 65 -
.../PersistingCallbackFacetAbstract.java | 37 -
.../PersistingCallbackFacetViaMethod.java | 65 -
.../remove/RemoveCallbackFacetFactory.java | 80 -
...moveCallbackViaDeleteMethodFacetFactory.java | 80 -
.../remove/RemovedCallbackFacetAbstract.java | 37 -
.../remove/RemovedCallbackFacetViaMethod.java | 65 -
.../remove/RemovingCallbackFacetAbstract.java | 37 -
.../remove/RemovingCallbackFacetViaMethod.java | 65 -
.../update/UpdateCallbackFacetFactory.java | 68 -
.../update/UpdatedCallbackFacetAbstract.java | 37 -
.../update/UpdatedCallbackFacetViaMethod.java | 65 -
.../update/UpdatingCallbackFacetAbstract.java | 37 -
.../update/UpdatingCallbackFacetViaMethod.java | 69 -
.../DomainObjectAnnotationFacetFactory.java | 156 ++
...bleObjectFacetForDomainObjectAnnotation.java | 7 +-
...ectLayoutAnnotationUsingCssClassUiEvent.java | 106 ++
.../DomainObjectLayoutFacetFactory.java | 31 +-
...nObjectLayoutAnnotationUsingIconUiEvent.java | 103 ++
...ObjectLayoutAnnotationUsingTitleUiEvent.java | 119 ++
.../RemoveSubscriberMethodsFacetFactory.java | 70 +
.../facets/object/parseable/ParseableFacet.java | 2 +-
.../RecreatableObjectFacetAbstract.java | 48 +-
...creatableObjectFacetDeclarativeAbstract.java | 166 --
...ectFacetDeclarativeInitializingAbstract.java | 165 ++
.../RecreatableObjectFacetFactory.java | 18 +-
...acetForRecreatableDomainObjectInterface.java | 6 +-
...jectFacetForRecreatableObjectAnnotation.java | 5 +-
...bjectFacetForRecreatableObjectInterface.java | 6 +-
...atableObjectFacetForViewModelAnnotation.java | 41 +
...eObjectFacetForXmlRootElementAnnotation.java | 65 +
.../annotation/RegExFacetOnTypeAnnotation.java | 4 +-
.../RegExFacetOnTypeAnnotationFactory.java | 3 +-
.../annotation/TitleAnnotationFacetFactory.java | 32 +-
.../TitleFacetViaTitleAnnotation.java | 29 +-
.../facets/object/viewmodel/ViewModelFacet.java | 49 +
.../objectvalue/multiline/MultiLineFacet.java | 4 +-
.../facets/objectvalue/regex/RegExFacet.java | 1 +
.../objectvalue/regex/RegExFacetAbstract.java | 12 +-
.../regex/RegExFacetForParameterAnnotation.java | 7 +-
...egExFacetFromRegExAnnotationOnParameter.java | 7 +-
.../PropertyAnnotationFacetFactory.java | 14 +-
.../regex/RegExFacetForPropertyAnnotation.java | 8 +-
.../RegExFacetForRegExAnnotationOnProperty.java | 7 +-
.../CollectionLayoutFacetRepr.java | 1 +
.../layoutmetadata/DefaultViewFacetRepr.java | 24 +
.../json/LayoutMetadataReaderFromJson.java | 18 +-
.../metamodel/progmodel/ProgrammingModel.java | 6 +-
.../container/DomainObjectContainerDefault.java | 11 +
.../Persistable_downloadJdoMetadata.java | 80 +
.../metamodel/services/jdosupport/Util.java | 33 +
.../services/swagger/SwaggerServiceDefault.java | 81 +
.../services/swagger/internal/Caching.java | 48 +
.../swagger/internal/ClassExcluder.java | 52 +
.../services/swagger/internal/Generation.java | 832 ++++++++++
.../swagger/internal/SwaggerSpecGenerator.java | 64 +
.../services/swagger/internal/Tagger.java | 61 +
.../services/swagger/internal/Util.java | 166 ++
.../swagger/internal/ValuePropertyFactory.java | 176 ++
.../specloader/specimpl/ContributeeMember.java | 2 +-
.../specimpl/ObjectActionMixedIn.java | 3 +-
.../specimpl/ObjectMemberAbstract.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 8 +-
.../isis/core/metamodel/util/EventUtil.java | 45 +
.../dflt/ProgrammingModelFacetsJava5.java | 26 +-
.../CreatedCallbackFacetFactoryTest.java | 4 +-
.../DeleteCallbackFacetFactoryTest.java | 6 +-
.../callback/LoadCallbackFacetFactoryTest.java | 6 +-
.../PersistAndSaveCallbackFacetFactoryTest.java | 8 +-
.../PersistCallbackFacetFactoryTest.java | 6 +-
...RemoveAndDeleteCallbackFacetFactoryTest.java | 8 +-
.../RemoveCallbackFacetFactoryTest.java | 6 +-
.../callback/SaveCallbackFacetFactoryTest.java | 6 +-
.../UpdateCallbackFacetFactoryTest.java | 6 +-
.../TitleAnnotationFacetFactoryTest.java | 13 +-
.../TitleFacetViaTitleAnnotationTest.java | 27 +-
.../regex/RegExFacetAnnotationTest.java | 14 +-
.../swagger/internal/GenerationTest.java | 48 +
.../services/swagger/internal/TaggerTest.java | 69 +
core/pom.xml | 147 +-
core/runtime/pom.xml | 7 +-
.../eventbus/EventBusServiceDefault.java | 5 +-
.../i18n/po/TranslationServicePoMenu.java | 37 +-
.../services/memento/MementoServiceDefault.java | 38 +-
.../system/persistence/PersistenceSession.java | 142 +-
.../persistence/spi/JdoObjectIdSerializer.java | 2 +-
.../jdo/service/RegisterEntities.java | 10 +
core/schema/pom.xml | 4 +-
.../jaxb/CatalogingSchemaOutputResolver.java | 85 +
.../services/jaxb/JaxbServiceDefault.java | 142 ++
.../services/jaxb/StreamResultWithWriter.java | 45 +
.../utils/ActionInvocationMementoDtoUtils.java | 12 +-
...odaLocalTimeXMLGregorianCalendarAdapter.java | 4 -
.../jaxbadapters/PersistentEntityAdapter.java | 67 +
core/security-shiro/pom.xml | 6 +-
...atorOrAuthorizorTest_isVisibleInAnyRole.java | 3 -
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
.../ActionResultRepresentation.java | 3 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
.../rendering/RendererContext.java | 18 +-
.../rendering/RendererContext2.java | 2 +-
.../rendering/RendererContext4.java | 3 +-
.../rendering/RendererContext5.java | 4 +-
.../rendering/RendererContext6.java | 33 +
.../rendering/ReprRendererAbstract.java | 6 +-
.../restfulobjects/rendering/Responses.java | 57 +-
.../AbstractObjectMemberReprRenderer.java | 5 +-
.../domainobjects/ActionResultReprRenderer.java | 107 +-
.../domainobjects/DomainObjectReprRenderer.java | 39 +-
.../domainobjects/ListReprRenderer.java | 8 +-
.../domainobjects/ObjectActionReprRenderer.java | 9 +-
.../ObjectAndActionInvocation.java | 43 +-
.../domainobjects/ObjectAndCollection2.java | 39 +
.../domainobjects/ObjectAndProperty2.java | 36 +
.../ObjectCollectionReprRenderer.java | 29 +-
.../ObjectPropertyReprRenderer.java | 20 +-
.../domainobjects/ScalarValueReprRenderer.java | 5 +-
.../AbstractTypeFeatureReprRenderer.java | 4 +-
.../domaintypes/DomainTypeReprRenderer.java | 6 +-
.../service/RepresentationService.java | 51 +-
.../RepresentationServiceContentNegotiator.java | 214 +++
.../RepresentationServiceForRestfulObjects.java | 252 +--
.../conneg/ContentNegotiationService.java | 2 -
.../ContentNegotiationServiceAbstract.java | 33 +
...NegotiationServiceForRestfulObjectsV1_0.java | 266 +++
...ontentNegotiationServiceOrgApacheIsisV1.java | 404 +++++
.../rendering/LinkFollowSpecsTest_follow.java | 14 +
core/viewer-restfulobjects-server/pom.xml | 13 +-
.../restfulobjects/server/ResourceContext.java | 53 +-
.../server/RestfulObjectsApplication.java | 6 +
...estfulObjectsApplicationExceptionMapper.java | 12 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 67 +
.../restfulobjects/server/conneg/Util.java | 33 +
.../DomainObjectResourceServerside.java | 74 +-
.../server/resources/DomainResourceHelper.java | 63 +-
.../DomainServiceResourceServerside.java | 41 +-
.../resources/DomainTypeResourceServerside.java | 19 +-
.../resources/HomePageResourceServerside.java | 3 +-
.../server/resources/ResourceAbstract.java | 21 +-
.../server/resources/SwaggerSpecResource.java | 125 ++
.../resources/UserResourceServerside.java | 5 +-
.../resources/VersionResourceServerside.java | 3 +-
...ontextTest_ensureCompatibleAcceptHeader.java | 2 +-
.../server/ResourceContextTest_getArg.java | 4 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
.../wicket/WebRequestCycleForIsis.java | 2 -
core/viewer-wicket-model/pom.xml | 2 +-
.../model/mementos/PageParameterNames.java | 2 +-
.../viewer/wicket/model/models/ActionModel.java | 2 -
.../model/models/EntityCollectionModel.java | 17 +-
core/viewer-wicket-ui/pom.xml | 2 +-
.../ActionResultResponseHandlingStrategy.java | 13 +-
.../entityactions/AdditionalLinksPanel.java | 26 +-
.../entityactions/EntityActionLinkFactory.java | 4 +-
.../entityactions/EntityActionUtil.java | 2 +-
.../actionmenu/serviceactions/CssMenuItem.java | 4 +-
.../ServiceActionLinkFactory.java | 5 +-
.../ui/components/actions/ActionPanel.java | 72 +-
.../actions/ActionParametersFormPanel.java | 22 +-
.../collection/bulk/BulkActionsLinkFactory.java | 5 +-
.../selector/CollectionSelectorHelper.java | 75 +-
.../components/scalars/ScalarPanelAbstract.java | 4 +-
.../ScalarPanelTextFieldParseableAbstract.java | 2 +-
.../StandaloneCollectionPanel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 99 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 29 +-
.../widgets/linkandlabel/ActionLinkFactory.java | 5 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 3 +
.../widgets/themepicker/ThemeChooser.java | 36 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 18 +-
.../accmngt/AccountManagementPageAbstract.java | 9 +-
.../wicket/ui/pages/entity/EntityPage.java | 21 -
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 5 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 40 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 6 +-
example/application/simpleapp/app/pom.xml | 2 +-
...ppAppManifestWithFixturesBypassSecurity.java | 35 +
example/application/simpleapp/dom/pom.xml | 2 +-
.../java/domainapp/dom/simple/SimpleObject.java | 10 +-
.../dom/simple/SimpleObject.layout.json | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 132 +-
example/application/simpleapp/pom.xml | 6 +-
example/application/simpleapp/webapp/pom.xml | 3 +-
.../src/main/webapp/WEB-INF/isis.properties | 20 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 17 +-
.../webapp/src/main/webapp/about/index.html | 18 +-
.../src/main/webapp/swagger-ui/index.html | 122 ++
example/archetype/simpleapp/pom.xml | 6 +-
.../dom/simple/SimpleObject.layout.json | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../projects/basic/archetype.properties | 2 +-
1298 files changed, 47378 insertions(+), 36042 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/803fbc14/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/803fbc14/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/803fbc14/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/803fbc14/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/803fbc14/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
[08/21] isis git commit: ISIS-1223 Use Wicket 7.0.0 until 7.1.0+ is
released (due to WICKET-6021)
Posted by da...@apache.org.
ISIS-1223 Use Wicket 7.0.0 until 7.1.0+ is released (due to WICKET-6021)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a6fe41c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a6fe41c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a6fe41c3
Branch: refs/heads/master
Commit: a6fe41c3ab4f22052af1f826a1f48b885e2cb874
Parents: fe4e2b8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 22:01:21 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 22:01:21 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a6fe41c3/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8b0fba2..0f61ee0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,7 +122,7 @@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>7.1.0</wicket.version>
+ <wicket.version>7.0.0</wicket.version>
<wicketstuff.version>7.1.0</wicketstuff.version>
<wicket-webjars.version>0.5.3</wicket-webjars.version>
[15/21] isis git commit: Merge branch 'master' into
ISIS-1223-upgrade-to-wicket-7
Posted by da...@apache.org.
Merge branch 'master' into ISIS-1223-upgrade-to-wicket-7
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f4697c61
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f4697c61
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f4697c61
Branch: refs/heads/master
Commit: f4697c617e82a8516e921ace9d6852d013c52c07
Parents: 82a3924 643a93f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Mar 25 15:10:11 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Mar 25 15:10:11 2016 +0100
----------------------------------------------------------------------
STATUS | 6 +
adocs/documentation/README.adoc | 2 +-
adocs/documentation/monitor.sh | 2 +-
adocs/documentation/pom.xml | 390 ++++++----
.../_migration-notes_1.10.0-to-1.11.0.adoc | 48 +-
.../_migration-notes_1.11.0-to-1.12.0.adoc | 20 +
.../_migration-notes_1.9.0-to-1.10.0.adoc | 2 +-
.../main/asciidoc/_release-notes_1.11.0.adoc | 84 ++
.../main/asciidoc/_release-notes_1.11.1.adoc | 20 +
.../main/asciidoc/_release-notes_1.12.0.adoc | 112 +++
.../applib/layout/component/component.xsd | 136 ++++
.../layout/grid/bootstrap3/bootstrap3.xsd | 143 ++++
.../src/main/asciidoc/doap_isis.rdf | 36 +-
.../src/main/asciidoc/documentation.adoc | 95 ++-
.../src/main/asciidoc/downloads.adoc | 12 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 729 -----------------
.../src/main/asciidoc/guides/_cg_asciidoc.adoc | 205 -----
.../main/asciidoc/guides/_cg_building-isis.adoc | 222 ------
.../src/main/asciidoc/guides/_cg_cmd-line.adoc | 9 -
.../guides/_cg_committers-applying-patches.adoc | 90 ---
.../main/asciidoc/guides/_cg_committers.adoc | 28 -
.../_cg_committers_cutting-a-release.adoc | 670 ----------------
.../guides/_cg_committers_key-generation.adoc | 571 --------------
.../_cg_committers_merging-a-pull-request.adoc | 123 ---
.../guides/_cg_committers_pmc-notes.adoc | 71 --
.../_cg_committers_post-release-successful.adoc | 417 ----------
...cg_committers_post-release-unsuccessful.adoc | 94 ---
...ommitters_release-process-for-snapshots.adoc | 88 ---
.../_cg_committers_release-process-prereqs.adoc | 78 --
.../_cg_committers_verifying-releases.adoc | 304 --------
.../main/asciidoc/guides/_cg_contributing.adoc | 255 ------
.../main/asciidoc/guides/_cg_git-cookbook.adoc | 258 ------
.../main/asciidoc/guides/_cg_ide-templates.adoc | 95 ---
.../src/main/asciidoc/guides/_cg_ide.adoc | 19 -
.../main/asciidoc/guides/_cg_ide_agilej.adoc | 55 --
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 160 ----
.../main/asciidoc/guides/_cg_ide_intellij.adoc | 492 ------------
.../asciidoc/guides/_cg_ide_project-lombok.adoc | 50 --
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 79 --
.../guides/_cg_isis-maven-plugin_swagger.adoc | 107 ---
.../guides/_cg_isis-maven-plugin_validate.adoc | 241 ------
.../guides/_cg_isis-maven-plugin_xsd.adoc | 329 --------
.../src/main/asciidoc/guides/_cg_policies.adoc | 14 -
.../guides/_cg_policies_git-policy.adoc | 98 ---
.../guides/_cg_policies_versioning-policy.adoc | 35 -
.../guides/_cgcom-applying-patches.adoc | 90 +++
.../guides/_cgcom_cutting-a-release.adoc | 680 ++++++++++++++++
.../asciidoc/guides/_cgcom_key-generation.adoc | 571 ++++++++++++++
.../guides/_cgcom_merging-a-pull-request.adoc | 123 +++
.../main/asciidoc/guides/_cgcom_pmc-notes.adoc | 71 ++
.../main/asciidoc/guides/_cgcom_policies.adoc | 14 +
.../guides/_cgcom_policies_git-policy.adoc | 98 +++
.../_cgcom_policies_versioning-policy.adoc | 35 +
.../guides/_cgcom_post-release-successful.adoc | 438 +++++++++++
.../_cgcom_post-release-unsuccessful.adoc | 94 +++
.../_cgcom_release-process-for-snapshots.adoc | 88 +++
.../guides/_cgcom_release-process-prereqs.adoc | 88 +++
.../guides/_cgcom_verifying-releases.adoc | 304 ++++++++
.../src/main/asciidoc/guides/_dg_agilej.adoc | 55 ++
.../asciidoc/guides/_dg_asciidoc-templates.adoc | 741 ++++++++++++++++++
.../src/main/asciidoc/guides/_dg_asciidoc.adoc | 205 +++++
.../main/asciidoc/guides/_dg_building-isis.adoc | 294 +++++++
.../src/main/asciidoc/guides/_dg_cmd-line.adoc | 9 +
.../main/asciidoc/guides/_dg_contributing.adoc | 255 ++++++
.../main/asciidoc/guides/_dg_git-cookbook.adoc | 258 ++++++
.../main/asciidoc/guides/_dg_ide-templates.adoc | 95 +++
.../src/main/asciidoc/guides/_dg_ide.adoc | 17 +
.../main/asciidoc/guides/_dg_ide_eclipse.adoc | 160 ++++
.../main/asciidoc/guides/_dg_ide_intellij.adoc | 492 ++++++++++++
.../asciidoc/guides/_dg_project-lombok.adoc | 50 ++
.../guides/_rgant-Action_domainEvent.adoc | 2 +-
.../guides/_rgant-Collection_domainEvent.adoc | 2 +-
.../asciidoc/guides/_rgant-DomainObject.adoc | 28 +-
.../guides/_rgant-DomainObjectLayout.adoc | 6 +-
...gant-DomainObjectLayout_cssClassUiEvent.adoc | 2 +-
.../_rgant-DomainObjectLayout_iconUiEvent.adoc | 2 +-
.../_rgant-DomainObjectLayout_titleUiEvent.adoc | 2 +-
...gant-DomainObject_createdLifecycleEvent.adoc | 2 +-
...rgant-DomainObject_loadedLifecycleEvent.adoc | 2 +-
...nt-DomainObject_persistedLifecycleEvent.adoc | 2 +-
...t-DomainObject_persistingLifecycleEvent.adoc | 2 +-
...ant-DomainObject_removingLifecycleEvent.adoc | 2 +-
...gant-DomainObject_updatedLifecycleEvent.adoc | 2 +-
...ant-DomainObject_updatingLifecycleEvent.adoc | 2 +-
.../asciidoc/guides/_rgant-DomainService.adoc | 2 +-
.../guides/_rgant-Parameter_regexPattern.adoc | 4 +-
.../guides/_rgant-Property_domainEvent.adoc | 2 +-
.../guides/_rgant-Property_regexPattern.adoc | 6 +-
.../src/main/asciidoc/guides/_rgant-Title.adoc | 2 +-
.../guides/_rgant-XmlJavaTypeAdapter.adoc | 4 +-
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 4 +-
.../guides/_rgcfg_configuring-core.adoc | 32 +-
.../main/asciidoc/guides/_rgcms_classes.adoc | 4 +-
.../_rgcms_classes_i18n_TranslatableString.adoc | 1 +
.../asciidoc/guides/_rgcms_classes_layout.adoc | 94 +++
.../asciidoc/guides/_rgcms_classes_mixins.adoc | 16 +
.../guides/_rgcms_classes_mixins_Dto.adoc | 62 ++
.../guides/_rgcms_classes_mixins_Object.adoc | 74 ++
.../_rgcms_classes_mixins_Persistable.adoc | 56 ++
.../asciidoc/guides/_rgcms_classes_roles.adoc | 2 -
.../guides/_rgcms_classes_roles_Dto.adoc | 61 --
.../_rgcms_classes_roles_Persistable.adoc | 34 -
..._rgcms_classes_super_AbstractSubscriber.adoc | 2 +-
.../asciidoc/guides/_rgcms_classes_uievent.adoc | 2 +-
.../_rgcms_classes_uievent_CssClassUiEvent.adoc | 2 +-
.../_rgcms_classes_uievent_IconUiEvent.adoc | 2 +-
.../_rgcms_classes_uievent_TitleUiEvent.adoc | 2 +-
.../src/main/asciidoc/guides/_rgmvn_intro.adoc | 93 +++
.../main/asciidoc/guides/_rgmvn_swagger.adoc | 107 +++
.../main/asciidoc/guides/_rgmvn_validate.adoc | 241 ++++++
.../src/main/asciidoc/guides/_rgmvn_xsd.adoc | 333 ++++++++
.../src/main/asciidoc/guides/_rgsvc_api.adoc | 340 --------
.../guides/_rgsvc_api_AcceptHeaderService.adoc | 7 +-
.../_rgsvc_api_ActionInvocationContext.adoc | 11 +-
..._rgsvc_api_ApplicationFeatureRepository.adoc | 59 ++
.../guides/_rgsvc_api_BackgroundService.adoc | 2 +-
.../guides/_rgsvc_api_BookmarkService.adoc | 2 +-
.../guides/_rgsvc_api_CommandContext.adoc | 2 +-
.../guides/_rgsvc_api_ConfigurationService.adoc | 88 +++
.../guides/_rgsvc_api_DeepLinkService.adoc | 2 +-
.../_rgsvc_api_DomainObjectContainer.adoc | 35 +-
...nObjectContainer_generic-repository-api.adoc | 5 -
..._api_DomainObjectContainer_messages-api.adoc | 9 +-
...mainObjectContainer_object-creation-api.adoc | 6 +-
...nObjectContainer_object-persistence-api.adoc | 10 +-
..._DomainObjectContainer_presentation-api.adoc | 3 +-
...pi_DomainObjectContainer_properties-api.adoc | 4 -
..._api_DomainObjectContainer_security-api.adoc | 1 -
..._api_DomainObjectContainer_services-api.adoc | 7 +-
...pi_DomainObjectContainer_validation-api.adoc | 15 +-
.../guides/_rgsvc_api_EmailService.adoc | 2 +-
.../guides/_rgsvc_api_EventBusService.adoc | 4 +-
.../guides/_rgsvc_api_FactoryService.adoc | 79 ++
.../guides/_rgsvc_api_GuiceBeanProvider.adoc | 2 +-
.../guides/_rgsvc_api_IsisJdoSupport.adoc | 2 +-
.../asciidoc/guides/_rgsvc_api_JaxbService.adoc | 8 +-
.../guides/_rgsvc_api_LayoutService.adoc | 107 +++
.../guides/_rgsvc_api_MementoService.adoc | 2 +-
.../guides/_rgsvc_api_MessageService.adoc | 78 ++
.../guides/_rgsvc_api_MetamodelService.adoc | 25 +-
.../guides/_rgsvc_api_QueryResultsCache.adoc | 2 +-
.../guides/_rgsvc_api_RepositoryService.adoc | 189 +++++
.../asciidoc/guides/_rgsvc_api_Scratchpad.adoc | 2 +-
.../guides/_rgsvc_api_ServiceRegistry.adoc | 72 ++
.../_rgsvc_api_SessionManagementService.adoc | 56 ++
.../asciidoc/guides/_rgsvc_api_SudoService.adoc | 2 +-
.../guides/_rgsvc_api_SwaggerService.adoc | 8 +-
.../guides/_rgsvc_api_TitleService.adoc | 74 ++
.../guides/_rgsvc_api_TransactionService.adoc | 65 ++
.../asciidoc/guides/_rgsvc_api_UserService.adoc | 83 ++
.../guides/_rgsvc_api_WrapperFactory.adoc | 2 +-
.../guides/_rgsvc_api_XmlSnapshotService.adoc | 7 +-
.../guides/_rgsvc_application-layer-api.adoc | 144 ++++
.../guides/_rgsvc_application-layer-spi.adoc | 77 ++
.../guides/_rgsvc_bootstrapping-spi.adoc | 40 +
.../asciidoc/guides/_rgsvc_core-domain-api.adoc | 155 ++++
.../asciidoc/guides/_rgsvc_integration-api.adoc | 112 +++
.../src/main/asciidoc/guides/_rgsvc_intro.adoc | 139 ++++
.../asciidoc/guides/_rgsvc_metadata-api.adoc | 89 +++
.../guides/_rgsvc_persistence-layer-api.adoc | 74 ++
.../guides/_rgsvc_persistence-layer-spi.adoc | 102 +++
.../_rgsvc_presentation-layer-internal-spi.adoc | 66 ++
.../guides/_rgsvc_presentation-layer-spi.adoc | 203 +++++
.../src/main/asciidoc/guides/_rgsvc_spi.adoc | 313 --------
.../_rgsvc_spi_ClassDiscoveryService.adoc | 2 +-
.../_rgsvc_spi_ContentMappingService.adoc | 107 ++-
.../_rgsvc_spi_ContentNegotiationService.adoc | 2 +-
.../_rgsvc_spi_EmailNotificationService.adoc | 2 +-
...spi_FixtureScriptsSpecificationProvider.adoc | 2 +-
.../guides/_rgsvc_spi_GridLoaderService.adoc | 53 ++
.../asciidoc/guides/_rgsvc_spi_GridService.adoc | 72 ++
.../guides/_rgsvc_spi_GridSystemService.adoc | 75 ++
.../asciidoc/guides/_rgsvc_spi_HintStore.adoc | 63 ++
.../guides/_rgsvc_spi_LocaleProvider.adoc | 4 +-
.../_rgsvc_spi_RepresentationService.adoc | 2 +-
.../guides/_rgsvc_spi_RoutingService.adoc | 12 +-
.../guides/_rgsvc_spi_TranslationService.adoc | 9 +-
.../guides/_rgsvc_spi_TranslationsResolver.adoc | 2 +-
.../guides/_rgsvc_spi_UrlEncodingService.adoc | 6 +-
.../main/asciidoc/guides/_rgsvc_testing.adoc | 89 +++
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 4 +-
.../_tg_stop-scaffolding-start-coding.adoc | 4 +-
.../src/main/asciidoc/guides/_ugbtb_i18n.adoc | 6 +-
...r-techniques_overriding-jdo-annotations.adoc | 4 +-
...placing-default-service-implementations.adoc | 2 +-
...gbtb_programming-model_custom-validator.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 10 +
.../guides/_ugbtb_view-models_jaxb.adoc | 472 +++++++----
.../_ugbtb_view-models_programming-model.adoc | 2 +-
.../guides/_ugbtb_view-models_use-cases.adoc | 72 +-
.../main/asciidoc/guides/_ugbtb_web-xml.adoc | 6 +-
.../_ugfun_core-concepts_building-blocks.adoc | 2 +-
...re-concepts_framework-provided-services.adoc | 2 +-
.../src/main/asciidoc/guides/_ugfun_faqs.adoc | 3 +
...un_faqs_how-run-fixtures-on-app-startup.adoc | 20 +
...aqs_how-to-handle-void-and-null-results.adoc | 80 ++
...un_faqs_how-to-implement-a-spellchecker.adoc | 30 +
..._ugfun_faqs_i18n-label-in-wicket-viewer.adoc | 18 +-
.../guides/_ugfun_faqs_per-user-themes.adoc | 2 +-
.../_ugfun_faqs_restful-image-property.adoc | 7 +-
...faqs_subtype-entity-not-fully-populated.adoc | 7 +-
.../asciidoc/guides/_ugfun_getting-started.adoc | 2 +-
...un_getting-started_datanucleus-enhancer.adoc | 2 +-
...fun_getting-started_simpleapp-archetype.adoc | 58 +-
.../guides/_ugfun_how-tos_domain-services.adoc | 7 +-
.../asciidoc/guides/_ugfun_object-layout.adoc | 1 +
.../guides/_ugfun_object-layout_dynamic.adoc | 42 +-
.../_ugfun_object-layout_dynamic_xml.adoc | 401 ++++++++++
.../guides/_ugfun_object-layout_static.adoc | 49 +-
.../_ugsec_configuring-isis-to-use-bypass.adoc | 2 +-
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 2 +-
.../guides/_ugsec_shiro-isis-ldap-realm.adoc | 2 +-
..._shiro-isisaddons-security-module-realm.adoc | 4 +-
.../guides/_ugsec_usage-by-isis-viewers.adoc | 4 +-
..._ugtst_unit-test-support_contract-tests.adoc | 2 +-
.../asciidoc/guides/_ugvro_architecture.adoc | 3 +-
.../guides/_ugvro_configuration-properties.adoc | 5 +-
.../_ugvro_simplified-representations.adoc | 2 +-
...epresentations_configuration-properties.adoc | 2 +-
.../guides/_ugvw_configuration-properties.adoc | 17 +-
...ugvw_customisation_tweaking-css-classes.adoc | 151 +++-
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 85 +-
.../src/main/asciidoc/guides/cg.adoc | 63 --
.../src/main/asciidoc/guides/cgcom.adoc | 63 ++
.../src/main/asciidoc/guides/dg.adoc | 66 ++
.../images/reference-services/categories.png | Bin 0 -> 31453 bytes
.../images/reference-services/categories.pptx | Bin 0 -> 63438 bytes
.../ToDoAppDashboard.png | Bin 0 -> 124848 bytes
.../ToDoItem.png | Bin 0 -> 91690 bytes
.../src/main/asciidoc/guides/rg.adoc | 27 -
.../src/main/asciidoc/guides/rgant.adoc | 13 +-
.../src/main/asciidoc/guides/rgcfg.adoc | 9 +-
.../src/main/asciidoc/guides/rgcms.adoc | 11 +-
.../src/main/asciidoc/guides/rgmvn.adoc | 51 ++
.../src/main/asciidoc/guides/rgsvc.adoc | 35 +-
.../asciidoc/guides/simpleapp-archetype.adoc | 207 -----
.../src/main/asciidoc/guides/ug.adoc | 27 -
.../src/main/asciidoc/guides/ugbtb.adoc | 9 +-
.../src/main/asciidoc/guides/ugfun.adoc | 9 +-
.../src/main/asciidoc/guides/ugsec.adoc | 9 +-
.../src/main/asciidoc/guides/ugtst.adoc | 9 +-
.../src/main/asciidoc/guides/ugvro.adoc | 9 +-
.../src/main/asciidoc/guides/ugvw.adoc | 5 +-
adocs/documentation/src/main/asciidoc/help.adoc | 2 +-
.../src/main/asciidoc/images/PDF-50.png | Bin 0 -> 587 bytes
.../images/isis-in-pictures/010-login.png | Bin 53308 -> 52503 bytes
.../isis-in-pictures/020-install-fixtures.png | Bin 84507 -> 98880 bytes
.../030-dashboard-view-model.png | Bin 118239 -> 124043 bytes
.../isis-in-pictures/040-domain-entity.png | Bin 100818 -> 87866 bytes
.../isis-in-pictures/050-edit-property.png | Bin 97649 -> 96607 bytes
.../isis-in-pictures/060-invoke-action.png | Bin 118082 -> 104578 bytes
.../isis-in-pictures/065-contributions.png | Bin 116303 -> 88063 bytes
.../main/asciidoc/images/todoapp/dashboard.png | Bin 0 -> 137248 bytes
.../main/asciidoc/images/todoapp/todoitem.png | Bin 0 -> 98559 bytes
.../documentation/src/main/asciidoc/index.html | 90 ++-
.../src/main/asciidoc/isis-in-pictures.adoc | 15 +-
.../src/main/asciidoc/migration-notes.adoc | 1 +
.../documentation/src/main/asciidoc/quotes.adoc | 191 +++++
.../src/main/asciidoc/release-notes.adoc | 31 +-
...-settings-file-templates-for-apache-isis.jar | Bin 9104 -> 9105 bytes
.../templates/isis-asciidoc-templates-idea.xml | 16 +-
.../resources/templates/isis-template-idea.xml | 522 -------------
.../resources/templates/isis-templates-idea.xml | 522 +++++++++++++
.../src/main/asciidoc/screencasts.adoc | 26 +-
adocs/template/document.html.erb | 2 +-
core/applib/pom.xml | 6 +-
.../isis/applib/DomainObjectContainer.java | 331 +++-----
.../java/org/apache/isis/applib/ViewModel.java | 4 +-
.../isis/applib/annotation/ActionLayout.java | 8 +
.../isis/applib/annotation/BookmarkPolicy.java | 5 +
.../applib/annotation/CollectionLayout.java | 7 +-
.../isis/applib/annotation/Contributed.java | 5 +
.../applib/annotation/DomainObjectLayout.java | 2 +-
.../isis/applib/annotation/LabelPosition.java | 5 +
.../isis/applib/annotation/RenderType.java | 9 +
.../apache/isis/applib/annotation/Where.java | 5 +
.../isis/applib/annotation/package-info.java | 31 -
.../applib/conmap/ContentMappingService.java | 35 +
.../applib/fixturescripts/FixtureScript.java | 12 +
.../org/apache/isis/applib/layout/Util.java | 49 ++
.../layout/component/ActionLayoutData.java | 253 ++++++
.../layout/component/ActionLayoutDataOwner.java | 26 +
.../layout/component/CollectionLayoutData.java | 269 +++++++
.../component/CollectionLayoutDataOwner.java | 26 +
.../component/DomainObjectLayoutData.java | 208 +++++
.../component/DomainObjectLayoutDataOwner.java | 25 +
.../isis/applib/layout/component/FieldSet.java | 223 ++++++
.../applib/layout/component/FieldSetOwner.java | 25 +
.../isis/applib/layout/component/Grid.java | 90 +++
.../applib/layout/component/GridAbstract.java | 197 +++++
.../applib/layout/component/HasBookmarking.java | 29 +
.../applib/layout/component/HasCssClass.java | 27 +
.../applib/layout/component/HasCssClassFa.java | 35 +
.../applib/layout/component/HasDescribedAs.java | 29 +
.../isis/applib/layout/component/HasHidden.java | 31 +
.../isis/applib/layout/component/HasNamed.java | 34 +
.../applib/layout/component/MemberRegion.java | 33 +
.../layout/component/MemberRegionOwner.java | 23 +
.../isis/applib/layout/component/Owned.java | 23 +
.../isis/applib/layout/component/Owner.java | 24 +
.../layout/component/PropertyLayoutData.java | 254 ++++++
.../applib/layout/component/package-info.java | 36 +
.../layout/grid/bootstrap3/BS3ClearFix.java | 24 +
.../grid/bootstrap3/BS3ClearFixHidden.java | 49 ++
.../grid/bootstrap3/BS3ClearFixVisible.java | 73 ++
.../applib/layout/grid/bootstrap3/BS3Col.java | 273 +++++++
.../layout/grid/bootstrap3/BS3Element.java | 35 +
.../grid/bootstrap3/BS3ElementAbstract.java | 46 ++
.../applib/layout/grid/bootstrap3/BS3Grid.java | 304 ++++++++
.../applib/layout/grid/bootstrap3/BS3Row.java | 140 ++++
.../layout/grid/bootstrap3/BS3RowContent.java | 80 ++
.../grid/bootstrap3/BS3RowContentOwner.java | 25 +
.../layout/grid/bootstrap3/BS3RowOwner.java | 28 +
.../applib/layout/grid/bootstrap3/BS3Tab.java | 177 +++++
.../layout/grid/bootstrap3/BS3TabGroup.java | 123 +++
.../grid/bootstrap3/BS3TabGroupOwner.java | 28 +
.../layout/grid/bootstrap3/BS3TabOwner.java | 28 +
.../applib/layout/grid/bootstrap3/HasCssId.java | 28 +
.../applib/layout/grid/bootstrap3/Size.java | 34 +
.../applib/layout/grid/bootstrap3/SizeSpan.java | 103 +++
.../layout/grid/bootstrap3/WithinGrid.java | 27 +
.../layout/grid/bootstrap3/package-info.java | 34 +
.../appfeat/ApplicationFeatureRepository.java | 42 +
.../services/appfeat/ApplicationMemberType.java | 42 +
.../services/config/ConfigurationProperty.java | 87 +++
.../config/ConfigurationProperty.layout.xml | 58 ++
.../services/config/ConfigurationProperty.png | Bin 0 -> 927 bytes
.../services/config/ConfigurationService.java | 54 ++
.../config/ConfigurationServiceMenu.java | 67 ++
.../applib/services/dto/Dto_downloadXml.java | 8 +-
.../applib/services/dto/Dto_downloadXsd.java | 4 +-
.../applib/services/factory/FactoryService.java | 62 ++
.../applib/services/grid/GridLoaderService.java | 48 ++
.../isis/applib/services/grid/GridService.java | 108 +++
.../applib/services/grid/GridSystemService.java | 55 ++
.../isis/applib/services/hint/HintStore.java | 43 +
.../jaxb/CatalogingSchemaOutputResolver.java | 152 ++++
.../isis/applib/services/jaxb/JaxbService.java | 178 ++++-
.../services/jaxb/StreamResultWithWriter.java | 45 ++
.../applib/services/layout/LayoutService.java | 80 ++
.../services/layout/LayoutServiceMenu.java | 91 +++
.../layout/Object_downloadLayoutXml.java | 74 ++
.../layout/Object_rebuildMetamodel.java | 58 ++
.../isis/applib/services/layout/Util.java | 33 +
.../applib/services/message/MessageService.java | 112 +++
.../applib/services/metamodel/DomainMember.java | 54 ++
.../services/metamodel/MetaModelService.java | 15 +
.../metamodel/MetaModelServicesMenu.java | 146 ++++
.../isis/applib/services/metamodel/Util.java | 33 +
.../services/registry/ServiceRegistry.java | 36 +
.../services/repository/RepositoryService.java | 216 +++++
.../sessmgmt/SessionManagementService.java | 44 ++
.../services/swagger/SwaggerServiceMenu.java | 4 +-
.../applib/services/title/TitleService.java | 41 +
.../isis/applib/services/user/UserService.java | 33 +
.../services/xactn/TransactionService.java | 42 +
.../java/org/apache/isis/applib/value/Blob.java | 10 +-
.../java/org/apache/isis/applib/value/Clob.java | 10 +-
.../layout/grid/bootstrap3/BS3ColTest.java | 63 ++
.../layout/grid/bootstrap3/SizeSpanTest.java | 62 ++
core/integtestsupport/pom.xml | 2 +-
.../integtestsupport/IsisSystemForTest.java | 85 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 56 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 17 +-
.../isis/tool/mavenplugin/IsisMojoXsd.java | 10 +-
core/metamodel/pom.xml | 9 +-
.../isis/core/commons/lang/ArrayExtensions.java | 16 +-
.../isis/core/commons/lang/ClassExtensions.java | 12 +-
.../isis/core/metamodel/facetapi/FacetUtil.java | 26 +-
.../facetdecorator/FacetDecoratorSet.java | 11 +-
.../isis/core/metamodel/facets/Annotations.java | 14 +-
.../invocation/ActionInvocationFacet.java | 42 +-
...onInvocationFacetForDomainEventAbstract.java | 73 +-
.../layout/ActionLayoutFacetFactory.java | 6 +-
.../layout/ActionPositionFacetForActionXml.java | 41 +
.../layout/BookmarkPolicyFacetForActionXml.java | 42 +
.../layout/CssClassFaFacetForActionXml.java | 45 ++
.../layout/CssClassFacetForActionXml.java | 43 +
.../layout/DescribedAsFacetForActionXml.java | 43 +
.../layout/HiddenFacetForActionLayoutXml.java | 52 ++
.../actions/layout/NamedFacetForActionXml.java | 45 ++
...tViewFacetForCollectionLayoutAnnotation.java | 41 -
...ewFacetOnCollectionFromLayoutProperties.java | 46 --
.../layout/CollectionLayoutFacetFactory.java | 2 -
.../layout/CssClassFacetForCollectionXml.java | 43 +
...tViewFacetForCollectionLayoutAnnotation.java | 43 +
.../DefaultViewFacetForCollectionXml.java | 43 +
...ewFacetOnCollectionFromLayoutProperties.java | 48 ++
.../DescribedAsFacetForCollectionXml.java | 43 +
.../layout/HiddenFacetForCollectionXml.java | 52 ++
.../layout/NamedFacetForCollectionXml.java | 48 ++
.../layout/PagedFacetForCollectionXml.java | 41 +
.../layout/SortedByFacetForCollectionXml.java | 52 ++
.../members/cssclassfa/CssClassFaPosition.java | 24 +
.../order/annotprop/MemberOrderFacetXml.java | 35 +
.../object/autocomplete/AutoCompleteFacet.java | 3 +-
.../autocomplete/AutoCompleteFacetAbstract.java | 51 +-
.../BookmarkPolicyFacetForDomainObjectXml.java | 42 +
.../CssClassFaFacetForDomainObjectXml.java | 45 ++
.../CssClassFacetForDomainObjectXml.java | 43 +
.../DescribedAsFacetForDomainObjectXml.java | 43 +
.../NamedFacetForDomainObjectXml.java | 45 ++
.../PluralFacetForDomainObjectXml.java | 41 +
.../DomainServiceLayoutFacetFactory.java | 84 ++
.../DomainServiceLayoutFactory.java | 84 --
.../metamodel/facets/object/grid/GridFacet.java | 40 +
.../facets/object/grid/GridFacetDefault.java | 83 ++
.../facets/object/grid/GridFacetFactory.java | 54 ++
...nCollectionDerivedFromRecreatableObject.java | 3 +-
...eObjectFacetForXmlRootElementAnnotation.java | 13 +
.../param/autocomplete/MinLengthUtil.java | 4 +
.../CssClassFacetForPropertyXml.java | 43 +
.../DescribedAsFacetForPropertyXml.java | 43 +
.../HiddenFacetForPropertyXml.java | 52 ++
.../LabelAtFacetForPropertyXml.java | 42 +
.../MultiLineFacetForPropertyXml.java | 41 +
.../NamedFacetForPropertyXml.java | 48 ++
.../RenderedAdjustedFacetForPropertyXml.java | 43 +
.../TypicalLengthFacetForPropertyXml.java | 49 ++
.../layoutmetadata/LayoutMetadataReader2.java | 2 +-
.../json/LayoutMetadataReaderFromJson.java | 40 +-
.../PersistenceSessionService.java | 4 +-
.../noruntime/RuntimeContextNoRuntime.java | 6 +
.../services/appfeat/ApplicationFeature.java | 351 +++++++++
.../appfeat/ApplicationFeatureFactory.java | 39 +
.../services/appfeat/ApplicationFeatureId.java | 473 +++++++++++
.../ApplicationFeatureRepositoryDefault.java | 539 +++++++++++++
.../appfeat/ApplicationFeatureType.java | 102 +++
.../config/ConfigurationServiceDefault.java | 93 +++
.../container/DomainObjectContainerDefault.java | 358 +++------
.../metamodel/services/devutils/MemberType.java | 25 +
.../services/factory/FactoryServiceDefault.java | 111 +++
.../services/grid/GridLoaderServiceDefault.java | 209 +++++
.../services/grid/GridNormalizerUtil.java | 38 +
.../services/grid/GridServiceDefault.java | 203 +++++
.../grid/GridSystemServiceAbstract.java | 708 +++++++++++++++++
.../grid/bootstrap3/GridSystemServiceBS3.java | 677 ++++++++++++++++
.../services/grid/fixedcols/applib/Hint.java | 39 +
.../Persistable_datanucleusIdLong.java | 73 ++
.../Persistable_datanucleusVersionLong.java | 66 ++
...Persistable_datanucleusVersionTimestamp.java | 66 ++
.../Persistable_downloadJdoMetadata.java | 33 +-
.../services/layout/LayoutServiceDefault.java | 161 ++++
.../services/message/MessageServiceDefault.java | 87 +++
.../services/metamodel/DomainMemberDefault.java | 247 ++++++
.../metamodel/MetaModelServiceDefault.java | 102 ++-
.../core/metamodel/services/metamodel/Util.java | 33 +
.../registry/ServiceRegistryDefault.java | 72 ++
.../repository/RepositoryServiceDefault.java | 256 ++++++
.../services/swagger/internal/Generation.java | 40 +-
.../services/title/TitleServiceDefault.java | 91 +++
.../services/user/UserServiceDefault.java | 140 ++++
.../xactn/TransactionServiceDefault.java | 51 ++
.../metamodel/spec/ObjectSpecifications.java | 24 +-
.../metamodel/spec/SpecificationLoaderSpi.java | 2 -
.../metamodel/spec/feature/ObjectAction.java | 7 +-
.../spec/feature/ObjectAssociation.java | 52 +-
.../metamodel/spec/feature/ObjectMember.java | 66 ++
.../specloader/ObjectReflectorDefault.java | 36 +-
.../specloader/SpecificationCacheDefault.java | 31 +-
.../specimpl/FacetedMethodsBuilder.java | 7 +-
.../specloader/specimpl/MixedInMember2.java | 28 +
.../specimpl/ObjectActionContributee.java | 2 +-
.../specimpl/ObjectActionMixedIn.java | 10 +-
.../specimpl/ObjectSpecificationAbstract.java | 7 +-
.../specimpl/OneToManyAssociationMixedIn.java | 12 +-
.../specimpl/OneToOneAssociationMixedIn.java | 13 +-
.../dflt/ObjectSpecificationDefault.java | 13 +-
.../metamodel/util/DeweyOrderComparator.java | 82 ++
.../dflt/ProgrammingModelFacetsJava5.java | 7 +-
.../metamodel/facets/ProgrammableReflector.java | 3 -
.../ActionLayoutAnnotationFacetFactoryTest.java | 192 -----
...youtXmlLayoutAnnotationFacetFactoryTest.java | 192 +++++
.../DomainServiceLayoutFacetFactoryTest.java | 129 +++
.../DomainServiceLayoutFactoryTest.java | 129 ---
.../object/layoutxml/GridFacetDefaultTest.java | 60 ++
...inObjectContainerDefaultTest_allMatches.java | 112 ---
.../metamodel/services/grid/BS3GridTest.java | 164 ++++
...RepositoryServiceDefaultTest_allMatches.java | 100 +++
.../SpecificationCacheDefaultTest.java | 21 +-
core/pom.xml | 241 ++++--
core/runtime/pom.xml | 28 +-
.../internal/RuntimeContextFromSession.java | 5 +
...shingServiceWithDefaultPayloadFactories.java | 2 +-
.../core/runtime/runner/IsisInjectModule.java | 14 +-
.../runtime/services/DeweyOrderComparator.java | 82 --
.../ServicesInstallerFromAnnotation.java | 7 +-
.../ServicesInstallerFromConfiguration.java | 1 +
...InstallerFromConfigurationAndAnnotation.java | 1 +
.../i18n/po/TranslationServicePoMenu.java | 10 +-
.../SessionManagementServiceDefault.java | 47 ++
.../services/sudo/SudoServiceDefault.java | 34 +-
.../core/runtime/system/ContextCategory.java | 79 --
.../core/runtime/system/DeploymentType.java | 38 +-
.../isis/core/runtime/system/IsisSystem.java | 69 +-
.../core/runtime/system/IsisSystemFactory.java | 4 +-
.../runtime/system/context/IsisContext.java | 173 +++-
.../system/context/IsisContextStatic.java | 137 ----
.../system/context/IsisContextThreadLocal.java | 183 -----
.../system/persistence/PersistenceSession.java | 5 +
.../system/transaction/IsisTransaction.java | 42 +-
.../isis/core/webapp/IsisSessionFilter.java | 23 +-
.../core/webapp/IsisWebAppBootstrapper.java | 25 +-
.../core/runtime/context/IsisContextTest.java | 140 ----
.../services/DeweyOrderComparatorTest.java | 2 +
.../services/i18n/po/PoWriterTest_escape.java | 18 +
.../runtime/system/ObjectActionDefaultTest.java | 107 ---
.../ObjectActionLayoutXmlDefaultTest.java | 107 +++
core/schema/pom.xml | 2 +-
.../jaxb/CatalogingSchemaOutputResolver.java | 85 --
.../services/jaxb/JaxbServiceDefault.java | 111 +--
.../services/jaxb/StreamResultWithWriter.java | 45 --
core/security-shiro/pom.xml | 6 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
.../scenarios/ScenarioExecution.java | 3 +-
.../specsupport/specs/CukeGlueAbstract.java | 23 +-
.../specsupport/specs/CukeSpecsAbstract.java | 7 +-
.../appended-resources/supplemental-models.xml | 17 +-
core/unittestsupport/pom.xml | 4 +-
.../soap/PublishedEndpoints.java | 2 +-
.../core/unittestsupport/soap/SoapEndpoint.java | 2 +-
.../unittestsupport/soap/SoapEndpointSpec.java | 3 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
.../rendering/domainobjects/MemberType.java | 28 +-
.../service/conmap/ContentMappingService.java | 7 +-
.../ContentNegotiationServiceXRoDomainType.java | 19 +-
core/viewer-restfulobjects-server/pom.xml | 4 +-
.../server/resources/DomainResourceHelper.java | 9 +
.../server/resources/VersionReprRenderer.java | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
.../wicket/viewer/IsisWicketApplication.java | 154 ++--
.../isis/DeploymentTypeAbstract.java | 8 +-
.../wicket/WebRequestCycleForIsis.java | 15 +-
.../ComponentFactoryRegistrarDefault.java | 44 +-
.../services/HintStoreUsingWicketSession.java | 105 +++
.../viewer/services/Object_clearHints.java | 80 ++
.../viewer/settings/IsisResourceSettings.java | 11 +-
core/viewer-wicket-model/pom.xml | 2 +-
.../model/hints/HasUiHintDisambiguator.java | 24 +
.../hints/IsisPropertyEditCompletedEvent.java | 46 ++
.../wicket/model/hints/IsisSelectorEvent.java | 43 +
.../wicket/model/hints/IsisUiHintEvent.java | 38 -
.../wicket/model/hints/UiHintContainer.java | 37 +-
.../model/hints/UiHintPathSignificant.java | 21 -
.../model/mementos/ObjectAdapterMemento.java | 15 +-
.../wicket/model/models/ActionExecutor.java | 35 -
.../viewer/wicket/model/models/ActionModel.java | 29 +-
.../model/models/EntityCollectionModel.java | 101 ++-
.../viewer/wicket/model/models/EntityModel.java | 265 +++----
.../wicket/model/models/ExecutingPanel.java | 42 +
.../wicket/model/models/ModelAbstract.java | 72 +-
.../viewer/wicket/model/models/ScalarModel.java | 85 ++
.../wicket/model/util/ComponentHintKey.java | 142 ++++
.../wicket/model/models/ActionModelTest.java | 8 +-
.../model/models/EntityModel_hintsTest.java | 141 ++++
.../wicket/model/models/ModelAbstractTest.java | 170 ----
core/viewer-wicket-ui/pom.xml | 2 +-
.../isis/viewer/wicket/ui/ComponentType.java | 19 +-
.../ActionResultResponseType.java | 20 +-
.../entityactions/AdditionalLinksPanel.java | 2 +-
.../entityactions/EntityActionUtil.java | 33 +-
.../serviceactions/ServiceActionsPanel.css | 5 +
.../actionprompt/ActionPromptHeaderPanel.java | 18 +-
.../actionprompt/ActionPromptModalWindow.java | 15 +-
.../ui/components/actions/ActionPanel.html | 10 +-
.../ui/components/actions/ActionPanel.java | 15 +-
.../actions/ActionParametersFormPanel.java | 18 +-
.../components/collection/CollectionPanel.java | 36 +-
.../selector/CollectionSelectorHelper.java | 122 ++-
.../selector/CollectionSelectorPanel.java | 65 +-
.../selector/UNUSED_CollectionSelectorPanel.css | 60 --
.../CollectionContentsAsAjaxTablePanel.java | 30 +-
...llectionContentsAsAjaxTablePanelFactory.java | 2 +-
.../ajaxtable/IsisAjaxFallbackDataTable.java | 30 +-
.../IsisAjaxFallbackHeadersToolbar.java | 9 +-
.../ajaxtable/IsisAjaxNavigationToolbar.java | 37 +-
.../ajaxtable/IsisAjaxPagingNavigationLink.java | 5 +-
.../columns/ObjectAdapterPropertyColumn.java | 5 +
.../CollectionContentsMultipleViewsPanel.java | 108 ++-
...ectionContentsMultipleViewsPanelFactory.java | 2 +-
.../CollectionContentsAsUnresolvedPanel.html | 29 -
.../CollectionContentsAsUnresolvedPanel.java | 43 -
...lectionContentsAsUnresolvedPanelFactory.java | 70 --
.../CollectionContentsHiddenPanel.html | 29 +
.../CollectionContentsHiddenPanel.java | 43 +
.../CollectionContentsHiddenPanelFactory.java | 70 ++
.../entity/EntityComponentFactoryAbstract.java | 14 +-
.../collection/EntityCollectionPanel.html | 46 ++
.../collection/EntityCollectionPanel.java | 166 ++++
.../collections/EntityCollectionsPanel.html | 49 --
.../collections/EntityCollectionsPanel.java | 177 -----
.../EntityCollectionsPanelFactory.java | 49 --
.../entity/combined/EntityCombinedPanel.html | 29 -
.../entity/combined/EntityCombinedPanel.java | 60 --
.../combined/EntityCombinedPanelFactory.java | 48 --
.../entity/fieldset/PropertyGroup.html | 41 +
.../entity/fieldset/PropertyGroup.java | 175 +++++
.../entity/header/EntityHeaderPanel.java | 6 +-
.../entity/properties/EntityPropertiesForm.java | 779 -------------------
.../properties/EntityPropertiesForm.properties | 22 -
.../properties/EntityPropertiesPanel.html | 104 ---
.../properties/EntityPropertiesPanel.java | 60 --
.../EntityPropertiesPanelFactory.java | 46 --
.../links/EntityLinksSelectorPanel.java | 22 +-
.../links/EntityLinksSelectorPanelFactory.java | 17 +-
.../ui/components/layout/bs3/BS3GridPanel.html | 28 +
.../ui/components/layout/bs3/BS3GridPanel.java | 63 ++
.../wicket/ui/components/layout/bs3/Util.java | 44 ++
.../layout/bs3/clearfix/ClearFix.html | 26 +
.../layout/bs3/clearfix/ClearFix.java | 69 ++
.../ui/components/layout/bs3/col/Col.html | 49 ++
.../ui/components/layout/bs3/col/Col.java | 327 ++++++++
...eatingViewWithDynamicallyVisibleContent.java | 54 ++
.../ui/components/layout/bs3/row/Row.html | 28 +
.../ui/components/layout/bs3/row/Row.java | 107 +++
.../layout/bs3/tabs/TabGroupPanel.java | 127 +++
.../ui/components/layout/bs3/tabs/TabPanel.html | 30 +
.../ui/components/layout/bs3/tabs/TabPanel.java | 100 +++
.../property/PropertyEditFormPanel.html | 42 +
.../property/PropertyEditFormPanel.java | 199 +++++
.../property/PropertyEditFormPanelFactory.java | 52 ++
.../components/property/PropertyEditPanel.html | 35 +
.../components/property/PropertyEditPanel.java | 302 +++++++
.../property/PropertyEditPanelFactory.java | 52 ++
.../property/PropertyEditPromptHeaderPanel.html | 32 +
.../property/PropertyEditPromptHeaderPanel.java | 63 ++
.../components/scalars/ScalarPanelAbstract.html | 13 +-
.../components/scalars/ScalarPanelAbstract.java | 47 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 11 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 29 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 7 +-
.../scalars/primitive/BooleanPanel.html | 17 +-
.../scalars/reference/ReferencePanel.html | 27 +-
.../scalars/reference/ReferencePanel.java | 9 +-
.../StandaloneCollectionPanel.html | 26 +-
.../StandaloneCollectionPanel.java | 39 +-
...UiHintPathSignificantWebMarkupContainer.java | 34 -
.../linkandlabel/ActionLinkFactoryAbstract.java | 14 +-
.../valuechoices/ValueChoicesSelect2Panel.html | 16 +-
.../ValueChoicesSelect2PanelFactory.java | 7 +-
.../widgets/zclip/ZeroClipboardPanel.html | 5 -
.../widgets/zclip/ZeroClipboardPanel.java | 74 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../ui/pages/bootstrap-overrides-flatly.css | 5 +
.../wicket/ui/pages/bootstrap-overrides.css | 120 ++-
.../wicket/ui/pages/entity/EntityPage.java | 39 +-
.../ui/pages/jquery.isis.wicket.viewer.js | 11 +
.../viewer/wicket/ui/pages/value/ValuePage.html | 10 +-
.../ui/pages/voidreturn/VoidReturnPage.html | 16 +-
.../ui/panels/HasDynamicallyVisibleContent.java | 36 +
.../viewer/wicket/ui/panels/PanelAbstract.java | 1 +
.../viewer/wicket/ui/util/CssIdAppender.java | 70 ++
core/webserver/pom.xml | 3 +-
core/wrapper/pom.xml | 17 +-
.../core/wrapper/WrapperFactoryDefault.java | 2 +
.../handlers/DomainObjectInvocationHandler.java | 11 +
example/application/simpleapp/app/pom.xml | 2 +-
.../app/services/homepage/HomePageService.java | 6 +-
.../homepage/HomePageViewModel.layout.json | 43 -
.../homepage/HomePageViewModel.layout.xml | 49 ++
example/application/simpleapp/dom/pom.xml | 63 +-
.../java/domainapp/dom/simple/SimpleObject.java | 55 +-
.../dom/simple/SimpleObject.layout.json | 60 --
.../dom/simple/SimpleObject.layout.xml | 63 ++
.../domainapp/dom/simple/SimpleObjects.java | 14 +-
.../domainapp/dom/simple/SimpleObjectsTest.java | 12 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../application/simpleapp/integtests/pom.xml | 55 +-
.../modules/simple/SimpleObjectIntegTest.java | 44 +-
example/application/simpleapp/pom.xml | 25 +-
.../webapp/ide/eclipse/launch/.gitignore | 8 +-
.../ide/eclipse/launch/SimpleApp-JREBEL.launch | 31 +
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 31 -
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 23 -
...OTOTYPE-with-fixtures-bypass-security.launch | 20 +
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 2 +-
.../eclipse/launch/SimpleApp-PROTOTYPE.launch | 20 +
.../launch/SimpleApp-SERVER-no-fixtures.launch | 23 -
.../ide/eclipse/launch/SimpleApp-SERVER.launch | 20 +
..._PROTOTYPE_with_fixtures-bypass-security.xml | 28 +
.../SimpleApp_PROTOTYPE_with_fixtures.xml | 28 +
.../ide/intellij/launch/SimpleApp_SERVER.xml | 28 +
.../launch/SimpleApp__enhance_only_.xml | 2 +-
example/application/simpleapp/webapp/pom.xml | 352 ++++-----
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
.../src/main/webapp/WEB-INF/translations-en.po | 2 +-
.../src/main/webapp/WEB-INF/translations-es.po | 2 +-
.../src/main/webapp/WEB-INF/translations-nl.po | 2 +-
.../src/main/webapp/WEB-INF/translations.po | 2 +-
.../webapp/WEB-INF/viewer_wicket.properties | 6 -
.../src/main/webapp/swagger-ui/index.html | 18 +
example/archetype/simpleapp/pom.xml | 6 +-
.../META-INF/maven/archetype-metadata.xml | 4 +-
...ppAppManifestWithFixturesBypassSecurity.java | 38 +
.../app/services/homepage/HomePageService.java | 6 +-
.../homepage/HomePageViewModel.layout.json | 43 -
.../homepage/HomePageViewModel.layout.xml | 47 ++
.../prototyping/HideMixinsForHomePage.java | 56 ++
.../resources/archetype-resources/dom/pom.xml | 5 +-
.../java/domainapp/dom/simple/SimpleObject.java | 59 +-
.../dom/simple/SimpleObject.layout.json | 56 --
.../dom/simple/SimpleObject.layout.xml | 68 ++
.../domainapp/dom/simple/SimpleObjects.java | 24 +-
.../domainapp/dom/simple/SimpleObjectsTest.java | 12 +-
.../archetype-resources/integtests/pom.xml | 147 +++-
.../modules/simple/SimpleObjectIntegTest.java | 44 +-
.../main/resources/archetype-resources/pom.xml | 23 +-
.../webapp/ide/eclipse/launch/.gitignore | 8 +-
...OTOTYPE-with-fixtures-bypass-security.launch | 22 +
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 +
.../eclipse/launch/SimpleApp-PROTOTYPE.launch | 22 +
.../ide/eclipse/launch/SimpleApp-SERVER.launch | 22 +
..._PROTOTYPE_with_fixtures-bypass-security.xml | 31 +
.../SimpleApp_PROTOTYPE_with_fixtures.xml | 31 +
.../ide/intellij/launch/SimpleApp_SERVER.xml | 31 +
.../launch/SimpleApp__enhance_only_.xml | 2 +-
.../archetype-resources/webapp/pom.xml | 337 ++++----
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 64162 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 27310 bytes
.../webapp/DomainApplication.properties | 31 +
.../src/main/webapp/WEB-INF/isis.properties | 22 +-
.../src/main/webapp/WEB-INF/translations-en.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-es.po | 323 +++++++-
.../src/main/webapp/WEB-INF/translations-nl.po | 328 +++++++-
.../src/main/webapp/WEB-INF/translations.po | 328 +++++++-
.../webapp/WEB-INF/viewer_wicket.properties | 6 -
.../webapp/src/main/webapp/WEB-INF/web.xml | 26 +-
.../webapp/src/main/webapp/about/index.html | 18 +-
.../src/main/webapp/swagger-ui/index.html | 164 ++++
.../projects/basic/archetype.properties | 2 +-
pom.xml | 41 +-
recreate_archetype_RELEASE.sh | 6 +-
recreate_archetype_SNAPSHOT.sh | 6 +-
scripts/promoterctag.sh | 2 +-
740 files changed, 34703 insertions(+), 14974 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index 6d59370,1e09119..6b0c876
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -103,37 -112,46 +112,45 @@@
<hamcrest.version>1.3</hamcrest.version>
- <objenesis.version>1.4</objenesis.version>
- <javassist.version>3.19.0-GA</javassist.version>
- <reflections.version>0.9.9</reflections.version>
+ <objenesis.version>2.2</objenesis.version>
+ <javassist.version>3.20.0-GA</javassist.version>
+ <reflections.version>0.9.10</reflections.version>
- <commons-logging.version>1.1.2</commons-logging.version>
- <commons-cli.version>1.2</commons-cli.version>
+ <commons-logging.version>1.2</commons-logging.version>
+ <commons-cli.version>1.3.1</commons-cli.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
- <commons-codec.version>1.9</commons-codec.version>
+ <commons-codec.version>1.10</commons-codec.version>
+ <commons-email.version>1.4</commons-email.version>
+ <com-sun-mail.version>1.5.2</com-sun-mail.version>
- <jackson.version>2.5.0</jackson.version>
- <gson.version>2.3.1</gson.version>
+ <axon-core.version>2.4</axon-core.version>
+
+ <jackson.version>2.6.4</jackson.version>
+ <gson.version>2.5</gson.version>
+ <swagger-core.version>1.5.5</swagger-core.version>
+ <swagger-ui.version>2.1.3</swagger-ui.version>
+ <webjars-servlet-2.x.version>1.4</webjars-servlet-2.x.version>
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
+ <!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
<hsqldb.version>2.3.1</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.11.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
- <jetty.version>9.2.11.v20150529</jetty.version>
+ <jetty.version>9.3.6.v20151106</jetty.version>
- <wicket.version>6.20.0</wicket.version>
- <wicketstuff.version>6.20.0</wicketstuff.version>
+ <wicket.version>7.2.0</wicket.version>
- <wicketstuff.version>7.1.0</wicketstuff.version>
++ <wicketstuff.version>7.2.0</wicketstuff.version>
- <wicket-webjars.version>0.4.8</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.15</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.3</wicket-webjars.version>
- <wicket-bootstrap.version>0.10.4</wicket-bootstrap.version>
++ <wicket-bootstrap.version>0.10.6</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
- <wicket-select2.version>6.20.0</wicket-select2.version>
- <select2.version>3.5.2</select2.version>
+ <select2.version>4.0.0-2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>3.0</guice.version>
- <picocontainer.version>2.14.3</picocontainer.version>
+ <guice.version>4.0</guice.version>
+ <picocontainer.version>2.15</picocontainer.version>
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 673bf3e,2b24c80..0f78f39
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@@ -26,40 -26,38 +26,7 @@@ import java.util.Set
import javax.servlet.ServletContext;
--import com.google.common.base.Function;
- import com.google.common.base.Throwables;
- import com.google.common.collect.Iterables;
--import com.google.common.collect.Lists;
--import com.google.common.collect.Sets;
--import com.google.inject.Guice;
--import com.google.inject.Inject;
--import com.google.inject.Injector;
--import com.google.inject.Module;
- import org.apache.wicket.guice.GuiceComponentInjector;
- import org.wicketstuff.select2.ApplicationSettings;
--
--import org.apache.wicket.Application;
--import org.apache.wicket.ConverterLocator;
--import org.apache.wicket.IConverterLocator;
--import org.apache.wicket.Page;
--import org.apache.wicket.RuntimeConfigurationType;
--import org.apache.wicket.SharedResources;
--import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
--import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
--import org.apache.wicket.core.request.mapper.MountedMapper;
-import org.apache.wicket.guice.GuiceComponentInjector;
--import org.apache.wicket.markup.head.IHeaderResponse;
--import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
--import org.apache.wicket.markup.html.IHeaderContributor;
--import org.apache.wicket.markup.html.IHeaderResponseDecorator;
--import org.apache.wicket.markup.html.WebPage;
--import org.apache.wicket.request.cycle.IRequestCycleListener;
--import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
--import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
--import org.apache.wicket.request.resource.CssResourceReference;
- import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
-import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
--import org.apache.wicket.util.time.Duration;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
-import org.wicketstuff.select2.ApplicationSettings;
++import net.ftlines.wicketsource.WicketSource;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@@@ -108,6 -106,6 +75,38 @@@ import org.apache.isis.viewer.wicket.vi
import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings;
++import org.apache.wicket.Application;
++import org.apache.wicket.ConverterLocator;
++import org.apache.wicket.IConverterLocator;
++import org.apache.wicket.Page;
++import org.apache.wicket.RuntimeConfigurationType;
++import org.apache.wicket.SharedResources;
++import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
++import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
++import org.apache.wicket.core.request.mapper.MountedMapper;
++import org.apache.wicket.guice.GuiceComponentInjector;
++import org.apache.wicket.markup.head.IHeaderResponse;
++import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
++import org.apache.wicket.markup.html.IHeaderContributor;
++import org.apache.wicket.markup.html.IHeaderResponseDecorator;
++import org.apache.wicket.markup.html.WebPage;
++import org.apache.wicket.request.cycle.IRequestCycleListener;
++import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
++import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
++import org.apache.wicket.request.resource.CssResourceReference;
++import org.apache.wicket.settings.RequestCycleSettings;
++import org.apache.wicket.util.time.Duration;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
++import org.wicketstuff.select2.ApplicationSettings;
++
++import com.google.common.base.Function;
++import com.google.common.collect.Lists;
++import com.google.common.collect.Sets;
++import com.google.inject.Guice;
++import com.google.inject.Inject;
++import com.google.inject.Injector;
++import com.google.inject.Module;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior;
@@@ -116,7 -114,7 +115,6 @@@ import de.agilecoders.wicket.core.setti
import de.agilecoders.wicket.webjars.WicketWebjars;
import de.agilecoders.wicket.webjars.settings.IWebjarsSettings;
import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
--import net.ftlines.wicketsource.WicketSource;
/**
* Main application, subclassing the Wicket {@link Application} and
@@@ -246,7 -245,7 +245,7 @@@ public class IsisWicketApplicatio
configureLogging(isisConfigDir);
-- getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER);
++ getRequestCycleSettings().setRenderStrategy(RequestCycleSettings.RenderStrategy.REDIRECT_TO_RENDER);
getResourceSettings().setParentFolderPlaceholder("$up$");
@@@ -318,9 -320,16 +320,15 @@@
ApplicationSettings select2Settings = ApplicationSettings.get();
select2Settings.setCssReference(new Select2BootstrapCssReference());
select2Settings.setJavaScriptReference(new Select2JsReference());
- select2Settings.setIncludeJqueryUI(false);
}
- private void configureWicketSourcePlugin() {
+ protected void configureWicketSourcePluginIfNecessary(final IsisConfiguration configuration) {
+ if(isWicketSourcePluginEnabled(configuration)) {
+ configureWicketSourcePlugin();
+ }
+ }
+
+ protected void configureWicketSourcePlugin() {
if(!deploymentType.isProduction()) {
WicketSource.configure(this);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
index 22a1b9b,f75ecda..13d3cfd
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
@@@ -20,14 -20,14 +20,19 @@@
package org.apache.isis.viewer.wicket.viewer.settings;
import java.util.List;
++
++import org.apache.isis.viewer.wicket.viewer.integration.wicket.LocalizerForIsis;
import org.apache.wicket.Application;
import org.apache.wicket.Localizer;
--import org.apache.wicket.resource.loader.*;
-import org.apache.wicket.settings.def.ResourceSettings;
++import org.apache.wicket.resource.loader.ClassStringResourceLoader;
++import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
++import org.apache.wicket.resource.loader.IStringResourceLoader;
++import org.apache.wicket.resource.loader.InitializerStringResourceLoader;
++import org.apache.wicket.resource.loader.PackageStringResourceLoader;
++import org.apache.wicket.resource.loader.ValidatorStringResourceLoader;
+import org.apache.wicket.settings.ResourceSettings;
import org.apache.wicket.util.lang.Generics;
--import org.apache.isis.viewer.wicket.viewer.integration.wicket.LocalizerForIsis;
--
public class IsisResourceSettings extends ResourceSettings {
/** Chain of string resource loaders to use */
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f4697c61/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
[07/21] isis git commit: Use WebMarkupContainer instead of Label with
empty string
Posted by da...@apache.org.
Use WebMarkupContainer instead of Label with empty string
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe4e2b8c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe4e2b8c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe4e2b8c
Branch: refs/heads/master
Commit: fe4e2b8c67cfd7fb8b1eb92f86544004bdb4dce1
Parents: 2d89e3f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 3 22:00:31 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 3 22:00:31 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/util/Components.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fe4e2b8c/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
index 93939c1..b33ff7b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.util;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -55,9 +56,9 @@ public final class Components {
* on JDK6u18 (Ubuntu)
*/
private static void permanentlyHideSingle(final MarkupContainer container, final String id) {
- final Label label = new Label(id, "");
- label.setVisible(false);
- container.addOrReplace(label);
+ final WebMarkupContainer invisible = new WebMarkupContainer(id);
+ invisible.setVisible(false);
+ container.addOrReplace(invisible);
}
/**