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 2018/02/23 17:11:40 UTC
[isis] branch maint-1.16.2 updated (826726c -> 9bd76ac)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 826726c Merge branch 'release-1.16.1-RC2' into maint-1.16.1
new 1ff68a7 bumps maint-1.16.2 branch versions to 1.16.2-SNAPSHOT
new 5b37fbc ISIS-1876: converts applib module to inherit from ModuleAbstract
new 7dce4f6 ISIS-1875: tiny fixes for logging.properties in archetypes (suppress noisy SQLWarnings)
new 6adc5ed ISIS-1874: adds guard against NPE, and ensures choices facet not installed on incompatible parameters
new 0d92ae7 ISIS-1867: caches JAXBContext (backported from 2.0.0-M1)
new 9bd76ac ISIS-1867: caches JAXBContext (backported from 2.0.0-M1)
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/applib/pom.xml | 2 +-
.../org/apache/isis/applib/IsisApplibModule.java | 5 +-
.../isis/applib/services/jaxb/JaxbService.java | 25 ++++----
.../java/org/apache/isis/applib/util/JaxbUtil.java | 24 +++++---
.../apache/isis/schema/utils/ChangesDtoUtils.java | 7 +--
.../apache/isis/schema/utils/CommandDtoUtils.java | 7 +--
.../isis/schema/utils/InteractionDtoUtils.java | 7 +--
.../isis/schema/utils/MemberExecutionDtoUtils.java | 7 ++-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 2 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
...onParameterDefaultsAndChoicesPostProcessor.java | 56 +++++++++++------
.../services/grid/GridLoaderServiceDefault.java | 43 ++++++++-----
core/pom.xml | 70 +++++++++++-----------
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
.../core/unittestsupport/jaxb/JaxbMatchers.java | 25 +++++---
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
.../ui/components/collection/CollectionPanel.java | 7 ++-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/helloworld/pom.xml | 4 +-
.../application/logging-integtest.properties | 10 ++++
example/application/simpleapp/application/pom.xml | 2 +-
.../application/DomainAppApplicationModule.java | 3 +
.../module-simple/logging-integtest.properties | 9 +++
.../application/simpleapp/module-simple/pom.xml | 2 +-
.../domainapp/modules/simple/SimpleModule.java | 5 +-
example/application/simpleapp/pom.xml | 4 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
45 files changed, 224 insertions(+), 152 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/06: ISIS-1875: tiny fixes for logging.properties in
archetypes (suppress noisy SQLWarnings)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7dce4f63d9905b0474044abf8e16aae3e039c284
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 16:51:00 2018 +0000
ISIS-1875: tiny fixes for logging.properties in archetypes (suppress noisy SQLWarnings)
---
.../simpleapp/application/logging-integtest.properties | 10 ++++++++++
.../simpleapp/module-simple/logging-integtest.properties | 9 +++++++++
2 files changed, 19 insertions(+)
diff --git a/example/application/simpleapp/application/logging-integtest.properties b/example/application/simpleapp/application/logging-integtest.properties
index 5df9e55..4bb0bea 100644
--- a/example/application/simpleapp/application/logging-integtest.properties
+++ b/example/application/simpleapp/application/logging-integtest.properties
@@ -109,3 +109,13 @@ log4j.additivity.DataNucleus.Datastore.IDE=false
log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PoWriter=false
+
+
+log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
+log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
+
+log4j.logger.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=DEBUG,Console
+log4j.additivity.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=false
+
+log4j.logger.com.mchange.v2.c3p0.SQLWarnings=WARN,Console
+log4j.additivity.com.mchange.v2.c3p0.SQLWarnings=false
diff --git a/example/application/simpleapp/module-simple/logging-integtest.properties b/example/application/simpleapp/module-simple/logging-integtest.properties
index 5df9e55..a3a512b 100644
--- a/example/application/simpleapp/module-simple/logging-integtest.properties
+++ b/example/application/simpleapp/module-simple/logging-integtest.properties
@@ -109,3 +109,12 @@ log4j.additivity.DataNucleus.Datastore.IDE=false
log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PoWriter=false
+
+log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
+log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
+
+log4j.logger.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=DEBUG,Console
+log4j.additivity.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=false
+
+log4j.logger.com.mchange.v2.c3p0.SQLWarnings=WARN,Console
+log4j.additivity.com.mchange.v2.c3p0.SQLWarnings=false
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 06/06: ISIS-1867: caches JAXBContext (backported from
2.0.0-M1)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9bd76acb1d97a23b4776f39c6ab408dc79de214d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 17:07:37 2018 +0000
ISIS-1867: caches JAXBContext (backported from 2.0.0-M1)
---
.../org/apache/isis/applib/services/jaxb/JaxbService.java | 7 +++----
.../metamodel/services/grid/GridLoaderServiceDefault.java | 12 ++++++++++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 2ff7c01..a0d50d5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -31,7 +31,6 @@ import javax.xml.bind.Unmarshaller;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
-import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
import org.apache.isis.applib.ApplicationException;
@@ -104,7 +103,7 @@ public interface JaxbService {
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml) {
- return fromXml(jaxbContext, xml, Maps.newHashMap());
+ return fromXml(jaxbContext, xml, Maps.<String,Object>newHashMap());
}
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml, final Map<String, Object> unmarshallerProperties) {
@@ -128,7 +127,7 @@ public interface JaxbService {
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml) {
- return fromXml(domainClass, xml, Maps.newHashMap());
+ return fromXml(domainClass, xml, Maps.<String,Object>newHashMap());
}
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml, final Map<String, Object> unmarshallerProperties) {
@@ -146,7 +145,7 @@ public interface JaxbService {
@Override
public String toXml(final Object domainObject) {
- return toXml(domainObject, Maps.newHashMap());
+ return toXml(domainObject, Maps.<String,Object>newHashMap());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index bb9d9c3..cf9d0cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
+import javax.annotation.Nullable;
import javax.annotation.PostConstruct;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -67,10 +68,17 @@ public class GridLoaderServiceDefault implements GridLoaderService {
final List<Class<? extends Grid>> pageImplementations =
FluentIterable.from(gridSystemServices)
.transform(
- (Function<GridSystemService, Class<? extends Grid>>) gss -> gss.gridImplementation())
+ //(Function<GridSystemService, Class<? extends Grid>>) gss -> gss.gridImplementation()
+ new Function<GridSystemService, Class<? extends Grid>>() {
+ @Override
+ public Class<? extends Grid> apply(final GridSystemService input) {
+ return input.gridImplementation();
+ }
+ }
+ )
.toList();
- final Class[] clazz = pageImplementations.toArray(_Constants.emptyClasses);
+ final Class[] clazz = pageImplementations.toArray(new Class[0]);
try {
jaxbContext = JAXBContext.newInstance(clazz);
} catch (JAXBException e) {
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/06: ISIS-1876: converts applib module to inherit from
ModuleAbstract
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5b37fbccbafe7bd18d7e7c771734260fd0b80f0f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 16:50:16 2018 +0000
ISIS-1876: converts applib module to inherit from ModuleAbstract
---
.../src/main/java/org/apache/isis/applib/IsisApplibModule.java | 5 +++--
.../main/java/domainapp/application/DomainAppApplicationModule.java | 3 +++
.../src/main/java/domainapp/modules/simple/SimpleModule.java | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 6209d50..d259ce5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -20,9 +20,10 @@ package org.apache.isis.applib;
import java.util.List;
-public final class IsisApplibModule {
+import javax.xml.bind.annotation.XmlRootElement;
- private IsisApplibModule(){}
+@XmlRootElement(name = "module")
+public class IsisApplibModule extends ModuleAbstract {
public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {
public ActionDomainEvent() {}
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java b/example/application/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
index 9dda7e7..dcd3be4 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
@@ -20,6 +20,8 @@ package domainapp.application;
import java.util.Set;
+import javax.xml.bind.annotation.XmlRootElement;
+
import com.google.common.collect.Sets;
import org.apache.isis.applib.Module;
@@ -27,6 +29,7 @@ import org.apache.isis.applib.ModuleAbstract;
import domainapp.modules.simple.SimpleModule;
+@XmlRootElement(name = "module")
public class DomainAppApplicationModule extends ModuleAbstract {
@Override
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 0c3a795..4274c0d 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -18,12 +18,15 @@
*/
package domainapp.modules.simple;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.isis.applib.ModuleAbstract;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract2;
-import org.apache.isis.applib.ModuleAbstract;
import domainapp.modules.simple.dom.impl.SimpleObject;
+@XmlRootElement(name = "module")
public class SimpleModule extends ModuleAbstract {
@Override
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 04/06: ISIS-1874: adds guard against NPE,
and ensures choices facet not installed on incompatible parameters
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6adc5edc98a489521d40f24a8ecf8bd014900398
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 16:52:32 2018 +0000
ISIS-1874: adds guard against NPE, and ensures choices facet not installed on incompatible parameters
---
...onParameterDefaultsAndChoicesPostProcessor.java | 56 ++++++++++++++--------
.../ui/components/collection/CollectionPanel.java | 7 +--
2 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
index 56c34e8..97b6c0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
@@ -82,6 +82,9 @@ public class ActionCollectionParameterDefaultsAndChoicesPostProcessor implements
final ObjectActionParameter.Predicates.CollectionParameter whetherCollectionParamOfType =
new ObjectActionParameter.Predicates.CollectionParameter(specification);
+ final ObjectActionParameter.Predicates.ScalarParameter whetherScalarParamOfType =
+ new ObjectActionParameter.Predicates.ScalarParameter(specification);
+
final ImmutableList<ObjectAction> actions = FluentIterable.from(objectActions)
.filter(ObjectAction.Predicates.associatedWith(otma))
.toList();
@@ -90,12 +93,16 @@ public class ActionCollectionParameterDefaultsAndChoicesPostProcessor implements
final List<ObjectActionParameter> parameters = action.getParameters();
+ final ImmutableList<ObjectActionParameter> compatibleCollectionParams = FluentIterable.from(parameters)
+ .filter(whetherCollectionParamOfType).toList();
+
+ final ImmutableList<ObjectActionParameter> compatibleScalarParams = FluentIterable.from(parameters)
+ .filter(whetherScalarParamOfType).toList();
+
// for collection parameters, install an defaults facet (if there isn't one already)
// this will cause the UI to render the collection with toggleboxes
// with a thread-local used to provide the selected objects
- final ImmutableList<ObjectActionParameter> collectionParams = FluentIterable.from(parameters)
- .filter(whetherCollectionParamOfType).toList();
- for (final ObjectActionParameter collectionParam : collectionParams) {
+ for (final ObjectActionParameter collectionParam : compatibleCollectionParams) {
final ActionParameterDefaultsFacet defaultsFacet = collectionParam
.getFacet(ActionParameterDefaultsFacet.class);
if (existsAndNotDerived(defaultsFacet)) {
@@ -105,28 +112,39 @@ public class ActionCollectionParameterDefaultsAndChoicesPostProcessor implements
}
}
- // for both scalar and collection parameters, install a choices facet (if there isn't one already)
+ // for compatible collection parameters, install a choices facet (if there isn't one already)
+ // using the associated collection for its values
+ for (final ObjectActionParameter collectionParam : compatibleCollectionParams) {
+ addChoicesFacetIfNoneAlready(otma, collectionParam);
+ }
+
+ // similarly for compatible scalar parameters, install a choices facet (if there isn't one already)
// using the associated collection for its values.
- for (final ObjectActionParameter scalarOrCollectionParam : parameters) {
-
- final ActionParameterChoicesFacet choicesFacet = scalarOrCollectionParam
- .getFacet(ActionParameterChoicesFacet.class);
- final ActionParameterAutoCompleteFacet autoCompleteFacet = scalarOrCollectionParam
- .getFacet(ActionParameterAutoCompleteFacet.class);
- if (existsAndNotDerived(choicesFacet) || existsAndNotDerived(autoCompleteFacet)) {
- // don't overwrite existing choices or autoComplete facet
- } else {
- FacetUtil.addFacet(
- new ActionParameterChoicesFacetFromParentedCollection(
- scalarOrCollectionParam, otma,
- getDeploymentCategory(), specificationLoader,
- authenticationSessionProvider, adapterManager ));
- }
+ for (final ObjectActionParameter scalarParam : compatibleScalarParams) {
+ addChoicesFacetIfNoneAlready(otma, scalarParam);
}
}
}
}
+ private void addChoicesFacetIfNoneAlready(
+ final OneToManyAssociation otma,
+ final ObjectActionParameter scalarOrCollectionParam) {
+ final ActionParameterChoicesFacet choicesFacet = scalarOrCollectionParam
+ .getFacet(ActionParameterChoicesFacet.class);
+ final ActionParameterAutoCompleteFacet autoCompleteFacet = scalarOrCollectionParam
+ .getFacet(ActionParameterAutoCompleteFacet.class);
+ if (existsAndNotDerived(choicesFacet) || existsAndNotDerived(autoCompleteFacet)) {
+ // don't overwrite existing choices or autoComplete facet
+ } else {
+ FacetUtil.addFacet(
+ new ActionParameterChoicesFacetFromParentedCollection(
+ scalarOrCollectionParam, otma,
+ getDeploymentCategory(), specificationLoader,
+ authenticationSessionProvider, adapterManager ));
+ }
+ }
+
private static boolean existsAndNotDerived(final Facet facet) {
return facet != null && !facet.isNoop() && !facet.isNoop();
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index cdbf1e5..e5724e4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -193,9 +193,10 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
collectionModel.clearToggleMementosList();
final ObjectAdapterToggleboxColumn toggleboxColumn = bulkActionsProvider.getToggleboxColumn();
- toggleboxColumn.clearToggles();
-
- target.add(collectionPanel);
+ if(toggleboxColumn != null) {
+ toggleboxColumn.clearToggles();
+ target.add(collectionPanel);
+ }
}
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 05/06: ISIS-1867: caches JAXBContext (backported from
2.0.0-M1)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0d92ae7cbbe20077739255f796dae25cf68b11df
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 16:58:59 2018 +0000
ISIS-1867: caches JAXBContext (backported from 2.0.0-M1)
---
.../isis/applib/services/jaxb/JaxbService.java | 32 ++++++++++----------
.../java/org/apache/isis/applib/util/JaxbUtil.java | 24 ++++++++++-----
.../apache/isis/schema/utils/ChangesDtoUtils.java | 7 ++---
.../apache/isis/schema/utils/CommandDtoUtils.java | 7 ++---
.../isis/schema/utils/InteractionDtoUtils.java | 7 ++---
.../isis/schema/utils/MemberExecutionDtoUtils.java | 7 ++++-
.../services/grid/GridLoaderServiceDefault.java | 35 ++++++++++++----------
.../core/unittestsupport/jaxb/JaxbMatchers.java | 25 +++++++++++-----
8 files changed, 82 insertions(+), 62 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index a4cebb8..2ff7c01 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -31,13 +31,14 @@ import javax.xml.bind.Unmarshaller;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Iterables;
+import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
import org.apache.isis.applib.ApplicationException;
-import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.dto.Dto_downloadXsd;
+import org.apache.isis.applib.util.JaxbUtil;
public interface JaxbService {
@@ -103,7 +104,7 @@ public interface JaxbService {
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml) {
- return fromXml(jaxbContext, xml, Maps.<String,Object>newHashMap());
+ return fromXml(jaxbContext, xml, Maps.newHashMap());
}
@Override
public Object fromXml(final JAXBContext jaxbContext, final String xml, final Map<String, Object> unmarshallerProperties) {
@@ -127,22 +128,25 @@ public interface JaxbService {
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml) {
- return fromXml(domainClass, xml, Maps.<String,Object>newHashMap());
+ return fromXml(domainClass, xml, Maps.newHashMap());
}
@Override
public <T> T fromXml(final Class<T> domainClass, final String xml, final Map<String, Object> unmarshallerProperties) {
- try {
- final JAXBContext context = JAXBContext.newInstance(domainClass);
- return (T) fromXml(context, xml, unmarshallerProperties);
+ final JAXBContext context = jaxbContextFor(domainClass);
+ return (T) fromXml(context, xml, unmarshallerProperties);
+ }
- } catch (final JAXBException ex) {
- throw new NonRecoverableException("Error unmarshalling XML to class '" + domainClass.getName() + "'", ex);
+ private <T> JAXBContext jaxbContextFor(final Class<T> clazz) {
+ try {
+ return JaxbUtil.jaxbContextFor(clazz);
+ } catch (RuntimeException e) {
+ throw new NonRecoverableException("Error obtaining JAXBContext for class '" + clazz + "'", e.getCause());
}
}
@Override
public String toXml(final Object domainObject) {
- return toXml(domainObject, Maps.<String,Object>newHashMap());
+ return toXml(domainObject, Maps.newHashMap());
}
@Override
@@ -150,7 +154,7 @@ public interface JaxbService {
final Class<?> domainClass = domainObject.getClass();
try {
- final JAXBContext context = JAXBContext.newInstance(domainClass);
+ final JAXBContext context = jaxbContextFor(domainClass);
final Marshaller marshaller = context.createMarshaller();
@@ -218,20 +222,16 @@ public interface JaxbService {
try {
final Class<?> domainClass = domainObject.getClass();
- final JAXBContext context = JAXBContext.newInstance(domainClass);
+ final JAXBContext context = jaxbContextFor(domainClass);
final CatalogingSchemaOutputResolver outputResolver = new CatalogingSchemaOutputResolver(isisSchemas);
context.generateSchema(outputResolver);
return outputResolver.asMap();
- } catch (final JAXBException | IOException ex) {
+ } catch (final IOException ex) {
throw new ApplicationException(ex);
}
}
-
-
- @javax.inject.Inject
- DomainObjectContainer container;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java b/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
index b2cd974..e8be77f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
@@ -23,14 +23,17 @@ import java.io.StringReader;
import java.io.Writer;
import java.net.URL;
import java.nio.charset.Charset;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import com.google.common.collect.MapMaker;
import com.google.common.io.Resources;
+
/**
* Helper methods for converting {@link javax.xml.bind.annotation.XmlRootElement}-annotated class to-and-from XML. Intended primarily for
* test use only (the {@link JAXBContext} is not cached).
@@ -48,7 +51,7 @@ public class JaxbUtil {
final Class<T> dtoClass) {
Unmarshaller un = null;
try {
- un = getJaxbContext(dtoClass).createUnmarshaller();
+ un = jaxbContextFor(dtoClass).createUnmarshaller();
return (T) un.unmarshal(reader);
} catch (JAXBException e) {
throw new RuntimeException(e);
@@ -75,7 +78,7 @@ public class JaxbUtil {
Marshaller m = null;
try {
final Class<?> aClass = dto.getClass();
- m = getJaxbContext(aClass).createMarshaller();
+ m = jaxbContextFor(aClass).createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
m.marshal(dto, writer);
} catch (JAXBException e) {
@@ -83,11 +86,18 @@ public class JaxbUtil {
}
}
- private static JAXBContext getJaxbContext(Class<?> dtoClass) {
- try {
- return JAXBContext.newInstance(dtoClass);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
+ private static Map<Class<?>, JAXBContext> jaxbContextByClass = new MapMaker().concurrencyLevel(10).makeMap();
+
+ public static <T> JAXBContext jaxbContextFor(final Class<T> dtoClass) {
+ JAXBContext jaxbContext = jaxbContextByClass.get(dtoClass);
+ if(jaxbContext == null) {
+ try {
+ jaxbContext = JAXBContext.newInstance(dtoClass);
+ } catch (JAXBException e) {
+ throw new RuntimeException(e);
+ }
+ jaxbContextByClass.put(dtoClass, jaxbContext);
}
+ return jaxbContext;
}
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
index 25f8627..575ca9d 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
@@ -34,6 +34,7 @@ import javax.xml.bind.Unmarshaller;
import com.google.common.io.Resources;
+import org.apache.isis.applib.util.JaxbUtil;
import org.apache.isis.schema.chg.v1.ChangesDto;
public final class ChangesDtoUtils {
@@ -46,11 +47,7 @@ public final class ChangesDtoUtils {
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
- try {
- jaxbContext = JAXBContext.newInstance(ChangesDto.class);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
- }
+ jaxbContext = JaxbUtil.jaxbContextFor(ChangesDto.class);
}
return jaxbContext;
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
index f61260c..dddebc6 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
@@ -33,6 +33,7 @@ import javax.xml.bind.Unmarshaller;
import com.google.common.io.Resources;
+import org.apache.isis.applib.util.JaxbUtil;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MapDto;
@@ -50,11 +51,7 @@ public final class CommandDtoUtils {
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
- try {
- jaxbContext = JAXBContext.newInstance(CommandDto.class);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
- }
+ jaxbContext = JaxbUtil.jaxbContextFor(CommandDto.class);
}
return jaxbContext;
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
index ccf48dd..b329af0 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
@@ -41,6 +41,7 @@ import com.google.common.io.Resources;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.applib.util.JaxbUtil;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.cmd.v1.ParamsDto;
import org.apache.isis.schema.common.v1.InteractionType;
@@ -65,11 +66,7 @@ public final class InteractionDtoUtils {
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
- try {
- jaxbContext = JAXBContext.newInstance(InteractionDto.class);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
- }
+ jaxbContext = JaxbUtil.jaxbContextFor(InteractionDto.class);
}
return jaxbContext;
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
index 121ea92..9563507 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/MemberExecutionDtoUtils.java
@@ -29,6 +29,7 @@ import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
+import org.apache.isis.applib.util.JaxbUtil;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
@@ -44,7 +45,7 @@ public final class MemberExecutionDtoUtils {
private static <T> T clone(final T dto, final Class<T> dtoClass) {
try {
- JAXBContext jaxbContext = JAXBContext.newInstance(dtoClass);
+ JAXBContext jaxbContext = jaxbContextFor(dtoClass);
final Marshaller marshaller = jaxbContext.createMarshaller();
@@ -67,6 +68,10 @@ public final class MemberExecutionDtoUtils {
}
}
+ private static <T> JAXBContext jaxbContextFor(final Class<T> dtoClass) {
+ return JaxbUtil.jaxbContextFor(dtoClass);
+ }
+
public static MetricsDto metricsFor(final MemberExecutionDto executionDto) {
MetricsDto metrics = executionDto.getMetrics();
if(metrics == null) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 192a9fa..bb9d9c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import javax.annotation.PostConstruct;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
@@ -59,20 +60,22 @@ public class GridLoaderServiceDefault implements GridLoaderService {
// cache (used only in prototyping mode)
private final Map<String, Grid> gridByXml = Maps.newHashMap();
- private List<Class<? extends Grid>> pageImplementations;
-
-
+ private JAXBContext jaxbContext;
@PostConstruct
public void init(){
- pageImplementations = FluentIterable.from(gridSystemServices)
- .transform(new Function<GridSystemService, Class<? extends Grid>>() {
- @Override
- public Class<? extends Grid> apply(final GridSystemService gridSystemService) {
- return gridSystemService.gridImplementation();
- }
- })
- .toList();
+ final List<Class<? extends Grid>> pageImplementations =
+ FluentIterable.from(gridSystemServices)
+ .transform(
+ (Function<GridSystemService, Class<? extends Grid>>) gss -> gss.gridImplementation())
+ .toList();
+
+ final Class[] clazz = pageImplementations.toArray(_Constants.emptyClasses);
+ try {
+ jaxbContext = JAXBContext.newInstance(clazz);
+ } catch (JAXBException e) {
+ // leave as null
+ }
}
@Override
@@ -126,10 +129,12 @@ public class GridLoaderServiceDefault implements GridLoaderService {
}
try {
- // all known implementations of Page
- final JAXBContext context = JAXBContext.newInstance(pageImplementations.toArray(new Class[0]));
-
- final Grid grid = (Grid) jaxbService.fromXml(context, xml);
+ if(jaxbContext == null) {
+ // shouldn't occur, indicates that initialization failed to locate any GridSystemService implementations.
+ return null;
+ }
+
+ final Grid grid = (Grid) jaxbService.fromXml(jaxbContext, xml);
grid.setDomainClass(domainClass);
if(supportsReloading()) {
gridByXml.put(xml, grid);
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
index 10e67e4..c126f57 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
@@ -23,6 +23,7 @@ import java.io.StringReader;
import java.io.Writer;
import java.net.URL;
import java.nio.charset.Charset;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -30,6 +31,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import com.google.common.base.Objects;
+import com.google.common.collect.MapMaker;
import com.google.common.io.Resources;
import org.hamcrest.Matcher;
@@ -73,8 +75,8 @@ class JaxbUtil2 {
final Class<T> dtoClass) {
Unmarshaller un = null;
try {
- un = getJaxbContext(dtoClass).createUnmarshaller();
- return (T) un.unmarshal(reader);
+ un = jaxbContextFor(dtoClass).createUnmarshaller();
+ return (T)un.unmarshal(reader);
} catch (JAXBException e) {
throw new RuntimeException(e);
}
@@ -100,7 +102,7 @@ class JaxbUtil2 {
Marshaller m = null;
try {
final Class<?> aClass = dto.getClass();
- m = getJaxbContext(aClass).createMarshaller();
+ m = jaxbContextFor(aClass).createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
m.marshal(dto, writer);
} catch (JAXBException e) {
@@ -108,11 +110,18 @@ class JaxbUtil2 {
}
}
- private static JAXBContext getJaxbContext(Class<?> dtoClass) {
- try {
- return JAXBContext.newInstance(dtoClass);
- } catch (JAXBException e) {
- throw new RuntimeException(e);
+ private static Map<Class<?>, JAXBContext> jaxbContextByClass = new MapMaker().concurrencyLevel(10).makeMap();
+
+ public static <T> JAXBContext jaxbContextFor(final Class<T> dtoClass) {
+ JAXBContext jaxbContext = jaxbContextByClass.get(dtoClass);
+ if(jaxbContext == null) {
+ try {
+ jaxbContext = JAXBContext.newInstance(dtoClass);
+ } catch (JAXBException e) {
+ throw new RuntimeException(e);
+ }
+ jaxbContextByClass.put(dtoClass, jaxbContext);
}
+ return jaxbContext;
}
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/06: bumps maint-1.16.2 branch versions to 1.16.2-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1ff68a7708979221cec73b28b01cec307d3b4784
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Feb 23 10:05:19 2018 +0000
bumps maint-1.16.2 branch versions to 1.16.2-SNAPSHOT
---
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 2 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 70 +++++++++++-----------
core/runtime/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
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 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/helloworld/pom.xml | 4 +-
example/application/simpleapp/application/pom.xml | 2 +-
.../application/simpleapp/module-simple/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 4 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
30 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 86dbc37..7ba29d6 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 50e15c1..8fda0ec 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 115312e..2ea03c2 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3e3646b..0d976ed 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 7a387b6..791bed0 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 6504f20..017cff4 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index ddeecf4..c94c0a0 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 697eb3d..4b473f3 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index a049146..b5fa7e1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -1141,12 +1141,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1155,14 +1155,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1171,14 +1171,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1187,7 +1187,7 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-log4j</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -1196,14 +1196,14 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1212,76 +1212,76 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<!-- webserver -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-webserver</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<!-- specsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<!-- integtestsupport -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -1290,12 +1290,12 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
@@ -1303,41 +1303,41 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-model</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-viewer-wicket-impl</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
@@ -1346,26 +1346,26 @@ ${license.additional-notes}
<dependency>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
<!-- Maven dependencies -->
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-intellij</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0aa0361..933cb3d 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 73b432f..0710fa2 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 13535bb..84fe545 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 03fc5e7..139bcb0 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 6ae7e18..2aa5072 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 25ddbfb..a23e42a 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index e3206ae..fc2a7a7 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 7a9feb3..c8f9b62 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 1bae1d0..21447e4 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index a415304..8f81d93 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 9c11554..e3fd172 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index aa7a091..97bd922 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-model</artifactId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index edf4621..f103f00 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 24ec1d8..39e20e0 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 3d2f9a8..a317f9f 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index efa8848..d710329 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -29,14 +29,14 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>helloworld</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<name>HelloWorld</name>
<packaging>war</packaging>
<properties>
- <isis.version>1.16.1</isis.version>
+ <isis.version>1.16.2-SNAPSHOT</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 90e8750..5c96b87 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-application</artifactId>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 53c9ad1..9b8c511 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-module-simple</artifactId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 35127f6..87994a4 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -29,14 +29,14 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<name>SimpleApp Parent</name>
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.1</isis.version>
+ <isis.version>1.16.2-SNAPSHOT</isis.version>
<lombok.version>1.16.18</lombok.version>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 7e8ddae..748c0e9 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.16.1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index cc04125..835fbd4 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -70,7 +70,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.1</version>
+ <version>1.16.2-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.