[isis] branch master updated: FIX ISIS-1738 (#97)

2017-10-06 Thread ahuber 
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
 new 742eacc  FIX ISIS-1738 (#97)
742eacc is described below

commit 742eacc6587c8e09632c438ec8c88cc7c8593bc0
Author: Andi Huber 
AuthorDate: Fri Oct 6 23:02:05 2017 +0200

FIX ISIS-1738 (#97)
---
 .../core/metamodel/spec/feature/ObjectMember.java  | 30 +-
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index 39b2177..c7721e5 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -25,10 +25,6 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-
 import org.apache.isis.applib.annotation.When;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -36,7 +32,10 @@ import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
 import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
+import 
org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderFacetComparator;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
 
 /**
  * Provides reflective access to an action or a field on a domain object.
@@ -205,19 +204,14 @@ public interface ObjectMember extends ObjectFeature {
 public static class Comparators {
 public static Comparator byMemberOrderSequence() {
 return new Comparator() {
-private final DeweyOrderComparator deweyOrderComparator = new 
DeweyOrderComparator();
-@Override
-public int compare(final ObjectMember o1, final ObjectMember 
o2) {
-final MemberOrderFacet o1Facet = 
o1.getFacet(MemberOrderFacet.class);
-final MemberOrderFacet o2Facet = 
o2.getFacet(MemberOrderFacet.class);
-String memberId1 = o1.getId();
-String memberId2 = o2.getId();
-String o1Sequence = o1Facet != null ? o1Facet.sequence() : 
"0";
-String o2Sequence = o2Facet != null ? o2Facet.sequence() : 
"0";
-return o1Facet == null? +1:
-o2Facet == null? -1:
-deweyOrderComparator.compare(o1Sequence, 
o2Sequence);
-}
+private final MemberOrderFacetComparator 
memberOrderFacetComparator = 
+   new MemberOrderFacetComparator(false);
+ @Override
+ public int compare(final ObjectMember o1, final ObjectMember 
o2) {
+   return memberOrderFacetComparator.compare(
+   o1.getFacet(MemberOrderFacet.class),
+   o2.getFacet(MemberOrderFacet.class));
+ }
 };
 }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" '].

[isis] 11/13: removes @Bookmarkable annotation; removes @Debug, @Exploration and @Prototype annotations + supporting facets

2017-10-06 Thread danhaywood 
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 
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

[isis] 12/13: ISIS-1742: deletes AbstractService, AbstractViewModel, AbstractContainedObject, AbstractDomainObject, AbstractFactoryAndRepository, AbstractHomePageDashboardService. Also deletes allInst

2017-10-06 Thread danhaywood 
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 7513e83db0d20cb1ddff0a7d4ba314d6998cb584
Author: Dan Haywood 
AuthorDate: Thu Oct 5 17:49:10 2017 +0300

ISIS-1742: deletes AbstractService, AbstractViewModel, 
AbstractContainedObject, AbstractDomainObject, AbstractFactoryAndRepository, 
AbstractHomePageDashboardService.  Also deletes 
allInstances/allMatches/firstMatch/uniqueMatch from DomainObjectContainer.

In so doing, allows us to remove QueryFindByPattern and QueryFindByTitle 
and corresponding PersistenceQuery... and to simplify those hierarchies.
---
 .../isis/applib/AbstractContainedObject.java   | 808 -
 .../apache/isis/applib/AbstractDomainObject.java   | 144 
 .../isis/applib/AbstractFactoryAndRepository.java  |  47 --
 .../org/apache/isis/applib/AbstractService.java|   2 +-
 .../org/apache/isis/applib/AbstractViewModel.java  |   2 +-
 .../apache/isis/applib/DomainObjectContainer.java  | 218 --
 .../apache/isis/applib/fixtures/BaseFixture.java   |   3 +-
 .../isis/applib/fixturescripts/FixtureScript.java  |   2 +-
 .../isis/applib/fixturescripts/FixtureScripts.java |  27 +-
 .../isis/applib/query/QueryBuiltInAbstract.java|  58 --
 .../isis/applib/query/QueryFindAllInstances.java   |   2 +-
 .../homepage/AbstractHomePageDashboardService.java |  97 ---
 .../apache/isis/applib/ContainedObjectTest.java| 107 ---
 .../isis/applib/FactoryAndRepositoryTest.java  | 122 
 .../annotation/HomePageFacetAnnotationFactory.java |   5 -
 .../container/DomainObjectContainerDefault.java| 136 
 .../container/query/QueryFindByPattern.java|  57 --
 .../services/container/query/QueryFindByTitle.java |  56 --
 .../DomainObjectWithMustSatisfyAnnotations.java|   7 +-
 .../DomainObjectWithoutMustSatisfyAnnotations.java |   8 +-
 .../query/PersistenceQueryAbstract.java|  32 +-
 .../persistence/query/PersistenceQueryBuiltIn.java |  45 --
 .../query/PersistenceQueryBuiltInAbstract.java |  74 --
 .../query/PersistenceQueryFindAllInstances.java|  29 +-
 .../query/PersistenceQueryFindByPattern.java   | 117 ---
 .../query/PersistenceQueryFindByTitle.java |  66 --
 ...ersistenceQueryFindUsingApplibQueryDefault.java |  35 +-
 ...tenceQueryFindUsingApplibQuerySerializable.java |  89 ---
 .../persistence/PersistenceQueryFactory.java   |  23 +-
 .../progmodel/wrapper/dom/employees/Employee.java  |   5 +-
 todo-deprecation-list.txt  |  13 +-
 31 files changed, 60 insertions(+), 2376 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java 
b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
deleted file mode 100644
index 98e53a3..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
+++ /dev/null
@@ -1,808 +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;
-
-import java.util.List;
-
-import com.google.common.base.Predicate;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.applib.services.registry.ServiceRegistry2;
-import org.apache.isis.applib.services.user.UserService;
-
-/**
- * Convenience super class for all classes that wish to interact with the
- * container.
- * 
- * @see org.apache.isis.applib.DomainObjectContainer
- */
-public abstract class AbstractContainedObject {
-
-/**
- * Create a new instance of the specified class, but do not persist it.
- *
- * 
- * It is recommended that the object be initially instantiated using
- * this method, though the framework will also handle the case when 
- * the object is simply new()ed up.  The benefits of using
- * {@link

[isis] 01/13: ISIS-1742: removes @NotPersistable annotation + supporting facets

2017-10-06 Thread danhaywood 
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 e2921207e02816452af1cc5a7c0b07e310279c6f
Author: Dan Haywood 
AuthorDate: Thu Oct 5 15:46:40 2017 +0300

ISIS-1742: removes @NotPersistable annotation + supporting facets
---
 .../asciidoc/guides/rgant/_rgant_aaa_partial.adoc  | 19 -
 .../isis/applib/annotation/NotPersistable.java | 66 ---
 .../apache/isis/applib/marker/NonPersistable.java  | 30 ---
 .../apache/isis/applib/security/RoleMemento.java   |  2 -
 .../apache/isis/applib/security/UserMemento.java   |  2 -
 .../facets/fallback/FallbackFacetFactory.java  |  3 +-
 .../facets/fallback/NotPersistableFacetNull.java   | 46 --
 .../object/notpersistable/NotPersistableFacet.java | 36 
 .../NotPersistableFacetAbstract.java   | 37 
 .../notpersistable/NotPersistableFacetImpl.java| 50 ---
 .../NotPersistableFacetAnnotation.java | 32 ---
 .../NotPersistableFacetAnnotationFactory.java  | 90 
 .../NotPersistableFacetMarkerInterface.java| 32 ---
 .../NotPersistableFacetMarkerInterfaceFactory.java | 90 
 .../update/PropertySetAndClearFacetFactory.java|  1 -
 .../core/metamodel/spec/ObjectSpecification.java   |  9 --
 .../isis/core/metamodel/spec/Persistability.java   | 54 
 .../specimpl/ObjectSpecificationAbstract.java  | 26 --
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  1 -
 .../dflt/ProgrammingModelFacetsJava5.java  |  5 --
 .../NotPersistableFacetAnnotationFactoryTest.java  | 98 --
 ...PersistableMarkerInterfaceFacetFactoryTest.java | 80 --
 .../ObjectReflectorDefaultTest_object.java |  2 -
 .../testspec/ObjectSpecificationStub.java  | 14 
 .../fixturedomainservice/ObjectFixtureService.java | 10 +--
 .../system/persistence/PersistenceSession.java |  5 +-
 .../system/JavaObjectMarkedAsTransient.java| 26 --
 .../domainobjects/DomainObjectReprRenderer.java|  4 -
 todo-deprecation-list.txt  | 23 -
 29 files changed, 26 insertions(+), 867 deletions(-)

diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
index ee0c0f6..6b66307 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_partial.adoc
@@ -33,25 +33,6 @@ For these reasons the `@Encodable` annotation is generally 
never applied directl
 Currently neither the Wicket viewer nor the RO viewer use this API.  The 
Wicket viewer uses Wicket APIs, while RO viewer has its own mechanisms (parsing 
data from input JSON representations, etc.)
 |Persistence
 
-|`@NotPersistable`
-|Indicates that a domain object may not be programmatically persisted. +
-+
-This annotation  indicates that transient instances of this class may be 
created but may not be persisted. The framework will not provide the user with 
an option to 'save' the object, and attempting to persist such an object 
programmatically would be an error.
-
-For example:
-
-[source,java]
-
-@NotPersistable(By.USER)
-public class InputForm {
-...
-}
-
-
-By default the annotated object is effectively transient (ie default to 
`By.USER_OR_PROGRAM`).
-
-This annotation is not supported by: Wicket viewer (which does not support 
transient objects).  See also 
link:https://issues.apache.org/jira/browse/ISIS-743[ISIS-743] contemplating the 
removal of this annotation.
-|Domain, Persistence
 
 |`@Parseable`
 |Indicates that a (value) class can be reconstructed from a string. +
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java
 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java
deleted file mode 100644
index 83d5225..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotPersistable.java
+++ /dev/null
@@ -1,66 +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

[isis] 07/13: ISIS-1742: deletes @Auditable annotation + Auditable marker inteface (both applib and jdo applib) + supporting facets and facet factories

2017-10-06 Thread danhaywood 
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 91ac16aafe8a95a6be39013bee7ea11eb8a283ea
Author: Dan Haywood 
AuthorDate: Thu Oct 5 16:05:52 2017 +0300

ISIS-1742: deletes @Auditable annotation + Auditable marker inteface (both 
applib and jdo applib) + supporting facets and facet factories
---
 .../guides/rgant/_rgant_aaa_deprecated.adoc|  7 --
 .../org/apache/isis/applib/annotation/Audited.java | 43 --
 .../org/apache/isis/applib/marker/Auditable.java   | 43 --
 .../apache/isis/applib/marker/package-info.java| 28 --
 .../jdo/applib/annotations/Auditable.java  | 36 
 .../isis/objectstore/jdo/applib/Auditable.java | 26 --
 .../facets/object/audit/AuditableFacet.java|  2 -
 .../markerifc/AuditableFacetMarkerInterface.java   | 33 
 .../AuditableFacetMarkerInterfaceFactory.java  | 50 ---
 .../DomainObjectAnnotationFacetFactory.java| 19 +
 .../AuditableFacetForAuditedAnnotation.java| 43 --
 ...AuditableAnnotationInJdoApplibFacetFactory.java | 81 --
 .../AuditableFacetAnnotationInJdoApplib.java   | 33 
 .../AuditableFacetMarkerInterfaceInJdoApplib.java  | 32 ---
 ...ableMarkerInterfaceInJdoApplibFacetFactory.java | 56 
 .../dflt/ProgrammingModelFacetsJava5.java  |  3 -
 .../DomainObjectAnnotationFacetFactoryTest.java| 36 
 .../GivenAuditableAnnotationFacetFactoryTest.java  | 99 --
 ...enAuditableFacetMarkerInterfaceFactoryTest.java | 99 --
 .../PersistenceSessionFactoryMetamodelRefiner.java |  4 -
 todo-deprecation-list.txt  |  6 +-
 21 files changed, 5 insertions(+), 774 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 6891776..00d78a8 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]?
 
-|`@Audited`
-|Audit changes to an object.
-|xref:../rgant/rgant.adoc#_rgant-DomainObject_auditing[`@DomainObject#` +
-`auditing()`]
-|Domain
-|
-
 |`@AutoComplete`
 |Repository method to search for entities
 
|xref:../rgant/rgant.adoc#_rgant-DomainObject_autoCompleteRepository[`@DomainObject`
 +
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Audited.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Audited.java
deleted file mode 100644
index 5726579..000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Audited.java
+++ /dev/null
@@ -1,43 +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 - see {@link DomainObject#auditing()}.
- */
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface Audited {
-
-/**
- * @deprecated - use {@link DomainObject#auditing()} instead.
- */
-@Deprecated
-boolean disabled() default false;
-
-}
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java 
b/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java
deleted file mode 100644
index c3cc052..000
--- a/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE

[isis] 08/13: ISIS-1742: deletes unused nested test classes from unit tests

2017-10-06 Thread danhaywood 
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 15002127135b3d3065f0408da8c5a148ec60c71b
Author: Dan Haywood 
AuthorDate: Thu Oct 5 16:07:27 2017 +0300

ISIS-1742: deletes unused nested test classes from unit tests
---
 .../object/domainobject/DomainObjectAnnotationFacetFactoryTest.java | 6 --
 1 file changed, 6 deletions(-)

diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 91e24bf..6c1ac60 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -116,9 +116,6 @@ public class DomainObjectAnnotationFacetFactoryTest extends 
AbstractFacetFactory
 
 public static class Auditing extends 
DomainObjectAnnotationFacetFactoryTest {
 
-class CustomerWithAuditedAnnotation {
-}
-
 @DomainObject(auditing = 
org.apache.isis.applib.annotation.Auditing.AS_CONFIGURED)
 class CustomerWithDomainObjectAndAuditingSetToAsConfigured {
 }
@@ -261,9 +258,6 @@ public class DomainObjectAnnotationFacetFactoryTest extends 
AbstractFacetFactory
 
 public static class Publishing extends 
DomainObjectAnnotationFacetFactoryTest {
 
-class CustomerWithPublishedObjectAnnotation {
-}
-
 @DomainObject(publishing = 
org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
 class CustomerWithDomainObjectAndPublishingSetToAsConfigured {
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" .

[isis] 10/13: ISIS-1742: removes @Bookmarkable annotation + facets

2017-10-06 Thread danhaywood 
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 b1dfa020f8428e5b57e71a3c423abd921a3a6c8e
Author: Dan Haywood 
AuthorDate: Thu Oct 5 16:52:05 2017 +0300

ISIS-1742: removes @Bookmarkable annotation + facets
---
 .../guides/rgant/_rgant_aaa_deprecated.adoc|  7 ---
 .../isis/applib/annotation/AutoComplete.java   | 70 --
 .../isis/applib/annotation/Bookmarkable.java   | 47 ---
 .../object/bookmarkpolicy/BookmarkPolicyFacet.java |  1 -
 ...aBookmarkableAnnotationElseFallbackFactory.java | 25 +---
 .../DomainObjectAnnotationFacetFactory.java| 39 +---
 ...kmarkableAnnotationFacetFactoryTest_action.java |  3 -
 ...okmarkableAnnotationFacetFactoryTest_class.java |  2 -
 todo-deprecation-list.txt  |  8 +--
 9 files changed, 9 insertions(+), 193 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 00d78a8..3baf515 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]?
 
-|`@AutoComplete`
-|Repository method to search for entities
-|xref:../rgant/rgant.adoc#_rgant-DomainObject_autoCompleteRepository[`@DomainObject`
 +
-`#autoCompleteRepository()`]
-|UI/Domain
-|
-
 |`@Bookmarkable`
 |Whether (and how) to create a bookmark for visited object.
 
|xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_bookmarking[`@DomainObjectLayout`
 +
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/AutoComplete.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/AutoComplete.java
deleted file mode 100644
index c08d544..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/AutoComplete.java
+++ /dev/null
@@ -1,70 +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;
-
-import org.apache.isis.applib.services.bookmark.Bookmark;
-
-/**
- * @deprecated - see {@link DomainObject#autoCompleteRepository()}.
- */
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface AutoComplete {
-
-/**
- * @deprecated - never implemented, also not required.
- */
-@Deprecated
-public static class Candidate {
-private final String title;
-private final Bookmark bookmark;
-public Candidate(String title, Bookmark bookmark) {
-this.title = title;
-this.bookmark = bookmark;
-}
-public String getTitle() {
-return title;
-}
-public Bookmark getBookmark() {
-return bookmark;
-}
-}
-
-/**
- * @deprecated - see {@link DomainObject#autoCompleteRepository()}.
- */
-@Deprecated
-Class repository();
-
-/**
- * @deprecated - see {@link DomainObject#autoCompleteAction()}.
- */
-@Deprecated
-String action() default "autoComplete";
-
-}
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bookmarkable.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bookmarkable.java
deleted file mode 100644
index 18e2b06..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bookmarkable.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

[isis] 03/13: ISIS-1742: markes Auditable, AlwaysImmutable and Bounded marker interfaces as deprecated

2017-10-06 Thread danhaywood 
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 4873f8f33309fbd4fb32685173c6eda74422248f
Author: Dan Haywood 
AuthorDate: Thu Oct 5 15:49:44 2017 +0300

ISIS-1742: markes Auditable, AlwaysImmutable and Bounded marker interfaces 
as deprecated
---
 .../main/java/org/apache/isis/applib/marker/AlwaysImmutable.java  | 3 +++
 .../src/main/java/org/apache/isis/applib/marker/Auditable.java| 5 -
 .../src/main/java/org/apache/isis/applib/marker/Bounded.java  | 3 +++
 todo-deprecation-list.txt | 8 
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java 
b/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
index 701d2c1..2b0cd18 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
@@ -25,7 +25,10 @@ import org.apache.isis.applib.annotation.Immutable;
  * Marker interface to show that an object cannot be changed once created.
  * 
  * Use {@link Immutable} annotation in preference to this marker interface.
+ *
+ * @deprecated
  */
+@Deprecated
 public interface AlwaysImmutable {
 
 }
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java 
b/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java
index 72b0344..c3cc052 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/marker/Auditable.java
@@ -33,8 +33,11 @@ import 
org.apache.isis.applib.services.audit.AuditingService3;
  * 
  * 
  * Alternatively can use the similarly named {@link 
org.apache.isis.applib.annotation.Audited annotation}.
- * 
+ *
+ *
+ * @deprecated
  */
+@Deprecated
 public interface Auditable {
 
 }
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/Bounded.java 
b/core/applib/src/main/java/org/apache/isis/applib/marker/Bounded.java
index 51b9448..15be01f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/marker/Bounded.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/marker/Bounded.java
@@ -24,6 +24,9 @@ package org.apache.isis.applib.marker;
  * are loaded on first use and are not refreshed.
  * 
  * Use {@link Bounded} annotation in preference to this marker interface.
+ *
+ * @deprecated
  */
+@Deprecated
 public interface Bounded {
 }
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 4b647dd..06e2ecd 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -82,7 +82,7 @@ org.apache.isis.applib.annotation
 org.apache.isis.applib.marker
 
 NotPersistable.java
-
+ProgramPersistable.java
 
 
 
@@ -105,8 +105,6 @@ org.apache.isis.applib
 org.apache.isis.applib.annotation
 
 
-
-
 AutoComplete.java - entire annotation, use 
@DomainObject(autoComplete...=...)
 Bookmarkable.java - entire annotation, use 
@DomainObjectLayout(bookmarking=...)
 Bounded.java - entire annotation, use @DomainObject(bounded=...)
@@ -173,10 +171,12 @@ org.apache.isis.applib.fixturescripts
 
 
 org.apache.isis.applib.marker - remove these marker interaces (tend to use 
annotations in preference)
+AlwaysImmutable.java
+Auditable.java
+Bounded.java
 ImmutableOncePersisted.java
 ImmutableUntilPersisted.java
 NeverImmutable.java
-ProgramPersistable.java
 
 
 org.apache.isis.applib.services.actinvoc

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" .

[isis] 13/13: ISIS-1742: updates docs, removal of query APIs from DomainObjectContainer

2017-10-06 Thread danhaywood 
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 136a7127ac759638cdc96d9c74caa660f27d8428
Author: Dan Haywood 
AuthorDate: Thu Oct 5 17:54:22 2017 +0300

ISIS-1742: updates docs, removal of query APIs from DomainObjectContainer
---
 ...gsvc_core-domain-api_DomainObjectContainer.adoc |  1 -
 ...mainObjectContainer_generic-repository-api.adoc | 84 --
 ...mainObjectContainer_object-persistence-api.adoc |  3 +-
 ...rgsvc_persistence-layer-api_IsisJdoSupport.adoc |  2 +-
 ...vc_persistence-layer-api_RepositoryService.adoc |  3 +-
 5 files changed, 5 insertions(+), 88 deletions(-)

diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc
index e044413..8a56bb8 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc
@@ -22,7 +22,6 @@ The sections below discuss the functions provided by the 
service, broken out int
 
 
 
include::_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc[leveloffset=+2]
-include::_rgsvc_core-domain-api_DomainObjectContainer_generic-repository-api.adoc[leveloffset=+2]
 
include::_rgsvc_core-domain-api_DomainObjectContainer_object-persistence-api.adoc[leveloffset=+2]
 
include::_rgsvc_core-domain-api_DomainObjectContainer_messages-api.adoc[leveloffset=+2]
 
include::_rgsvc_core-domain-api_DomainObjectContainer_security-api.adoc[leveloffset=+2]
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_generic-repository-api.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_generic-repository-api.adoc
deleted file mode 100644
index bb922ec..000
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_generic-repository-api.adoc
+++ /dev/null
@@ -1,84 +0,0 @@
-[[_rgsvc_core-domain-api_DomainObjectContainer_generic-repository-api]]
-= Generic Repository API
-: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/
-
-
-
-The repository API acts as an abstraction over the JDO/DataNucleus 
objectstore.  You can use it during prototyping to write naive queries (find 
all rows, then filter using the Guava `Predicate` API, or you can use it to 
call JDO 
link:http://www.datanucleus.org/products/accessplatform_4_0/jdo/query.html#named[named
 queries] using JDOQL.
-
-As an alternative, you could also use 
link:http://www.datanucleus.org/products/accessplatform_4_0/jdo/jdoql_typesafe.html[JDO
 typesafe queries] through the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-api_IsisJdoSupport[`IsisJdoSupport`]
 service.
-
-
-[source,java]
-
-public interface DomainObjectContainer {
-public  List allInstances(Class ofType, long... range);   
 // <1>
- List allMatches(Query query);
 // <2>
- List allMatches(Class ofType, Predicate predicate, 
long... range); // <3>
- List allMatches(Class ofType, String title, long... range);  
 // <4>
- List allMatches(Class ofType, T pattern, long... range); 
 // <5>
-...
-}
-
-<1> all persisted instances of specified type.  Mostly for prototyping, though 
can be useful to obtain all instances of domain entities if the number is known 
to be small.  The optional varargs parameters are for paging control; more on 
this below.
-<2> all persistence instances matching the specified `Query`.  Query itself is 
an Isis abstraction on top of JDO/DataNucleus' Query API.  *This is the primary 
API used for querying*
-<3> all persistenced instances of specified type matching `Predicate`.  Only 
really intended for prototyping because in effect constitutes a client-side 
WHERE clause
-<4> all persisted instances with the specified string as their title.  Only 
very occasionally used
-<5> all persisted instances matching object (query-by-example).  Only very 
occasionally used
-
-There are various implementations of the `Query` API, but these either

[isis] 04/13: ISIS-1742: deletes AlwaysImmutable, NeverImmutable, ImmutableOncePersistend and ImmutableUntilPersisted marker interfaces

2017-10-06 Thread danhaywood 
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 d73b6852736eb4e9787dd4ce13e3dc877f89ffaa
Author: Dan Haywood 
AuthorDate: Thu Oct 5 15:52:56 2017 +0300

ISIS-1742: deletes AlwaysImmutable, NeverImmutable, ImmutableOncePersistend 
and ImmutableUntilPersisted marker interfaces
---
 .../org/apache/isis/applib/annotation/When.java|  21 
 .../apache/isis/applib/marker/AlwaysImmutable.java |  34 ---
 .../isis/applib/marker/ImmutableOncePersisted.java |  34 ---
 .../applib/marker/ImmutableUntilPersisted.java |  35 ---
 .../apache/isis/applib/marker/NeverImmutable.java  |  35 ---
 .../ImmutableFacetMarkerInterface.java |  40 
 .../ImmutableFacetMarkerInterfaceFactory.java  |  50 --
 .../dflt/ProgrammingModelFacetsJava5.java  |   2 -
 .../ImmutableFacetMarkerInterfaceFactoryTest.java  | 110 -
 todo-deprecation-list.txt  |  12 ++-
 10 files changed, 7 insertions(+), 366 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/When.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/When.java
index df7984b..5e866f5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/When.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/When.java
@@ -19,10 +19,6 @@
 
 package org.apache.isis.applib.annotation;
 
-import org.apache.isis.applib.marker.AlwaysImmutable;
-import org.apache.isis.applib.marker.ImmutableOncePersisted;
-import org.apache.isis.applib.marker.ImmutableUntilPersisted;
-import org.apache.isis.applib.marker.NeverImmutable;
 import org.apache.isis.applib.util.Enums;
 
 /**
@@ -77,23 +73,6 @@ public enum When {
 return Enums.getFriendlyNameOf(this);
 }
 
-/**
- * As an alternative to annotating an object with {@link Disabled}, can 
instead have the
- * class implement a marker interface.   
- */
-@Deprecated
-public static When lookupForMarkerInterface(final Class cls) {
-if (AlwaysImmutable.class.isAssignableFrom(cls)) {
-return ALWAYS;
-} else if (ImmutableOncePersisted.class.isAssignableFrom(cls)) {
-return ONCE_PERSISTED;
-} else if (ImmutableUntilPersisted.class.isAssignableFrom(cls)) {
-return UNTIL_PERSISTED;
-} else if (NeverImmutable.class.isAssignableFrom(cls)) {
-return NEVER;
-}
-return null;
-}
 
 @Deprecated
 public interface Persistable {
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java 
b/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
deleted file mode 100644
index 2b0cd18..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/marker/AlwaysImmutable.java
+++ /dev/null
@@ -1,34 +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.marker;
-
-import org.apache.isis.applib.annotation.Immutable;
-
-/**
- * Marker interface to show that an object cannot be changed once created.
- * 
- * Use {@link Immutable} annotation in preference to this marker interface.
- *
- * @deprecated
- */
-@Deprecated
-public interface AlwaysImmutable {
-
-}
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/ImmutableOncePersisted.java
 
b/core/applib/src/main/java/org/apache/isis/applib/marker/ImmutableOncePersisted.java
deleted file mode 100644
index 909fc97..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/marker/ImmutableOncePersisted.java
+++ /dev/null
@@ -1,34 +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

[isis] 02/13: ISIS-1742: deletes ProgramPersistable marker interface

2017-10-06 Thread danhaywood 
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 d3c960ca2199515354435f6eed0763294d0f8c65
Author: Dan Haywood 
AuthorDate: Thu Oct 5 15:49:23 2017 +0300

ISIS-1742: deletes ProgramPersistable marker interface
---
 .../isis/applib/marker/ProgramPersistable.java | 30 --
 1 file changed, 30 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/marker/ProgramPersistable.java
 
b/core/applib/src/main/java/org/apache/isis/applib/marker/ProgramPersistable.java
deleted file mode 100644
index a1f31d3..000
--- 
a/core/applib/src/main/java/org/apache/isis/applib/marker/ProgramPersistable.java
+++ /dev/null
@@ -1,30 +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.marker;
-
-/**
- * No longer supported - the MetaModel validator will reject any domain 
classes that implement this marker interface.
- *
- * @deprecated
- */
-@Deprecated
-public interface ProgramPersistable {
-
-}

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" .

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated (b80c00f -> 136a712)

2017-10-06 Thread danhaywood 
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.


from b80c00f  ISIS-1742: updates version to 2.0.0-SNAPSHOT
 new e292120  ISIS-1742: removes @NotPersistable annotation + supporting 
facets
 new d3c960c  ISIS-1742: deletes ProgramPersistable marker interface
 new 4873f8f  ISIS-1742: markes Auditable, AlwaysImmutable and Bounded 
marker interfaces as deprecated
 new d73b685  ISIS-1742: deletes AlwaysImmutable, NeverImmutable, 
ImmutableOncePersistend and ImmutableUntilPersisted marker interfaces
 new 2cef4b7  ISIS-1742: removes Bounded marker interface
 new fd13487  ISIS-1742: deletes @Bounded annotation + facets
 new 91ac16a  ISIS-1742: deletes @Auditable annotation + Auditable marker 
inteface (both applib and jdo applib) + supporting facets and facet factories
 new 1500212  ISIS-1742: deletes unused nested test classes from unit tests
 new 1fe3fd9  ISIS-1742: deletes When enum from @Hidden, @Disabled, 
@Immutable
 new b1dfa02  ISIS-1742: removes @Bookmarkable annotation + facets
 new 701cc9a  removes @Bookmarkable annotation; removes @Debug, 
@Exploration and @Prototype annotations + supporting facets
 new 7513e83  ISIS-1742: deletes AbstractService, AbstractViewModel, 
AbstractContainedObject, AbstractDomainObject, AbstractFactoryAndRepository, 
AbstractHomePageDashboardService.  Also deletes 
allInstances/allMatches/firstMatch/uniqueMatch from DomainObjectContainer.
 new 136a712  ISIS-1742: updates docs, removal of query APIs from 
DomainObjectContainer

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../guides/rgant/_rgant_aaa_deprecated.adoc|  53 +-
 .../asciidoc/guides/rgant/_rgant_aaa_partial.adoc  |  19 -
 ...gsvc_core-domain-api_DomainObjectContainer.adoc |   1 -
 ...mainObjectContainer_generic-repository-api.adoc |  84 ---
 ...mainObjectContainer_object-persistence-api.adoc |   3 +-
 ...rgsvc_persistence-layer-api_IsisJdoSupport.adoc |   2 +-
 ...vc_persistence-layer-api_RepositoryService.adoc |   3 +-
 .../src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc |  20 +-
 .../isis/applib/AbstractContainedObject.java   | 808 -
 .../apache/isis/applib/AbstractDomainObject.java   | 144 
 .../isis/applib/AbstractFactoryAndRepository.java  |  47 --
 .../org/apache/isis/applib/AbstractService.java|   2 +-
 .../org/apache/isis/applib/AbstractViewModel.java  |   2 +-
 .../apache/isis/applib/DomainObjectContainer.java  | 218 --
 .../org/apache/isis/applib/annotation/Audited.java |  43 --
 .../isis/applib/annotation/AutoComplete.java   |  70 --
 .../isis/applib/annotation/Bookmarkable.java   |  47 --
 .../org/apache/isis/applib/annotation/Bounded.java |  36 -
 .../org/apache/isis/applib/annotation/Debug.java   |  38 -
 .../apache/isis/applib/annotation/Disabled.java|   5 -
 .../apache/isis/applib/annotation/Exploration.java |  38 -
 .../org/apache/isis/applib/annotation/Hidden.java  |   7 -
 .../isis/applib/annotation/NotPersistable.java |  66 --
 .../apache/isis/applib/annotation/Prototype.java   |  36 -
 .../org/apache/isis/applib/annotation/When.java| 110 ---
 .../apache/isis/applib/fixtures/BaseFixture.java   |   3 +-
 .../isis/applib/fixturescripts/FixtureScript.java  |   2 +-
 .../isis/applib/fixturescripts/FixtureScripts.java |  27 +-
 .../apache/isis/applib/marker/AlwaysImmutable.java |  31 -
 .../org/apache/isis/applib/marker/Auditable.java   |  40 -
 .../org/apache/isis/applib/marker/Bounded.java |  29 -
 .../isis/applib/marker/ImmutableOncePersisted.java |  34 -
 .../applib/marker/ImmutableUntilPersisted.java |  35 -
 .../apache/isis/applib/marker/NeverImmutable.java  |  35 -
 .../apache/isis/applib/marker/NonPersistable.java  |  30 -
 .../isis/applib/marker/ProgramPersistable.java |  30 -
 .../apache/isis/applib/marker/package-info.java|  28 -
 .../isis/applib/query/QueryBuiltInAbstract.java|  58 --
 .../isis/applib/query/QueryFindAllInstances.java   |   2 +-
 .../apache/isis/applib/security/RoleMemento.java   |   2 -
 .../apache/isis/applib/security/UserMemento.java   |   2 -
 .../homepage/AbstractHomePageDashboardService.java |  97 ---
 .../jdo/applib/annotations/Auditable.java  |  36 -
 .../isis/objectstore/jdo/applib/Auditable.java |  26 -
 .../apache/isis/applib/ContainedObjectTest.java| 107 ---
 .../isis/applib/FactoryAndRepositoryTest.java  | 122 
 .../org/apache/isis/applib/util/EnumsTest.java |  16 +-
 .../isis/core/metamodel/facets/WhenValueFacet.java |  29 -
 .../metamodel/facets/WhenValueFacetAbstract.java   |  44 --
 ...ndWhereValueFacet.java =>

[isis] 09/13: ISIS-1742: deletes When enum from @Hidden, @Disabled, @Immutable

2017-10-06 Thread danhaywood 
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 1fe3fd98d1799b59dcd1fdbfd6d49101f9413116
Author: Dan Haywood 
AuthorDate: Thu Oct 5 16:43:15 2017 +0300

ISIS-1742: deletes When enum from @Hidden, @Disabled, @Immutable
---
 .../apache/isis/applib/annotation/Disabled.java|   5 -
 .../org/apache/isis/applib/annotation/Hidden.java  |   7 -
 .../org/apache/isis/applib/annotation/When.java|  89 -
 .../org/apache/isis/applib/util/EnumsTest.java |  16 +-
 .../isis/core/metamodel/facets/WhenValueFacet.java |  29 ---
 .../metamodel/facets/WhenValueFacetAbstract.java   |  44 -
 ...ndWhereValueFacet.java => WhereValueFacet.java} |   3 +-
 ...tAbstract.java => WhereValueFacetAbstract.java} |  11 +-
 ...DisabledFacetForDisabledAnnotationOnAction.java |  10 +-
 .../hidden/HiddenFacetForActionAnnotation.java |   3 +-
 .../HiddenFacetForHiddenAnnotationOnAction.java|   7 +-
 .../HiddenFacetForActionLayoutAnnotation.java  |   3 +-
 .../actions/layout/HiddenFacetForActionXml.java|   3 +-
 .../metamodel/facets/all/hide/HiddenFacet.java |   4 +-
 .../DisabledFacetForCollectionAnnotation.java  |   3 +-
 ...bledFacetForDisabledAnnotationOnCollection.java |  10 +-
 .../hidden/HiddenFacetForCollectionAnnotation.java |   3 +-
 ...HiddenFacetForHiddenAnnotationOnCollection.java |   7 +-
 ...abledFacetOnCollectionDerivedFromImmutable.java |   4 +-
 .../HiddenFacetForCollectionLayoutAnnotation.java  |   3 +-
 .../layout/HiddenFacetForCollectionXml.java|   3 +-
 .../facets/members/disabled/DisabledFacet.java |   4 +-
 .../members/disabled/DisabledFacetAbstract.java|  15 +-
 .../DisabledFacetAbstractAlwaysEverywhere.java |   3 +-
 .../disabled/DisabledFacetAbstractImpl.java|  47 +++--
 .../disabled/DisabledFacetForContributee.java  |   3 +-
 .../facets/members/hidden/HiddenFacetAbstract.java |  16 +-
 .../HiddenFacetAbstractAlwaysEverywhere.java   |   5 +-
 .../members/hidden/HiddenFacetAbstractImpl.java|  31 +---
 .../HiddenFacetFromLayoutPropertiesAbstract.java   |   4 +-
 .../ImmutableFacetForDomainObjectAnnotation.java   |   3 +-
 .../editing/ImmutableFacetFromConfiguration.java   |   4 +-
 .../annotation/HiddenFacetOnTypeAnnotation.java|   5 +-
 .../HiddenFacetOnTypeAnnotationFactory.java|   2 +-
 .../facets/object/immutable/ImmutableFacet.java|  27 +--
 .../object/immutable/ImmutableFacetAbstract.java   |  30 +--
 .../object/immutable/ImmutableFacetUtils.java  |  38 
 .../ImmutableFacetForImmutableAnnotation.java  |   9 +-
 ...etOnCollectionDerivedFromRecreatableObject.java |   3 +-
 ...acetOnPropertyDerivedFromRecreatableObject.java |   3 +-
 .../value/ImmutableFacetViaValueSemantics.java |   3 +-
 ...isabledFacetOnPropertyDerivedFromImmutable.java |   7 +-
 ...FacetOnPropertyDerivedFromImmutableFactory.java |   2 +-
 ...sabledFacetForDisabledAnnotationOnProperty.java |   7 +-
 .../DisabledFacetForPropertyAnnotation.java|   3 +-
 ...acetForPropertyAnnotationInvertedSemantics.java |   3 +-
 .../HiddenFacetForHiddenAnnotationOnProperty.java  |   7 +-
 .../hidden/HiddenFacetForPropertyAnnotation.java   |   3 +-
 .../HiddenFacetForPropertyLayoutAnnotation.java|   3 +-
 .../propertylayout/HiddenFacetForPropertyXml.java  |   3 +-
 .../ApplicationFeatureRepositoryDefault.java   |   4 +-
 .../metamodel/spec/feature/ObjectAssociation.java  |  11 +-
 .../core/metamodel/spec/feature/ObjectMember.java  |   2 -
 .../specloader/specimpl/ObjectMemberAbstract.java  |   2 -
 .../specimpl/ObjectSpecificationAbstract.java  |   3 +-
 .../specimpl/OneToManyAssociationContributee.java  |   2 -
 .../specimpl/OneToManyAssociationMixedIn.java  |   2 -
 .../specimpl/OneToOneAssociationContributee.java   |   2 -
 .../specimpl/OneToOneAssociationMixedIn.java   |   2 -
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |   3 +-
 .../actions/ActionMethodsFacetFactoryTest.java |   3 -
 ...DisabledAnnotationOnActionFacetFactoryTest.java |  47 +
 .../HiddenAnnotationOnActionFacetFactoryTest.java  |  54 +-
 .../CollectionFieldMethodsFacetFactoryTest.java|   3 -
 .../CollectionAnnotationFacetFactoryTest.java  |   3 -
 ...ObjectAnnotationFacetFactoryTest_immutable.java |  41 +
 .../PropertyAnnotationFacetFactoryTest.java|   5 +-
 .../ObjectAssociationFiltersTest_visibleWhere.java |  48 ++---
 .../ApplicationFeatureRepositoryDefaultTest.java   |   3 +-
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  18 +-
 .../runtime/system/ObjectMemberAbstractTest.java   |   9 +-
 .../progmodel/wrapper/dom/employees/Employee.java  |   3 -
 todo-deprecation-list.txt  | 203 +++--
 73 files changed, 300 insertions(+), 733 deletions(-)

diff --git

[isis] 06/13: ISIS-1742: deletes @Bounded annotation + facets

2017-10-06 Thread danhaywood 
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 fd1348764c805a0464e72a4e48508de45dece5da
Author: Dan Haywood 
AuthorDate: Thu Oct 5 15:58:19 2017 +0300

ISIS-1742: deletes @Bounded annotation + facets
---
 .../guides/rgant/_rgant_aaa_deprecated.adoc|  6 ---
 .../org/apache/isis/applib/annotation/Bounded.java | 36 -
 .../DomainObjectAnnotationFacetFactory.java| 20 +---
 .../choices/ChoicesFacetFromBoundedAnnotation.java | 60 --
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |  2 -
 todo-deprecation-list.txt  |  4 +-
 6 files changed, 4 insertions(+), 124 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 34988d6..6891776 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
@@ -43,12 +43,6 @@ The annotations listed in the table below are still 
supported by Apache Isis, bu
 |UI
 |
 
-|`@Bounded`
-|Bounded (and limited) number of instances of an entity type, translates into 
a drop-down for any property of that type.
-|xref:../rgant/rgant.adoc#_rgant-DomainObject_bounded[`@DomainObject#bounded()`]
-|Domain
-|
-
 |`@Bulk`
 |Indicates an action is a bulk action, can be applied to multiple instances.
 |xref:../rgant/rgant.adoc#_rgant-Action_invokeOn[`@Action#invokeOn()`]
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.java
deleted file mode 100644
index 38f4708..000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bounded.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 DomainObject#bounded()} instead.
- */
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface Bounded {
-}
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 1a717ae..f5e34f3 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Maps;
 
 import org.apache.isis.applib.annotation.Audited;
 import org.apache.isis.applib.annotation.AutoComplete;
-import org.apache.isis.applib.annotation.Bounded;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.Immutable;
 import org.apache.isis.applib.annotation.Nature;
@@ -66,7 +65,6 @@ import 
org.apache.isis.core.metamodel.facets.object.domainobject.auditing.Audita
 import 
org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForAutoCompleteAnnotation;
 import 
org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
 import 
org.apache.isis.core.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
-import 
org.apache.isis.core.metamodel.facets.object.domainobject.choices.ChoicesFacetFromBoundedAnnotation;
 import 
org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
 import