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/10/06 08:35:52 UTC
[isis] 11/13: removes @Bookmarkable annotation;
removes @Debug, @Exploration and @Prototype annotations +
supporting facets
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 701cc9a8f0f03a2dbe713dccf8fe9c4ed300d3c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 5 17:08:32 2017 +0300
removes @Bookmarkable annotation; removes @Debug, @Exploration and @Prototype annotations + supporting facets
---
.../guides/rgant/_rgant_aaa_deprecated.adoc | 33 +------
.../src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc | 20 +++-
.../org/apache/isis/applib/annotation/Debug.java | 38 -------
.../apache/isis/applib/annotation/Exploration.java | 38 -------
.../apache/isis/applib/annotation/Prototype.java | 36 -------
.../action/ActionAnnotationFacetFactory.java | 19 +---
.../PrototypeFacetForPrototypeAnnotation.java | 47 ---------
.../PrototypeFacetForExplorationAnnotation.java | 36 -------
...totypeFacetForExplorationAnnotationFactory.java | 71 --------------
...ava => BookmarkPolicyFacetFallbackFactory.java} | 5 +-
...okmarkPolicyFacetViaBookmarkableAnnotation.java | 37 -------
.../dflt/ProgrammingModelFacetsJava5.java | 7 +-
.../PrototypeFacetAnnotationFactoryTest.java | 2 -
...kmarkableAnnotationFacetFactoryTest_action.java | 6 +-
...peFacetForExplorationAnnotationFactoryTest.java | 68 -------------
...okmarkableAnnotationFacetFactoryTest_class.java | 22 +----
todo-deprecation-list.txt | 109 ++++++++++++---------
17 files changed, 90 insertions(+), 504 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index 3baf515..875f436 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -22,13 +22,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Layer
|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
-|`@Bookmarkable`
-|Whether (and how) to create a bookmark for visited object.
-|xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_bookmarking[`@DomainObjectLayout` +
-`#bookmarking()`]
-|UI
-|
-
|`@Bulk`
|Indicates an action is a bulk action, can be applied to multiple instances.
|xref:../rgant/rgant.adoc#_rgant-Action_invokeOn[`@Action#invokeOn()`]
@@ -38,13 +31,7 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|`@Command`
|Action invocation should be reified as a command object, optionally persistable for profiling and enhanced auditing, and background/async support.
|xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#command()`]
-|Domain
-|
-
-|`@Debug`
-|Action only invokable in debug mode.
-|Not supported by either the xref:../ugvw/ugvw.adoc#[Wicket viewer] or the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead (xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
-|UI
+q|Domain
|
@@ -54,12 +41,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|UI, Domain
|Yes
-|`@Exploration`
-|Action available in special 'exploration' mode.
-|Not supported by either the xref:../ugvw/ugvw.adoc#[Wicket viewer] or the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead (xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
-|UI
-|
-
|`@Hidden`
|Object member is not visible, or on domain service (to indicate that none of its actions are visible).
|For domain object members, use `#hidden()` attribute of xref:../rgant/rgant.adoc#_rgant-Action_hidden[`Action`], xref:../rgant/rgant.adoc#_rgant-Property_hidden[`Property`] or xref:../rgant/rgant.adoc#_rgant-Collection_hidden[`Collection`]. +
@@ -126,18 +107,6 @@ Also part of the toString representation of bookmarks, if using the Bookmark Ser
|
-|`@Prototype`
-|Indicates that an action should only be visible in 'prototype' mode.
-|xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`]
-|UI
-|Yes
-
-|`@QueryOnly`
-|Whether an action is query-only (has no side-effects).
-|xref:../rgant/rgant.adoc#_rgant-Action_semantics[`@Action#semantics()`]
-|Domain
-|
-
|`@RegEx`
|Validate change to value of string property.
|`#regexPattern()` for xref:../rgant/rgant.adoc#_rgant-Property_regexPattern[`@Property`] or xref:../rgant/rgant.adoc#_rgant-Property_regexPattern[`@Parameter`].
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc
index f3e3eeb..fcf3605 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc
@@ -1,5 +1,5 @@
[[_tg_pet-clinic]]
-= Pet Clinic (<= 1.13.1)
+= Pet Clinic (up to v1.13.1)
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:_basedir: ../../
:_imagesdir: images/
@@ -8,6 +8,12 @@
This is a step-by-step tutorial to build up a simple "petclinic" application, starting from the xref:../../guides/ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
It was originally written by Jeroen van der Wal.
+[WARNING]
+====
+Due to changes in the structure of the simpleapp archetype, this tutorial does not work for any version later than v1.13.1
+====
+
+
It consists of just three domain classes (http://yuml.me/edit/3db2078c[http://yuml.me/3db2078c]):
image::{_imagesdir}tutorials/pet-clinic/domain-model.png[link="{_imagesdir}tutorials/pet-clinic/domain-model.png"]
@@ -316,8 +322,12 @@ Note that `Pet` has both both Isis and JDO annotations:
strategy=VersionStrategy.VERSION_NUMBER,
column="version")
@javax.jdo.annotations.Unique(name="Pet_name_UNQ", members = {"name"}) // <4>
-@ObjectType("PET") // <5>
-@Bookmarkable // <6>
+@DomainObject(
+ objectType = "PET" // <5>
+)
+@DomainObjectLayout(
+ bookmarking = BookmarkPolicy.AS_ROOT // <6>
+)
public class Pet implements Comparable<Pet> {
...
}
@@ -329,8 +339,8 @@ where:
<2> `@DatastoreIdentity` specify a surrogate `Id` column to be used as the primary key
<3> `@Version` provides support for optimistic locking
<4> `@Unique` enforces a uniqueness constraint so that no two `Pet`s can have the same name (unrealistic, but can refactor later)
-<5> `@ObjectType` is used by Apache Isis for its own internal "OID" identifier; this also appears in the URL in Apache Isis' Wicket viewer and REST API
-<6> `@Bookmarkable` indicates that the object can be automatically bookmarked in Apache Isis' Wicket viewer
+<5> used by Apache Isis for its own internal "OID" identifier; this also appears in the URL in Apache Isis' Wicket viewer and REST API
+<6> indicates that the object can be automatically bookmarked in Apache Isis' Wicket viewer
[NOTE]
====
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
deleted file mode 100644
index e5d6a1a..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is ignored.
- *
- * @deprecated - use {@link org.apache.isis.applib.annotation.Action#restrictTo()} for prototype-mode
- */
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface Debug {
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java
deleted file mode 100644
index df41566..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Exploration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates the an action should be only available in exploration mode
- *
- * @deprecated - very similar to {@link org.apache.isis.applib.annotation.Prototype}.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Exploration {
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java
deleted file mode 100644
index fe5626a..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Prototype.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @deprecated - use {@link org.apache.isis.applib.annotation.Action#restrictTo()} ()} instead.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Prototype {
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 20b79b7..9c06de4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Command;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.Prototype;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -53,7 +52,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForPrototypeAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation;
@@ -79,7 +77,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
private final MetaModelValidatorForDeprecatedAnnotation commandValidator = new MetaModelValidatorForDeprecatedAnnotation(Command.class);
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
- private final MetaModelValidatorForDeprecatedAnnotation prototypeValidator = new MetaModelValidatorForDeprecatedAnnotation(Prototype.class);
@@ -212,19 +209,11 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
- // check for deprecated @Prototype
- final Prototype annotation = Annotations.getAnnotation(method, Prototype.class);
- final PrototypeFacet facet1 = PrototypeFacetForPrototypeAnnotation.create(annotation, holder,
+ // search for @Action(restrictTo=...)
+ final Action action = Annotations.getAnnotation(method, Action.class);
+ PrototypeFacet facet = PrototypeFacetForActionAnnotation.create(action, holder,
getDeploymentCategory());
- FacetUtil.addFacet(prototypeValidator.flagIfPresent(facet1, processMethodContext));
- PrototypeFacet facet = facet1;
- // else search for @Action(restrictTo=...)
- final Action action = Annotations.getAnnotation(method, Action.class);
- if(facet == null) {
- facet = PrototypeFacetForActionAnnotation.create(action, holder,
- getDeploymentCategory());
- }
FacetUtil.addFacet(facet);
}
@@ -366,7 +355,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
metaModelValidator.add(commandValidator);
metaModelValidator.add(hiddenValidator);
metaModelValidator.add(disabledValidator);
- metaModelValidator.add(prototypeValidator);
}
// ///////////////////////////////////////////////////////////////
@@ -381,7 +369,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
commandValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
disabledValidator.setConfiguration(configuration);
- prototypeValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
deleted file mode 100644
index 7afba4e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.action.prototype;
-
-import org.apache.isis.applib.annotation.Prototype;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class PrototypeFacetForPrototypeAnnotation extends PrototypeFacetAbstract {
-
- public PrototypeFacetForPrototypeAnnotation(
- final FacetHolder holder,
- final DeploymentCategory deploymentCategory) {
- super(holder, deploymentCategory);
- }
-
-
- public static PrototypeFacet create(
- final Prototype annotation,
- final FacetHolder holder,
- final DeploymentCategory deploymentCategory) {
- return annotation == null ? null : new PrototypeFacetForPrototypeAnnotation(holder, deploymentCategory);
- }
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java
deleted file mode 100644
index 484936e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.exploration.annotation;
-
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class PrototypeFacetForExplorationAnnotation extends PrototypeFacetAbstract {
-
- public PrototypeFacetForExplorationAnnotation(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
- super(holder, deploymentCategory);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java
deleted file mode 100644
index c8fd42a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.exploration.annotation;
-
-import org.apache.isis.applib.annotation.Exploration;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedExplorationFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
-import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * {@link PrototypeFacet} can also be installed via a naming convention, see
- * {@link ActionNamedExplorationFacetFactory}.
- */
-public class PrototypeFacetForExplorationAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Exploration.class);
-
- public PrototypeFacetForExplorationAnnotationFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final Exploration annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Exploration.class);
- final PrototypeFacet facet = create(annotation, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private PrototypeFacet create(final Exploration annotation, final FacetHolder holder) {
- return annotation == null ? null : new PrototypeFacetForExplorationAnnotation(holder, getDeploymentCategory());
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- validator.setConfiguration(servicesInjector.getConfigurationServiceInternal());
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
index 17bf942..b00cd62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -38,9 +37,9 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorCom
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-public class BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
+public class BookmarkPolicyFacetFallbackFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
- public BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory() {
+ public BookmarkPolicyFacetFallbackFactory() {
super(FeatureType.OBJECTS_AND_ACTIONS);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotation.java
deleted file mode 100644
index 22ac3aa..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable;
-
-import org.apache.isis.applib.annotation.BookmarkPolicy;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
-
-
-/**
- * @deprecated
- */
-@Deprecated
-public class BookmarkPolicyFacetViaBookmarkableAnnotation extends BookmarkPolicyFacetAbstract {
-
- public BookmarkPolicyFacetViaBookmarkableAnnotation(BookmarkPolicy bookmarkPolicy, FacetHolder facetHolder) {
- super(bookmarkPolicy, facetHolder);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 2eb697c..caba59c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -21,7 +21,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.action.ActionChoicesForCollectionParameterFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.PrototypeFacetForExplorationAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation.NotContributedFacetAnnotationFactory;
@@ -56,7 +55,7 @@ import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenF
import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ViewModelSemanticCheckingFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory;
+import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacetFactory;
import org.apache.isis.core.metamodel.facets.object.callbacks.LoadCallbackFacetFactory;
import org.apache.isis.core.metamodel.facets.object.callbacks.PersistCallbackFacetFactory;
@@ -278,7 +277,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new MemberGroupLayoutFacetFactory());
- addFactory(new BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory());
+ addFactory(new BookmarkPolicyFacetFallbackFactory());
addFactory(new HomePageFacetAnnotationFactory());
addFactory(new DefaultedFacetAnnotationElseConfigurationFactory());
@@ -294,8 +293,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new EncodableFacetAnnotationElseConfigurationFactory());
- addFactory(new PrototypeFacetForExplorationAnnotationFactory());
-
addFactory(new NotContributedFacetAnnotationFactory());
addFactory(new NotInServiceMenuFacetAnnotationFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index 7702747..083a0d5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.Prototype;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -52,7 +51,6 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
public void testAnnotationPickedUp() {
class Customer {
@SuppressWarnings("unused")
- @Prototype
public void someAction() {
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/bookmarkable/BookmarkableAnnotationFacetFactoryTest_action.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/bookmarkable/BookmarkableAnnotationFacetFactoryTest_action.java
index d3df165..732c271 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/bookmarkable/BookmarkableAnnotationFacetFactoryTest_action.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/bookmarkable/BookmarkableAnnotationFacetFactoryTest_action.java
@@ -26,17 +26,17 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetAbstract;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory;
+import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
public class BookmarkableAnnotationFacetFactoryTest_action extends AbstractFacetFactoryTest {
- private BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory facetFactory;
+ private BookmarkPolicyFacetFallbackFactory facetFactory;
@Override
protected void setUp() throws Exception {
super.setUp();
- facetFactory = new BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory();
+ facetFactory = new BookmarkPolicyFacetFallbackFactory();
}
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java
deleted file mode 100644
index 7aabfca..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.exploration;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.Exploration;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.PrototypeFacetForExplorationAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
-import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
-
-public class PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private PrototypeFacetForExplorationAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new PrototypeFacetForExplorationAnnotationFactory();
- facetFactory.setServicesInjector(stubServicesInjector);
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testExplorationAnnotationPickedUp() {
- class Customer {
- @SuppressWarnings("unused")
- @Exploration
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(PrototypeFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof PrototypeFacetAbstract);
-
- assertNoMethodsRemoved();
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
index d3d9147..3c43626 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkableAnnotationFacetFactoryTest_class.java
@@ -23,21 +23,20 @@ import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetViaBookmarkableAnnotation;
-import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory;
+import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetFallbackFactory;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public class BookmarkableAnnotationFacetFactoryTest_class extends AbstractFacetFactoryTest {
- private BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory facetFactory;
+ private BookmarkPolicyFacetFallbackFactory facetFactory;
@Override
protected void setUp() throws Exception {
super.setUp();
- facetFactory = new BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory();
+ facetFactory = new BookmarkPolicyFacetFallbackFactory();
}
@Override
@@ -46,21 +45,6 @@ public class BookmarkableAnnotationFacetFactoryTest_class extends AbstractFacetF
super.tearDown();
}
- public void testBookmarkableAnnotationPickedUpOnClass() {
- class Customer {
- }
-
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(BookmarkPolicyFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof BookmarkPolicyFacetViaBookmarkableAnnotation);
- BookmarkPolicyFacet bookmarkableFacet = (BookmarkPolicyFacet) facet;
- assertThat(bookmarkableFacet.value(), is(BookmarkPolicy.AS_CHILD));
-
- assertNoMethodsRemoved();
- }
-
public void testBookmarkablePolicyInferredPickedUpOnClassAndDefaultsToAlways() {
class Customer {
}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index f7e78af..91079c0 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -13,21 +13,14 @@ org.apache.isis.applib
org.apache.isis.applib.annotation
-
Bulk.java - entire annotation, use @Action(invokeOn=...)
Bulk.InteractionContext - entire service, use ActionInvocationContext service instead
InvokedOn.java - entire enum, along with @Bulk annotation.
-
- Audited.java - entire annotation, use @DomainObject(audited=...)
-
Command.java - entire annotation, use @Action(command=...) instead
CommandExecuteIn.java - entire annotation, use @Action(commandExecuteIn=...) instead
CommandPersistence.java - entire annotation, use @Action(commandPersistence=...) instead
- Debug.java - entire annotation, use @Action#(restrictTo=...) instead
- Exploration.java - entire annotation, use @Action(restrictTo=....) instead
- Prototype.java - entire annotation, use @Action(restrictTo=....) instead
Disabled.java - entire annotation, use @Property(editingDisabledReason=...) instead
Hidden.java - entire annotation, use @Property(hidden=...), @Collection(hidden=...), @Action(hidden=...)
@@ -158,47 +151,6 @@ org.apache.isis.objectstore.jdo.applib.service.support
-PROPOSE TO RETAIN:
-
-
-Below is the code currently deprecated in the applib, but I propose to retain even in 2.0.0 (on the grounds that a replacement for them is not fully designed):
-org.apache.isis.applib.adapters - custom value type support
-
-
-org.apache.isis.applib.annotation
-
- Encodable.java - entire annotation, part of custom value types support
- Parseable.java - entire annotation, part of custom value types support
-
-
-org.apache.isis.applib.fixtures - "legacy" fixture support package ... by and large can use FixtureScripts (though not sure if there's feature parity in all cases)
- AbstractFixture.java
- AbstractFixtureSusa.java
- BaseFixture.java
- CompositeFixture.java
- DateFixture.java
- LogonFixture.java
-org.apache.isis.applib.fixtures.switchuser
- SwitchUserService.java
- SwitchUserServiceAware.java
-
-org.apache.isis.applib.services.command
- Command.java - methods that pertain to the execution of the command and its completion (for that, use Interaction) [suggest we retain for now]
- getCompletedAt()
- getException()
- getResult()
- getStartedAt()
- next(String)
- setCompletedAt(Timestamp)
- setStartedAt(Timestamp)
- Command3.java - metods for working with domain events (equiv functionality in Interaction) [suggest we retain for now]
- flushActionDomainEvents()
- peekActionDomainEvent()
- popActionDomainEvent()
- pushActionDomainEvent(ActionDomainEvent<?>) (
-
- MemberGroupLayout.java - entire annotation, use Xxx.layout.xml instead
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,8 +181,16 @@ Also for 2.0.0, new features/deprecations:
OTHER STUFF:
+remove explorationXxx() prefix
+remove prototypeXxx() prefix
+remove debugXxx() prefix
+
+
debug() stuff
+DebugDataInputExtended & DebugDataOutputExtended .... seem to be unused
+
+
ObjectFixtureService
@@ -280,6 +240,52 @@ link:https://issues.apache.org/jira/browse/ISIS-743[ISIS-743] - @NotPersistable
*************************************************************************
+PROPOSE TO RETAIN:
+
+
+Below is the code currently deprecated in the applib, but I propose to retain even in 2.0.0 (on the grounds that a replacement for them is not fully designed):
+org.apache.isis.applib.adapters - custom value type support
+
+
+org.apache.isis.applib.annotation
+
+ Encodable.java - entire annotation, part of custom value types support
+ Parseable.java - entire annotation, part of custom value types support
+
+
+org.apache.isis.applib.fixtures - "legacy" fixture support package ... by and large can use FixtureScripts (though not sure if there's feature parity in all cases)
+ AbstractFixture.java
+ AbstractFixtureSusa.java
+ BaseFixture.java
+ CompositeFixture.java
+ DateFixture.java
+ LogonFixture.java
+org.apache.isis.applib.fixtures.switchuser
+ SwitchUserService.java
+ SwitchUserServiceAware.java
+
+org.apache.isis.applib.services.command
+ Command.java - methods that pertain to the execution of the command and its completion (for that, use Interaction) [suggest we retain for now]
+ getCompletedAt()
+ getException()
+ getResult()
+ getStartedAt()
+ next(String)
+ setCompletedAt(Timestamp)
+ setStartedAt(Timestamp)
+ Command3.java - metods for working with domain events (equiv functionality in Interaction) [suggest we retain for now]
+ flushActionDomainEvents()
+ peekActionDomainEvent()
+ popActionDomainEvent()
+ pushActionDomainEvent(ActionDomainEvent<?>) (
+
+ MemberGroupLayout.java - entire annotation, use Xxx.layout.xml instead
+
+
+
+
+*************************************************************************
+
DONE:
removed support for Xxx.layout.json
@@ -316,6 +322,7 @@ org.apache.isis.applib.annotation
PublishingPayloadFactoryForAction.java - entire annotation, replaced with simpler PublisherService SPI
PublishingPayloadFactoryForObject.java - entire annotation, replaced with simpler PublisherService SPI
+
AutoComplete.java - entire annotation, use @DomainObject(autoComplete...=...)
Bookmarkable.java - entire annotation, use @DomainObjectLayout(bookmarking=...)
@@ -329,6 +336,8 @@ org.apache.isis.applib.annotation
Aggregated.java - entire annotation, not supported internally
+ Audited.java - entire annotation, use @DomainObject(audited=...)
+
Bounded.java - entire annotation, use @DomainObject(bounded=...)
CollectionLayout.java
@@ -340,6 +349,10 @@ org.apache.isis.applib.annotation
CssClass.java - entire annotation, use @XxxLayout(cssClass=...) instead, where Xxx is Property, Collection, Action, Parameter, DomainObject, ViewModel
CssClassFa.java - entire annotation, use @XxxLayout(cssClass=...) instead, where Xxx is Property, Collection, Action, Parameter, DomainObject, ViewModel
+ Debug.java - entire annotation, use @Action#(restrictTo=...) instead
+ Exploration.java - entire annotation, use @Action(restrictTo=....) instead
+ Prototype.java - entire annotation, use @Action(restrictTo=....) instead
+
DescribedAs.java - entire annotation, use @XxxLayout(describedAs=...) instead
Mask.java - entire annotation, not supported by either Wicket viewer or RO viewer
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.