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 2017/05/06 10:22:24 UTC
[1/3] isis git commit: ISIS-1611: sets the default menuOrder to be
less than that of the menuOrder for all framework-provided implementations;
also updates docs and migration guide
Repository: isis
Updated Branches:
refs/heads/master 83283d66f -> 12c87da61
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
index 3be6c12..3764689 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/eventbus/EventBusServiceJdo.java
@@ -17,7 +17,6 @@
package org.apache.isis.objectstore.jdo.datanucleus.service.eventbus;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.runtime.services.eventbus.EventBusServiceDefault;
@@ -41,9 +40,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis.Hint;
* that it is automatically registered and available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
+ nature = NatureOfService.DOMAIN,
menuOrder = "0" // initialize first, so available for any services that persist objects in their @PostConstruct
)
public class EventBusServiceJdo extends EventBusServiceDefault {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index b8820fa..8ceb3ee 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.inject.Inject;
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.datastore.JDOConnection;
@@ -61,7 +60,10 @@ import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
* with {@link org.apache.isis.applib.annotation.DomainService}. Because it is implemented in the core, this means
* that it is automatically registered and available for use; no further configuration is required.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class IsisJdoSupportImpl implements IsisJdoSupport {
@Programmatic
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
index 88d4f81..6f2b637 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
@@ -19,7 +19,6 @@ package org.apache.isis.objectstore.jdo.datanucleus.service.support;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
import javax.jdo.listener.InstanceLifecycleEvent;
import org.apache.isis.applib.annotation.DomainService;
@@ -33,7 +32,8 @@ import org.apache.isis.applib.services.user.UserService;
@RequestScoped
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class TimestampService implements
javax.jdo.listener.StoreLifecycleListener {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index 72033bf..b803653 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
@@ -40,7 +39,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNeg
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class RepresentationServiceContentNegotiator implements RepresentationService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index 25fa2a3..9615f0a 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -37,7 +37,8 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.acceptheader.AcceptHeaderService;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
@RequestScoped
public class AcceptHeaderServiceForRest implements AcceptHeaderService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index d78e0e4..ac8692f 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -28,7 +28,6 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -52,10 +51,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectPrope
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
- menuOrder = "" + Integer.MAX_VALUE // default
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ContentNegotiationServiceForRestfulObjectsV1_0 implements ContentNegotiationService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index 1d09946..438eda1 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -21,13 +21,11 @@ package org.apache.isis.viewer.restfulobjects.rendering.service.conneg;
import java.util.Collection;
import java.util.List;
-import javax.inject.Inject;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Where;
@@ -51,10 +49,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectPrope
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
- menuOrder = "1500"
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + (Integer.MAX_VALUE - 10)
)
public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiationServiceAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index e4ddd5f..223d885 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -20,12 +20,10 @@ package org.apache.isis.viewer.restfulobjects.rendering.service.conneg;
import java.util.List;
-import javax.inject.Inject;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -50,10 +48,9 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMap
* </p>
*/
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
- menuOrder = "1000" // in effect, is the relative priority (lower numbers have higher priority)
+ nature = NatureOfService.DOMAIN,
+ // in effect, is the relative priority (lower numbers have higher priority)
+ menuOrder = "" + (Integer.MAX_VALUE - 20)
)
public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationServiceAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index a7458fd..b1c4102 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -43,7 +43,8 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
* for Wicket Viewer
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class DeepLinkServiceWicket implements DeepLinkService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
index f963ce8..ee84039 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/GuiceBeanProviderWicket.java
@@ -31,7 +31,8 @@ import org.apache.isis.applib.services.guice.GuiceBeanProvider;
* that uses the Injector configured for Wicket
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class GuiceBeanProviderWicket implements GuiceBeanProvider {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index f7f4b53..9fb4e55 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -33,7 +33,10 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class HintStoreUsingWicketSession implements HintStore {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
index 997a4ee..d52d579 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
@@ -34,7 +34,8 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
* An implementation that provides the locale of the current session.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class LocaleProviderWicket implements LocaleProvider {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 0cf5e5a..a280304 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -48,7 +48,8 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
* An implementation that reads from /WEB-INF/...
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class TranslationsResolverWicket implements TranslationsResolver {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index a1febfb..7390b5e 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -67,7 +67,10 @@ import org.apache.isis.core.wrapper.proxy.ProxyCreator;
* <tt>o.a.i.core:isis-core-wrapper</tt> on the classpath, the service is automatically registered; no further
* configuration is required.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class WrapperFactoryDefault implements WrapperFactory {
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
[2/3] isis git commit: ISIS-1611: sets the default menuOrder to be
less than that of the menuOrder for all framework-provided implementations;
also updates docs and migration guide
Posted by da...@apache.org.
ISIS-1611: sets the default menuOrder to be less than that of the menuOrder for all framework-provided implementations; also updates docs and migration guide
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8b4a2b90
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8b4a2b90
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8b4a2b90
Branch: refs/heads/master
Commit: 8b4a2b90ccc5742a9e980fc204481a7ef38b9a81
Parents: 83283d6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat May 6 10:57:16 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 6 10:57:16 2017 +0100
----------------------------------------------------------------------
...placing-default-service-implementations.adoc | 61 ++++++++++++++++++--
.../_migration-notes_1.14.0-to-1.15.0.adoc | 15 +++++
.../release-notes/_release-notes_1.14.0.adoc | 2 +-
.../release-notes/_release-notes_1.15.0.adoc | 18 ++++++
.../asciidoc/release-notes/release-notes.adoc | 10 +++-
.../org/apache/isis/applib/annotation/Bulk.java | 5 +-
.../isis/applib/annotation/DomainService.java | 18 +++++-
.../applib/annotation/DomainServiceLayout.java | 17 +++++-
.../ExecutionParametersService.java | 3 +-
.../actinvoc/ActionInvocationContext.java | 5 +-
.../services/audit/AuditerServiceLogging.java | 5 +-
.../ClassDiscoveryServiceUsingReflections.java | 3 +-
.../applib/services/clock/ClockService.java | 3 +-
.../applib/services/command/CommandContext.java | 3 +-
.../services/iactn/InteractionContext.java | 3 +-
.../publish/PublisherServiceLogging.java | 6 +-
.../queryresultscache/QueryResultsCache.java | 10 +++-
.../services/routing/RoutingServiceDefault.java | 9 +--
.../applib/services/scratchpad/Scratchpad.java | 3 +-
.../tablecol/TableColumnOrderService.java | 5 +-
.../UrlEncodingServiceUsingBaseEncoding.java | 3 +-
...ionRecognizerCompositeForJdoObjectStore.java | 3 +-
.../services/jaxb/JaxbServiceDefault.java | 4 +-
.../DomainServiceLayoutFacetFactory.java | 4 +-
.../appfeat/ApplicationFeatureFactory.java | 5 +-
.../ApplicationFeatureRepositoryDefault.java | 4 +-
.../BookmarkServiceInternalDefault.java | 3 +-
.../config/ConfigurationServiceDefault.java | 4 +-
.../container/DomainObjectContainerDefault.java | 6 +-
.../factory/FactoryServiceInternalDefault.java | 5 +-
.../services/grid/GridLoaderServiceDefault.java | 4 +-
.../services/grid/GridServiceDefault.java | 4 +-
.../grid/bootstrap3/GridSystemServiceBS3.java | 3 +-
.../services/layout/LayoutServiceDefault.java | 4 +-
.../message/MessageServiceInternalDefault.java | 3 +-
.../metamodel/MetaModelServiceDefault.java | 3 +-
.../MessageBrokerServiceInternalNoop.java | 5 +-
.../PersistenceSessionServiceInternalNoop.java | 5 +-
.../registry/ServiceRegistryDefault.java | 3 +-
.../RepositoryServiceInternalDefault.java | 3 +-
.../services/swagger/SwaggerServiceDefault.java | 4 +-
.../services/title/TitleServiceDefault.java | 5 +-
.../TransactionStateProviderInternalNoop.java | 5 +-
.../services/user/UserServiceDefault.java | 8 ++-
.../TransactionServiceInternalDefault.java | 3 +-
.../runtime/fixtures/SwitchUserServiceImpl.java | 7 +--
.../auditing/AuditingServiceInternal.java | 7 ++-
.../AuthenticationSessionProviderDefault.java | 5 +-
.../background/BackgroundServiceDefault.java | 4 +-
.../changes/ChangedObjectsServiceInternal.java | 5 +-
.../CommandDtoServiceInternalDefault.java | 3 +-
.../services/command/CommandServiceDefault.java | 5 +-
.../services/email/EmailServiceDefault.java | 3 +-
.../HomePageProviderServiceDefault.java | 5 +-
.../services/i18n/po/TranslationServicePo.java | 4 +-
.../InteractionDtoServiceInternalDefault.java | 7 ++-
.../services/memento/MementoServiceDefault.java | 5 +-
.../services/metrics/MetricsServiceDefault.java | 8 ++-
.../PublishingServiceInternalDefault.java | 5 +-
.../SessionManagementServiceDefault.java | 3 +-
.../services/sudo/SudoServiceDefault.java | 3 +-
.../EmailNotificationServiceDefault.java | 3 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 3 +-
.../service/eventbus/EventBusServiceJdo.java | 5 +-
.../service/support/IsisJdoSupportImpl.java | 6 +-
.../service/support/TimestampService.java | 4 +-
.../RepresentationServiceContentNegotiator.java | 4 +-
.../AcceptHeaderServiceForRest.java | 3 +-
...NegotiationServiceForRestfulObjectsV1_0.java | 7 +--
...ontentNegotiationServiceOrgApacheIsisV1.java | 8 +--
.../ContentNegotiationServiceXRoDomainType.java | 9 +--
.../viewer/services/DeepLinkServiceWicket.java | 3 +-
.../services/GuiceBeanProviderWicket.java | 3 +-
.../services/HintStoreUsingWicketSession.java | 5 +-
.../viewer/services/LocaleProviderWicket.java | 3 +-
.../services/TranslationsResolverWicket.java | 3 +-
.../core/wrapper/WrapperFactoryDefault.java | 5 +-
77 files changed, 316 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_replacing-default-service-implementations.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_replacing-default-service-implementations.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_replacing-default-service-implementations.adoc
index dea5096..402e264 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_replacing-default-service-implementations.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_replacing-default-service-implementations.adoc
@@ -8,16 +8,15 @@
The framework provides default implementations for many of the xref:../rgsvc/rgsvc.adoc#[domain services]. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.
-The trick is to use the xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute, specifying a low number (typically `"1"`).
+For example, suppose you wanted to provide your own implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_api_LocaleProvider[`LocaleProvider`].
+The trick is to use the xref:../rgant/rgant.adoc#_rgant-DomainService_menuOrder[`@DomainService#menuOrder()`] attribute, specifying a low number (typically `"1"`).
-For example, suppose you wanted to provide your own implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_api_LocaleProvider[`LocaleProvider`]. Here's how:
+Here's how:
[source,java]
----
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
+ nature = NatureOfService.DOMAIN,
menuOrder = "1" // <1>
)
public class MyLocaleProvider implements LocaleProvider {
@@ -29,8 +28,58 @@ public class MyLocaleProvider implements LocaleProvider {
----
<1> takes precedence over the default implementation.
+The framework uses the value of the `menuOrder` attribute to determine priority; lowest number wins.
+
+Thus, if a single instance is to be injected, eg:
+
+[source,java]
+----
+@javax.inject.Inject
+LocalProvider localeProvider;
+----
+
+then the custom implementation will be used in preference to the framework's default implementation.
+
+If multiple instances are injected, eg:
+
+[source,java]
+----
+@javax.inject.Inject
+List<LocalProvider> localeProviders;
+----
+
+then all implementations will be present in the list, ordered by priority; your custom implementation will be first in the list.
+
+As of `1.15.0-SNAPSHOT`, there is no need to specify the `menuOrder` attribute: its default value is now set to a lower value (specifically: `Integer.MAX_VALUE - 100`).
+Thus, the code simplifies to:
+
+[source,java]
+----
+@DomainService(nature = NatureOfService.DOMAIN)
+public class MyLocaleProvider implements LocaleProvider {
+ @Override
+ public Locale getLocale() {
+ return ...
+ }
+}
+----
+
+
+
+
+[NOTE]
+====
+It is also possible to use xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute, rather than xref:../rgant/rgant.adoc#_rgant-DomainService_menuOrder[`@DomainService#menuOrder()`].
+The general convention is to use the former only for services that are rendered in the UI, the latter for programmatic services.
+
+If both attributes are present, then the value of xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] is used.
+====
+
+
+
+== Decorating existing implementations
-It's also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the default); this is also possible and quite easy if using `1.10.0` or later:
+It's also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the default); this is also possible and quite easy:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
index 703d61f..2382a7f 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
@@ -6,6 +6,21 @@
+== Overriding framework services
+
+Domain services fall into three categories:
+
+* application services: written by the application developer and used only within the application
+* SPI services: written by the application developer but called by the framework
+* framework services: defined within the applib with a default implementation provided by the framework itself
+
+As described
+xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_replacing-default-service-implementations[here], it is possible to override framework services so that the framework uses the replacement implementation.
+Previously this required explicitly setting either xref:../rgant/rgant.adoc#_rgant_DomainService_menuOrder[`@DomainService#menuOrder()`] or xref:../rgant/rgant.adoc#_rgant_DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`].
+
+In 1.15.0, the default value for `menuOrder` has been set to a value lower than that of the framework-provided implementations, and so will a custom implementation will always take precedence over the framework implementations without having to remember to also set `menuOrder`.
+
+
== Rename of isis-viewer-wicket artifacts
The `<groupId>` and `<artifactId>` of the xref:../guides/ugvw/ugvw.adoc#[Wicket viewer] have been made consistent with other artifacts:
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.14.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.14.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.14.0.adoc
index 5857644..9b29488 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.14.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.14.0.adoc
@@ -20,7 +20,7 @@ Finally, a new `TableColumnOrderService` to allow column order to be fine-tuned.
The release also has a number of bug fixes.
Most applications written against v1.13.x should run against v1.14.0 with few if any changes.
-That said, do recommend that you read and keep in mind the xref:migration-notes#_migration-notes_1.13.0-to-1.14.0.adoc[migration notes] when you upgrade your app.
+That said, we do recommend that you read and keep in mind the xref:migration-notes#_migration-notes_1.13.0-to-1.14.0.adoc[migration notes] when you upgrade your app.
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
new file mode 100644
index 0000000..627a6a7
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
@@ -0,0 +1,18 @@
+[[_release-notes_1.15.0]]
+= 1.15.0
+:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or 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.
+:_basedir: ../
+:_imagesdir: images/
+:toc: right
+
+
+Apache Isis 1.15.0 is currently in development.
+
+The main new feature is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box.
+There have also been several improvements in the ability to tab around the UI.
+
+The version of Apache Wicket has also been upgraded from `6.x` to `7.x`.
+
+Most applications written against v1.14.x should run against v1.15.0 with few if any changes.
+That said, we do recommend that you read and keep in mind the xref:migration-notes#_migration-notes_1.14.0-to-1.15.0.adoc[migration notes] when you upgrade your app.
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
index 767ea61..0d1b111 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
@@ -21,6 +21,14 @@ This table summarises all releases of Apache Isis to date.
| Bugs
| JIRA relnotes
+| xref:r1.15.0[1.15.0]
+| (currently in development)
+| Inline prompts, Wicket 7.x
+|
+|
+|
+|
+
| xref:r1.14.0[1.14.0]
| 19-02-2017
| Actions with collection parameters, metamodel validations.
@@ -281,7 +289,7 @@ This table summarises all releases of Apache Isis to date.
-
+include::_release-notes_1.15.0.adoc[leveloffset=+1]
include::_release-notes_1.14.0.adoc[leveloffset=+1]
include::_release-notes_1.13.2.1.adoc[leveloffset=+1]
include::_release-notes_1.13.2.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
index aac9d6f..b202668 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
@@ -69,7 +69,10 @@ public @interface Bulk {
* @deprecated - see {@link org.apache.isis.applib.services.actinvoc.ActionInvocationContext}.
*/
@Deprecated
- @DomainService(nature = NatureOfService.DOMAIN)
+ @DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+ )
@RequestScoped
public static class InteractionContext {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 16dfe54..7005d37 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -61,10 +61,22 @@ public @interface DomainService {
* Same convention as {@link MemberOrder#sequence()}. If not specified, placed after any named.
* </p>
*
- * @deprecated - use {@link DomainServiceLayout#menuOrder()} instead.
+ * <p>
+ * Either this attribute or {@link DomainServiceLayout#menuOrder()} can be used; they are equivalent.
+ * Typically this attribute is used for services with a {@link #nature() nature} of
+ * {@link NatureOfService#DOMAIN domain} (these are not visible in the UI) whereas
+ * {@link DomainServiceLayout#menuOrder()} is used for services with a nature of
+ * {@link NatureOfService#VIEW_MENU_ONLY} (which do appear in the UI)
+ * </p>
+ *
+ * <p>
+ * The default value is set to "Integer.MAX_VALUE - 100" so that any domain services intended to override the
+ * default implementations provided by the framework itself will do so without having to specify the
+ * menuOrder (with the exception of <tt>EventBusServiceJdo</tt>, all framework implementations have a
+ * default order greater than Integer.MAX_VALUE - 50).
+ * </p>
*/
- @Deprecated
- String menuOrder() default "" + Integer.MAX_VALUE;
+ String menuOrder() default "" + (Integer.MAX_VALUE - 100) ;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
index 7d3bcbd..66bbd5a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/DomainServiceLayout.java
@@ -59,6 +59,21 @@ public @interface DomainServiceLayout {
* <p>
* Same convention as {@link org.apache.isis.applib.annotation.MemberOrder#sequence()}. If not specified, placed after any named.
* </p>
+ *
+ * <p>
+ * Either this attribute or {@link DomainService#menuOrder()} can be used; they are equivalent.
+ * Typically this attribute is used for services with a {@link DomainService#nature() nature} of
+ * {@link NatureOfService#VIEW_MENU_ONLY} (these are visible in the UI) whereas
+ * {@link DomainService#menuOrder()} is used for services with a nature of
+ * {@link NatureOfService#DOMAIN domain} (which do not appear in the UI).
+ * </p>
+ *
+ * <p>
+ * The default value is set to "Integer.MAX_VALUE - 100" so that any domain services intended to override the
+ * default implementations provided by the framework itself will do so without having to specify the
+ * menuOrder (with the exception of <tt>EventBusServiceJdo</tt>, all framework implementations have a
+ * default order greater than Integer.MAX_VALUE - 50).
+ * </p>
*/
- String menuOrder() default "" + Integer.MAX_VALUE;
+ String menuOrder() default "" + (Integer.MAX_VALUE - 100);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParametersService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParametersService.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParametersService.java
index 9950ed4..8f09769 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParametersService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/ExecutionParametersService.java
@@ -35,7 +35,8 @@ import org.apache.isis.applib.annotation.Programmatic;
* it
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ExecutionParametersService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
index 4c6b7ee..a75edb5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
@@ -36,7 +36,10 @@ import org.apache.isis.applib.annotation.Programmatic;
* and available for use; no further configuration is required.
* </p>
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
@RequestScoped
public class ActionInvocationContext {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
index 7cb27bd..a2d0fe8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerServiceLogging.java
@@ -31,7 +31,10 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class AuditerServiceLogging implements AuditerService {
private static final Logger LOG = LoggerFactory.getLogger(AuditerServiceLogging.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
index 5c0ca84..aec26ab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/classdiscovery/ClassDiscoveryServiceUsingReflections.java
@@ -44,7 +44,8 @@ import org.apache.isis.applib.fixturescripts.FixtureScript;
* </p>
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ClassDiscoveryServiceUsingReflections
extends AbstractService
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
index b5a5a53..5646840 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/clock/ClockService.java
@@ -35,7 +35,8 @@ import org.apache.isis.applib.clock.Clock;
* configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ClockService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
index b89d42e..5f4152f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
@@ -33,7 +33,8 @@ import org.apache.isis.applib.annotation.Programmatic;
* available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
@RequestScoped
public class CommandContext {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
index 6c2760a..1e596e5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
@@ -33,7 +33,8 @@ import org.apache.isis.applib.annotation.Programmatic;
* available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
@RequestScoped
public class InteractionContext {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index 519cfc0..83b3466 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -19,7 +19,6 @@
package org.apache.isis.applib.services.publish;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,10 @@ import org.apache.isis.schema.ixn.v1.InteractionDto;
import org.apache.isis.schema.utils.ChangesDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class PublisherServiceLogging implements PublisherService {
private static final Logger LOG = LoggerFactory.getLogger(PublisherServiceLogging.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index e63d099..8b6636c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -47,7 +47,10 @@ import org.apache.isis.applib.services.WithTransactionScope;
* {@link org.apache.isis.applib.annotation.DomainService}. This means that it is automatically registered and
* available for use; no further configuration is required.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
@RequestScoped
public class QueryResultsCache implements WithTransactionScope {
@@ -235,7 +238,10 @@ public class QueryResultsCache implements WithTransactionScope {
/**
* In separate class because {@link QueryResultsCache} itself is request-scoped
*/
- @DomainService(nature = NatureOfService.DOMAIN)
+ @DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+ )
public static class Control extends AbstractSubscriber {
@Programmatic
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
index 3707c27..72c6ee4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
@@ -18,22 +18,17 @@
*/
package org.apache.isis.applib.services.routing;
-import javax.inject.Inject;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.homepage.HomePageProviderService;
@DomainService(
- nature = NatureOfService.DOMAIN
-)
-@DomainServiceLayout(
- menuOrder = "" + Integer.MAX_VALUE // choose any lower number to override.
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class RoutingServiceDefault implements RoutingService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
index 726d0b3..e030934 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
@@ -36,7 +36,8 @@ import org.apache.isis.applib.annotation.Programmatic;
* available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
@RequestScoped
public class Scratchpad {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
index 8aa2b25..5829784 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderService.java
@@ -39,7 +39,10 @@ public interface TableColumnOrderService {
/**
* Used as a fallback.
*/
- @DomainService(nature = NatureOfService.DOMAIN)
+ @DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+ )
public static class Default implements TableColumnOrderService {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
index fdab8c3..b81e919 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
@@ -25,7 +25,8 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class UrlEncodingServiceUsingBaseEncoding implements UrlEncodingService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
index a96682b..bd94724 100644
--- a/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -42,7 +42,8 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
* </p>
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionRecognizerComposite {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
index ca021a8..a6072b8 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
@@ -16,7 +16,6 @@
*/
package org.apache.isis.schema.services.jaxb;
-import javax.inject.Inject;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
@@ -27,7 +26,8 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class JaxbServiceDefault extends JaxbService.Simple {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index f9d75a4..8054917 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -49,11 +49,11 @@ public class DomainServiceLayoutFacetFactory extends FacetFactoryAbstract {
}
final String domainServiceMenuOrder =
- domainService != null && !domainService.menuOrder().equals("" + Integer.MAX_VALUE)
+ domainService != null && !domainService.menuOrder().equals("" + (Integer.MAX_VALUE - 100))
? domainService.menuOrder()
: null;
final String domainServiceLayoutMenuOrder =
- domainServiceLayout != null && !domainServiceLayout.menuOrder().equals("" + Integer.MAX_VALUE)
+ domainServiceLayout != null && !domainServiceLayout.menuOrder().equals("" + (Integer.MAX_VALUE - 100))
? domainServiceLayout.menuOrder()
: null;
final String menuOrder = coalesce(domainServiceLayoutMenuOrder, domainServiceMenuOrder);
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
index 004dcef..85db7a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -18,14 +18,13 @@
*/
package org.apache.isis.core.metamodel.services.appfeat;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.factory.FactoryService;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ApplicationFeatureFactory {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index e9db043..3f612c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -26,7 +26,6 @@ import java.util.SortedMap;
import java.util.SortedSet;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -62,7 +61,8 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
@DomainService(
nature = NatureOfService.DOMAIN,
- repositoryFor = ApplicationFeature.class
+ repositoryFor = ApplicationFeature.class,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
index d4f9406..eaf244e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -45,7 +45,8 @@ import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
* that it is automatically registered and available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class BookmarkServiceInternalDefault implements BookmarkService2 {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
index 3afd3c2..2d18a2e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.TreeSet;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -42,7 +41,8 @@ import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServi
* TODO: unify these two type hierarchies...
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ConfigurationServiceDefault implements ConfigurationService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 7a343d3..e680994 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
import com.google.common.base.Predicate;
@@ -64,7 +63,10 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class DomainObjectContainerDefault
implements DomainObjectContainer, ExceptionRecognizer {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
index 8d028ee..7a92daa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.services.factory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import javax.inject.Inject;
-
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -37,7 +35,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class FactoryServiceInternalDefault implements FactoryService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
----------------------------------------------------------------------
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 51b49f9..3bcd2a5 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
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import javax.xml.bind.JAXBContext;
import com.google.common.base.Function;
@@ -46,7 +45,8 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class GridLoaderServiceDefault implements GridLoaderService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 990a2fc..1d05ba9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -19,7 +19,6 @@ package org.apache.isis.core.metamodel.services.grid;
import java.util.List;
import javax.annotation.Nullable;
-import javax.inject.Inject;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
@@ -38,7 +37,8 @@ import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.grid.GridSystemService;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class GridServiceDefault implements GridService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 133cad6..6d51b2a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -68,7 +68,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index 491adac..ae67369 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.inject.Inject;
import javax.xml.bind.Marshaller;
import com.google.common.base.Predicate;
@@ -49,7 +48,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class LayoutServiceDefault implements LayoutService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceInternalDefault.java
index 9ffbecf..26ef2ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/message/MessageServiceInternalDefault.java
@@ -28,7 +28,8 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class MessageServiceInternalDefault implements MessageService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 9f45b8f..5742ccc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -46,7 +46,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class MetaModelServiceDefault implements MetaModelService3 {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternalNoop.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternalNoop.java
index d6e495b..3ef1602 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/msgbroker/MessageBrokerServiceInternalNoop.java
@@ -21,7 +21,10 @@ package org.apache.isis.core.metamodel.services.msgbroker;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class MessageBrokerServiceInternalNoop implements MessageBrokerServiceInternal {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
index 280aed9..7c3c3c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternalNoop.java
@@ -32,7 +32,10 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class PersistenceSessionServiceInternalNoop implements PersistenceSessionServiceInternal {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 50511f8..6e1c057 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -30,7 +30,8 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class ServiceRegistryDefault implements ServiceRegistry2, ServicesInjectorAware {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
index 6313b50..e692dc2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
@@ -42,7 +42,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class RepositoryServiceInternalDefault implements RepositoryService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
index bad3c7d..968a93c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.services.swagger;
import java.util.Map;
import javax.annotation.PostConstruct;
-import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,8 @@ import org.apache.isis.core.metamodel.services.swagger.internal.SwaggerSpecGener
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class SwaggerServiceDefault implements SwaggerService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index e41939b..2b8004c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.services.title;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -30,7 +28,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class TitleServiceDefault implements TitleService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternalNoop.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternalNoop.java
index 7bebaa9..b565168 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternalNoop.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/transtate/TransactionStateProviderInternalNoop.java
@@ -22,7 +22,10 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.transactions.TransactionState;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class TransactionStateProviderInternalNoop implements TransactionStateProviderInternal {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index bc4e822..b7092c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -36,7 +36,8 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class UserServiceDefault implements UserService {
@@ -146,7 +147,10 @@ public class UserServiceDefault implements UserService {
}
- @DomainService(nature = NatureOfService.DOMAIN)
+ @DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+ )
public static class SudoServiceSpi implements SudoService.Spi {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/xactn/TransactionServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/xactn/TransactionServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/xactn/TransactionServiceInternalDefault.java
index f2d4ac9..df245f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/xactn/TransactionServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/xactn/TransactionServiceInternalDefault.java
@@ -26,7 +26,8 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class TransactionServiceInternalDefault implements TransactionService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
index 058b145..db3c1be 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
@@ -21,25 +21,22 @@ package org.apache.isis.core.runtime.fixtures;
import java.util.List;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
-import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class SwitchUserServiceImpl implements SwitchUserService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
index 59be442..9cb8529 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -46,7 +44,10 @@ import org.apache.isis.core.runtime.services.changes.PreAndPostValues;
/**
* Wrapper around {@link org.apache.isis.applib.services.audit.AuditingService3}. Is a no-op if there is no injected service.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class AuditingServiceInternal {
Boolean whetherCanAudit;
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
index 373a9a4..bc484bb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
@@ -27,7 +27,10 @@ import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index e4b6ecf..8282ae8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -64,7 +63,8 @@ import javassist.util.proxy.ProxyObject;
* be configured.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class BackgroundServiceDefault implements BackgroundService2 {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index d089168..063aaa6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -39,7 +39,10 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
@RequestScoped
public class ChangedObjectsServiceInternal implements WithTransactionScope {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index bcab3e3..b9c61d6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -59,7 +59,8 @@ import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.CommonDtoUtils;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class CommandDtoServiceInternalDefault implements CommandDtoServiceInternal {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
index 5f2be6e..7d2986a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
@@ -18,8 +18,6 @@ package org.apache.isis.core.runtime.services.command;
import java.util.UUID;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -29,7 +27,8 @@ import org.apache.isis.applib.services.command.CommandDefault;
import org.apache.isis.applib.services.command.spi.CommandService;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class CommandServiceDefault implements CommandService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index 5b01331..317c293 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -45,7 +45,8 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
*/
@com.google.inject.Singleton // necessary because is registered in and injected by google guice
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class EmailServiceDefault implements EmailService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 9123fc1..740d3a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -20,8 +20,6 @@ package org.apache.isis.core.runtime.services.homepage;
import java.util.List;
-import javax.inject.Inject;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +39,8 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class HomePageProviderServiceDefault implements HomePageProviderService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 7d2cda3..24b60e9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -22,7 +22,6 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,8 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class TranslationServicePo implements TranslationService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index 329b79e..fa48dc0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.runtime.services.ixn;
import java.util.List;
import java.util.UUID;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -47,7 +45,10 @@ import org.apache.isis.schema.ixn.v1.PropertyEditDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class InteractionDtoServiceInternalDefault implements InteractionDtoServiceInternal {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
index bf8e46c..c3d56b2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
@@ -19,8 +19,6 @@ package org.apache.isis.core.runtime.services.memento;
import java.util.List;
import java.util.Set;
-import javax.inject.Inject;
-
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -45,7 +43,8 @@ import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
* that it is automatically registered and available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class MementoServiceDefault implements MementoService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
index 82777c7..94b3c85 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.runtime.services.metrics;
import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
import javax.jdo.listener.InstanceLifecycleEvent;
import javax.jdo.listener.InstanceLifecycleListener;
import javax.jdo.listener.LoadLifecycleListener;
@@ -29,12 +28,15 @@ import javax.jdo.listener.LoadLifecycleListener;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
-import org.apache.isis.applib.services.WithTransactionScope;
@RequestScoped
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
public class MetricsServiceDefault implements MetricsService, InstanceLifecycleListener, LoadLifecycleListener, WithTransactionScope {
private AtomicInteger numberLoaded = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index 3b7d53c..788de3e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -75,7 +75,10 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Wrapper around {@link PublishingService}. Is a no-op if there is no injected service.
*/
-@DomainService(nature = NatureOfService.DOMAIN)
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
@RequestScoped
public class PublishingServiceInternalDefault implements PublishingServiceInternal {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 0b84fa4..577c72c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -28,7 +28,8 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class SessionManagementServiceDefault implements SessionManagementService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
index 683b834..4470bfa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
@@ -29,7 +29,8 @@ import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class SudoServiceDefault implements SudoService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
index 679b204..027d798 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -49,7 +49,8 @@ import static java.util.regex.Pattern.quote;
*/
@com.google.inject.Singleton // necessary because is registered in and injected by google guice
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class EmailNotificationServiceDefault implements EmailNotificationService {
http://git-wip-us.apache.org/repos/asf/isis/blob/8b4a2b90/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index f63378d..238cc7c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -37,7 +37,8 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
* that it is automatically registered and available for use; no further configuration is required.
*/
@DomainService(
- nature = NatureOfService.DOMAIN
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
)
public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
[3/3] isis git commit: ISIS-1611: updates to migration notes
Posted by da...@apache.org.
ISIS-1611: updates to migration notes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/12c87da6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/12c87da6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/12c87da6
Branch: refs/heads/master
Commit: 12c87da61eddc0651d6c8cc0e618a1790436f961
Parents: 8b4a2b9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat May 6 11:18:07 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 6 11:18:07 2017 +0100
----------------------------------------------------------------------
.../migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc | 5 +++++
.../src/main/asciidoc/migration-notes/migration-notes.adoc | 1 +
.../src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc | 6 +++++-
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/12c87da6/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
index 2382a7f..6089db2 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
@@ -6,6 +6,11 @@
+[NOTE]
+====
+Apache Isis 1.15.0-SNAPSHOT is currently still in development
+====
+
== Overriding framework services
Domain services fall into three categories:
http://git-wip-us.apache.org/repos/asf/isis/blob/12c87da6/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
index 34c593b..f52a613 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
@@ -10,6 +10,7 @@ Consult these notes when migrating to new versions of the framework.
+include::_migration-notes_1.14.0-to-1.15.0.adoc[leveloffset=+1]
include::_migration-notes_1.13.0-to-1.14.0.adoc[leveloffset=+1]
include::_migration-notes_1.12.0-to-1.13.0.adoc[leveloffset=+1]
include::_migration-notes_1.11.0-to-1.12.0.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/12c87da6/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
index 627a6a7..ec48ab4 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
@@ -6,7 +6,11 @@
:toc: right
-Apache Isis 1.15.0 is currently in development.
+[NOTE]
+====
+Apache Isis 1.15.0-SNAPSHOT is currently still in development
+====
+
The main new feature is inline prompts: the ability to edit a property or invoke an action (associated with a property) without requiring a modal dialog box.
There have also been several improvements in the ability to tab around the UI.