date:20171026

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated (f3b2dba -> 197fa83)

2017-10-26 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-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


 discard f3b2dba  ISIS-1632: updates to helloworld just for testing @Meta

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/dev/2.0.0/ISIS-1632-meta-annotations (197fa83)
\
 O -- O -- O   (f3b2dba)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .../main/java/domainapp/dom/annot/AreYouSure.java  | 39 
 .../src/main/java/domainapp/dom/annot/Name.java| 43 --
 .../src/main/java/domainapp/dom/annot/Notes.java   | 39 
 .../java/domainapp/dom/impl/HelloWorldObject.java  | 16 
 4 files changed, 9 insertions(+), 128 deletions(-)
 delete mode 100644 
example/application/helloworld/src/main/java/domainapp/dom/annot/AreYouSure.java
 delete mode 100644 
example/application/helloworld/src/main/java/domainapp/dom/annot/Name.java
 delete mode 100644 
example/application/helloworld/src/main/java/domainapp/dom/annot/Notes.java

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

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations created (now f3b2dba)

2017-10-26 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-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


  at f3b2dba  ISIS-1632: updates to helloworld just for testing @Meta

No new revisions were added by this update.

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

[isis] branch ISIS-1632-meta-annotations deleted (was f3b2dba)

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


 was f3b2dba  ISIS-1632: updates to helloworld just for testing @Meta

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

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

[isis] 08/13: ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c53336e4b0a65961ffb77be4b62395a7794c1453
Author: Dan Haywood 
AuthorDate: Tue Sep 19 22:50:00 2017 +0100

ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib
---
 .../objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index e5171c9..6e2ef41 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -62,7 +62,7 @@ import 
org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 nature = NatureOfService.DOMAIN,
 menuOrder = "" + Integer.MAX_VALUE
 )
-public class IsisJdoSupportImpl implements IsisJdoSupport {
+public class IsisJdoSupportImpl implements 
org.apache.isis.applib.services.jdosupport.IsisJdoSupport {
 
 @Programmatic
 @Override

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

[isis] 01/13: ISIS-1276: updates references for datanucleus.

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit ee07e8e63bed4f38d1caf67f9061c907390fa1e9
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:13:20 2017 +0100

ISIS-1276: updates references for datanucleus.

Also updated org.incode:incode-build to 3-SNAPSHOT, and 
java-mavenmixin-datanucleus to 0.0.5-SNAPSHOT
---
 core/applib/pom.xml| 39 ++
 core/pom.xml   | 19 -
 core/unittestsupport/pom.xml   |  5 ++---
 example/application/helloworld/pom.xml |  4 ++--
 example/application/simpleapp/pom.xml  |  8 +++
 5 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index cea4c42..be3411c 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -51,41 +51,6 @@
 
 
 
-
-
-
-
-org.eclipse.m2e
-lifecycle-mapping
-1.0.0
-
-
-
-
-
-
-org.datanucleus
-
-
-datanucleus-maven-plugin
-
-
-[4.0.0-release,)
-
-
-enhance
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -128,8 +93,8 @@
 
 
 
-javax.jdo
-jdo-api
+org.datanucleus
+javax.jdo
 
 
 
diff --git a/core/pom.xml b/core/pom.xml
index a4868e5..7f9b6a1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -84,14 +84,13 @@
 [6] 
https://github.com/moment/moment/blob/develop/LICENSE
 
 
-3.1
+3.2.0-m7
 
-4.1.7
-4.1.1
-4.0.5
-4.1.9
-
-
4.1.0-release
+5.1.2
+5.1.2
+5.0.2
+5.1.2
+
5.1.0-release

-
4.0.2
+
5.0.2
 
 1.2.6
 
@@ -1950,8 +1949,8 @@ ${license.additional-notes}
 
 
 
-javax.jdo
-jdo-api
+org.datanucleus
+javax.jdo
 ${jdo-api.version}
 
 
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 8d09993..02d8027 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -56,9 +56,8 @@

 
 
-javax.jdo
-jdo-api
-${jdo-api.version}
+org.datanucleus
+javax.jdo
 true
 
 
diff --git a/example/application/helloworld/pom.xml 
b/example/application/helloworld/pom.xml
index ca4d589..6961124 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,7 +24,7 @@
 
 org.incode
 incode-build
-2
+3-SNAPSHOT
 
 
 org.apache.isis.example.application
@@ -42,7 +42,7 @@
 
 1.8
 1.8
-
+
-parameters
 
 UTF-8
 
UTF-8
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index e74d749..8854089 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
 
 org.incode
 incode-build
-2
+3-SNAPSHOT
 
 
 org.apache.isis.example.application
@@ -44,9 +44,9 @@
 
 1.16.18
 
-1.7
-1.7
-
+1.8
+1.8
+
-parameters
 
 UTF-8
 
UTF-8

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

[isis] 09/13: ISIS-1725: requires that an AppManifest is supplied (used to obtain list of entities).

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit f98b0ede171e88824aa7f96195f5fac170eb2af5
Author: Dan Haywood 
AuthorDate: Tue Sep 19 22:55:48 2017 +0100

ISIS-1725: requires that an AppManifest is supplied (used to obtain list of 
entities).
---
 .../persistence/PersistenceSessionFactory.java |  2 +-
 .../objectstore/jdo/service/RegisterEntities.java  | 96 ++
 2 files changed, 9 insertions(+), 89 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 8a89c8a..4be046c 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -93,7 +93,7 @@ public class PersistenceSessionFactory implements 
ApplicationScopedComponent, Fi
 final Map datanucleusProps = 
dataNucleusConfig.asMap();
 addDataNucleusPropertiesIfRequired(datanucleusProps);
 
-final RegisterEntities registerEntities = new 
RegisterEntities(configuration.asMap(), specificationLoader);
+final RegisterEntities registerEntities = new 
RegisterEntities(specificationLoader);
 final Set classesToBePersisted = 
registerEntities.getEntityTypes();
 
 applicationComponents = new 
DataNucleusApplicationComponents(jdoObjectstoreConfig, specificationLoader,
diff --git 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index 538b5b1..a83b115 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -18,23 +18,13 @@
  */
 package org.apache.isis.objectstore.jdo.service;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import javax.jdo.annotations.PersistenceCapable;
-
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +35,11 @@ public class RegisterEntities {
 
 @SuppressWarnings("unused")
 private final static Logger LOG = 
LoggerFactory.getLogger(RegisterEntities.class);
-
+
+/**
+ * @deprecated - no longer used; instead an AppManifest must be specified.
+ */
+@Deprecated
 public final static String PACKAGE_PREFIX_KEY = 
"isis.persistor.datanucleus.RegisterEntities.packagePrefix";
 
 // //
@@ -60,13 +54,13 @@ public class RegisterEntities {
 }
 //endregion
 
-public RegisterEntities(final Map configuration, final 
SpecificationLoader specificationLoader) {
+public RegisterEntities(final SpecificationLoader specificationLoader) {
 this.specificationLoader = specificationLoader;
 
 Set persistenceCapableTypes = 
AppManifest.Registry.instance().getPersistenceCapableTypes();
 
 if(persistenceCapableTypes == null) {
-persistenceCapableTypes = 
searchForPersistenceCapables(configuration);
+throw new IllegalStateException("AppManifest is required");
 }
 
 final List classNamesNotEnhanced = Lists.newArrayList();
@@ -86,88 +80,14 @@ public class RegisterEntities {
 }
 }
 
-/**
- * only called if no appManifest
- */
-Set searchForPersistenceCapables(final Map 
configuration) {
-
-final String packagePrefixes = lookupPackagePrefixes(configuration);
-
-final Set persistenceCapableTypes = Sets.newLinkedHashSet();
-final List domPackages = parseDomPackages(packagePrefixes);
-for (final String packageName : domPackages) {
-Reflections reflections = new Reflections(packageName);
-final Set entityTypesInPackage =
-
reflections.getTypesAnnotatedWith(PersistenceCapable.class);
-
-if(!entitiesIn(entityTypesInPackage)) {
-throw new IllegalArgumentException(String.format(
-"Bad configuration.\n\nCould not locate any 
@PersistenceCapable entities in package

[isis] 03/13: ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit c07d669272113ca66b47d924ee0520a2f2e9a06f
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:17:54 2017 +0100

ISIS-1276: updates applib, replaces references of TypesafeQuery to be 
instead JDOQLTypedQuery
---
 .../org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
 
b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
index 4ca5c10..75a4e0f 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
@@ -23,10 +23,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import javax.jdo.JDOQLTypedQuery;
 import javax.jdo.PersistenceManager;
-
-import org.datanucleus.query.typesafe.BooleanExpression;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.query.BooleanExpression;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
@@ -132,5 +131,5 @@ public interface IsisJdoSupport {
  * 
  */
 @Programmatic
- TypesafeQuery newTypesafeQuery(Class cls);
+ JDOQLTypedQuery newTypesafeQuery(Class cls);
 }

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

[isis] 05/13: ISIS-1276: fixes compile issue in specsupport

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 713da4340b7abc9338b145ebf2da904c0d04d1b7
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:34:29 2017 +0100

ISIS-1276: fixes compile issue in specsupport
---
 .../isis/core/specsupport/scenarios/DomainServiceProviderMockery.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/DomainServiceProviderMockery.java
 
b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/DomainServiceProviderMockery.java
index 65e8c41..4b5c3cd 100644
--- 
a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/DomainServiceProviderMockery.java
+++ 
b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/DomainServiceProviderMockery.java
@@ -84,7 +84,7 @@ class DomainServiceProviderMockery implements 
DomainServiceProvider {
 mockRepositoryService = (RepositoryService) mock;
 context.checking(new Expectations() {
 {
-allowing(mockRepositoryService).persist(with(anything()));
+
allowing(mockRepositoryService).persist(with(Expectations.anything()));
 }
 });
 }

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

[isis] 10/13: ISIS-1727: uses lambda in IsisSessionFactoryBuilder

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 1d599e03be0458409e4a205ab5bacd525369adc2
Author: Dan Haywood 
AuthorDate: Tue Sep 19 22:56:54 2017 +0100

ISIS-1727: uses lambda in IsisSessionFactoryBuilder
---
 .../system/session/IsisSessionFactoryBuilder.java  | 25 ++
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 3002b3f..913b869 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -199,22 +199,19 @@ public class IsisSessionFactoryBuilder {
 
 
 isisSessionFactory.doInSession(
-new Runnable() {
-@Override
-public void run() {
-try {
-specificationLoader.validateAndAssert();
-
-} catch (final MetaModelInvalidException ex) {
-// no need to use a higher level, such as 
error(...); the calling code will expose any metamodel
-// validation errors in their own particular 
way.
-if(LOG.isDebugEnabled()) {
-LOG.debug("Meta model invalid", ex);
-}
-IsisContext.setMetaModelInvalidException(ex);
+() -> {
+try {
+specificationLoader.validateAndAssert();
+
+} catch (final MetaModelInvalidException ex) {
+// no need to use a higher level, such as 
error(...); the calling code will expose any metamodel
+// validation errors in their own particular way.
+if(LOG.isDebugEnabled()) {
+LOG.debug("Meta model invalid", ex);
 }
-
+IsisContext.setMetaModelInvalidException(ex);
 }
+
 }
 );
 

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

[isis] 13/13: ISIS-1636 UI enhancement - java 8 Time

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 65294dc7f29a9ef9ceca05c4b07ee756e0a7826e
Author: Andi Huber 
AuthorDate: Fri Oct 6 22:49:37 2017 +0200

ISIS-1636 UI enhancement - java 8 Time
---
 .../value/datejdk8local/Jdk8LocalDateUtil.java | 169 +
 .../datejdk8local/Jdk8LocalDateValueFacet.java |  33 +++
 ...ateValueFacetUsingSemanticsProviderFactory.java |  45 
 .../Jdk8LocalDateValueSemanticsProvider.java   | 274 
 .../facets/value/datejdk8local/TimeFormatter.java  |  27 ++
 .../facets/value/datejdk8local/TimeParser.java |  27 ++
 .../datetimejdk8local/Jdk8LocalDateTimeUtil.java   | 157 
 .../Jdk8LocalDateTimeValueFacet.java   |  33 +++
 ...imeValueFacetUsingSemanticsProviderFactory.java |  45 
 .../Jdk8LocalDateTimeValueSemanticsProvider.java   | 275 +
 .../value/datetimejdk8local/TimeFormatter.java |  27 ++
 .../facets/value/datetimejdk8local/TimeParser.java |  27 ++
 .../Jdk8OffsetDateTimeValueFacet.java  |  33 +++
 ...imeValueFacetUsingSemanticsProviderFactory.java |  45 
 .../Jdk8OffsetDateTimeValueSemanticsProvider.java  | 104 
 ...fsetDateTimeValueSemanticsProviderAbstract.java | 120 +
 .../dflt/ProgrammingModelFacetsJava5.java  |  10 +-
 .../ComponentFactoryRegistrarDefault.java  |   7 +
 .../jdk8time/DateConverterForJdk8Abstract.java |  62 +
 .../jdk8time/DateConverterForJdk8LocalDate.java|  64 +
 .../DateConverterForJdk8LocalDateTime.java |  76 ++
 .../DateConverterForJdk8OffsetDateTime.java|  92 +++
 .../scalars/jdk8time/Jdk8LocalDatePanel.java   |  42 
 .../jdk8time/Jdk8LocalDatePanelFactory.java|  47 
 .../scalars/jdk8time/Jdk8LocalDateTimePanel.java   |  52 
 .../jdk8time/Jdk8LocalDateTimePanelFactory.java|  45 
 .../scalars/jdk8time/Jdk8OffsetDateTimePanel.java  |  51 
 .../jdk8time/Jdk8OffsetDateTimePanelFactory.java   |  45 
 .../DateConverterForJdk8LocalDateTest.java |  75 ++
 .../DateConverterForJdk8LocalDateTimeTest.java |  97 
 .../DateConverterForJdk8OffsetDateTimeTest.java| 107 
 31 files changed, 2311 insertions(+), 2 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
new file mode 100644
index 000..bff3e30
--- /dev/null
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejdk8local/Jdk8LocalDateUtil.java
@@ -0,0 +1,169 @@
+/*
+ *  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.value.datejdk8local;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import 
org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.joda.time.format.DateTimeFormat;
+
+final class Jdk8LocalDateUtil  {
+
+   private Jdk8LocalDateUtil(){}
+
+   // -- CONVERSION (LEGACY OF JODA TIME LIBRARY)
+   
+   static TimeParser parserOfStyle(String style) {
+   return parserOf(DateTimeFormat.forStyle(style));
+   }
+
+   private static TimeParser 
parserOf(org.joda.time.format.DateTimeFormatter jodaFormatter) {
+   return t->
+   
toJava8(jodaFormatter.withLocale(Locale.getDefault()).parseLocalDate(t));
+   }
+
+   private static LocalDate toJava8(org.joda.time.LocalDate x) {
+   return LocalDate.of(x.getYear(), x.getMonthOfYear(), 
x.getDayOfMonth());
+   }
+
+   static TimeFormatter formatterOfStyle(String style) {
+   return formatterOf(DateTimeFormat.forStyle(style));
+   }
+
+   private static TimeFormatter 
formatterOf(org.joda.time.format.DateTimeFormatter

[isis] 12/13: ISIS-1728: uses typesafe queries for helloworld

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 26ff9ea322756e3e69ea698adf3ee2409024d8bb
Author: Dan Haywood 
AuthorDate: Tue Sep 19 23:02:07 2017 +0100

ISIS-1728: uses typesafe queries for helloworld
---
 .../main/java/domainapp/dom/impl/HelloWorldObject.java  | 17 ++---
 .../main/java/domainapp/dom/impl/HelloWorldObjects.java | 16 ++--
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index b8bbcfa..c438d93 100644
--- 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -42,27 +42,19 @@ import org.apache.isis.applib.services.title.TitleService;
 
 import lombok.AccessLevel;
 
-@javax.jdo.annotations.PersistenceCapable(identityType = 
IdentityType.DATASTORE, schema = "helloworld" )
+@javax.jdo.annotations.PersistenceCapable(identityType = 
IdentityType.DATASTORE,schema = "helloworld" )
 @javax.jdo.annotations.DatastoreIdentity(strategy = 
IdGeneratorStrategy.IDENTITY, column = "id")
 @javax.jdo.annotations.Version(strategy= VersionStrategy.DATE_TIME, column 
="version")
-@javax.jdo.annotations.Queries({
-@javax.jdo.annotations.Query(
-name = "findByName",
-value = "SELECT "
-+ "FROM domainapp.dom.impl.HelloWorldObject "
-+ "WHERE name.indexOf(:name) >= 0 ")
-})
-@javax.jdo.annotations.Unique(name="HelloWorldObject_name_UNQ", members = 
{"name"})
-@DomainObject(auditing = Auditing.ENABLED)
+@DomainObject(auditing = Auditing.ENABLED, editing = Editing.DISABLED)
 @DomainObjectLayout()  // trigger events etc.
 @lombok.RequiredArgsConstructor(staticName = "create")
 @lombok.Getter @lombok.Setter
 public class HelloWorldObject implements Comparable {
 
 
+@javax.jdo.annotations.Unique
 @javax.jdo.annotations.Column(allowsNull = "false", length = 40)
 @lombok.NonNull
-@Property(editing = Editing.DISABLED)
 @Title(prepend = "Object: ")
 private String name;
 
@@ -104,14 +96,17 @@ public class HelloWorldObject implements 
Comparable {
 
 //region > injected services
 @javax.inject.Inject
+@javax.jdo.annotations.NotPersistent
 @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 RepositoryService repositoryService;
 
 @javax.inject.Inject
+@javax.jdo.annotations.NotPersistent
 @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 TitleService titleService;
 
 @javax.inject.Inject
+@javax.jdo.annotations.NotPersistent
 @lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
 MessageService messageService;
 //endregion
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index 2f4dc51..3d164dc 100644
--- 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@ -28,8 +28,7 @@ import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.ParameterLayout;
 import org.apache.isis.applib.annotation.RestrictTo;
 import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.query.QueryDefault;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
 import org.apache.isis.applib.services.repository.RepositoryService;
 
 @DomainService(
@@ -50,17 +49,15 @@ public class HelloWorldObjects {
 @Action(semantics = SemanticsOf.SAFE)
 @MemberOrder(sequence = "2")
 public List findByName(final String name) {
-return repositoryService.allMatches(
-new QueryDefault<>(
-HelloWorldObject.class,
-"findByName",
-"name", name));
+return isisJdoSupport.executeQuery(HelloWorldObject.class,
+QHelloWorldObject.candidate().name.startsWith(name));
 }
 
 @Action(semantics = SemanticsOf.SAFE, restrictTo = RestrictTo.PROTOTYPING)
 @MemberOrder(sequence = "3")
 public List listAll() {
-return repositoryService.allInstances(HelloWorldObject.class);
+return isisJdoSupport.newTypesafeQuery(HelloWorldObject.class)
+.executeList();
 }
 
 
@@ -69,7 +66,6 @@ public class HelloWorldObjects {
 RepositoryService repositoryService;

[isis] 11/13: ISIS-1726: generalizes the logic that searches for @PersistenceCapable entities, to also take into account meta-annotations.

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 8c3577452a6c9fff3c9fd4b177be4b16cff342a2
Author: Dan Haywood 
AuthorDate: Tue Sep 19 22:59:43 2017 +0100

ISIS-1726: generalizes the logic that searches for @PersistenceCapable 
entities, to also take into account meta-annotations.
---
 .../IsisComponentProvider.java | 37 --
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 8275b92..2557cb2 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -19,17 +19,19 @@
 
 package org.apache.isis.core.runtime.systemusinginstallers;
 
+import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 import javax.jdo.annotations.PersistenceCapable;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
@@ -140,21 +142,20 @@ public abstract class IsisComponentProvider {
 
 final Reflections reflections = new Reflections(packages);
 final Set domainServiceTypes = 
reflections.getTypesAnnotatedWith(DomainService.class);
-final Set persistenceCapableTypes = 
reflections.getTypesAnnotatedWith(PersistenceCapable.class);
+final Set persistenceCapableTypes = 
findPersistenceCapableTypes(reflections);
 final Set fixtureScriptTypes = 
reflections.getSubTypesOf(FixtureScript.class);
 
 final Set mixinTypes = Sets.newHashSet();
 mixinTypes.addAll(reflections.getTypesAnnotatedWith(Mixin.class));
 final Set domainObjectTypes = 
reflections.getTypesAnnotatedWith(DomainObject.class);
 mixinTypes.addAll(
-Lists.newArrayList(Iterables.filter(domainObjectTypes, new 
Predicate() {
-@Override
-public boolean apply(@Nullable final Class input) {
-if(input == null) { return false; }
-final DomainObject annotation = 
input.getAnnotation(DomainObject.class);
-return annotation.nature() == Nature.MIXIN;
+domainObjectTypes.stream().filter(input -> {
+if (input == null) {
+return false;
 }
-}))
+final DomainObject annotation = 
input.getAnnotation(DomainObject.class);
+return annotation.nature() == Nature.MIXIN;
+}).collect(Collectors.toList())
 );
 
 registry.setDomainServiceTypes(domainServiceTypes);
@@ -163,6 +164,24 @@ public abstract class IsisComponentProvider {
 registry.setMixinTypes(mixinTypes);
 }
 
+private Set findPersistenceCapableTypes(final Reflections 
reflections) {
+
+Set pcSet = Sets.newLinkedHashSet();
+
+Set persistenceCapables = 
reflections.getTypesAnnotatedWith(PersistenceCapable.class);
+persistenceCapables.stream()
+.filter(x -> !x.isAnnotation())
+.forEach(pcSet::add);
+
+Stream pcMetaAnnotStream =
+(Stream)persistenceCapables.stream().filter(x -> 
x.isAnnotation());
+pcMetaAnnotStream.map(metaAnnot -> 
reflections.getTypesAnnotatedWith(metaAnnot).stream())
+.flatMap(x -> x)
+.filter(x -> !x.isAnnotation())
+.forEach(pcSet::add);
+
+return pcSet;
+}
 
 private void specifyServicesAndRegisteredEntitiesUsing(final AppManifest 
appManifest) {
 final Iterable packageNames = 
modulePackageNamesFrom(appManifest);

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

[isis] 02/13: ISIS-1276: updates core to compile under JDK 1.8 only

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit e53003104b28900fbe0ad423dafb785004cc41ac
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:16:56 2017 +0100

ISIS-1276: updates core to compile under JDK 1.8 only
---
 core/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7f9b6a1..31a70c3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -57,8 +57,8 @@
 **/*IntegrationTest.java
 
 
-1.7
-1.7
+1.8
+1.8
 UTF-8
 
 false
@@ -2081,7 +2081,7 @@ ${license.additional-notes}
 
 
 
-1.7
+1.8
 oracle
 
 

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

[isis] 06/13: ISIS-1276: fixes algorithm for lookup of datastore id's, at least

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 96c6b362411814b51d0ac54fa1181aace3190ba2
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:55:49 2017 +0100

ISIS-1276: fixes algorithm for lookup of datastore id's, at least
---
 .../persistence/spi/JdoObjectIdSerializer.java | 45 +++---
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index 48d4da9..ebb4d40 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -90,37 +90,14 @@ public final class JdoObjectIdSerializer {
 final DatastoreId dnOid = (DatastoreId) jdoOid;
 final Object keyValue = dnOid.getKeyAsObject();
 
-if(false) {
-
-//
-// 1.8.0 original handling, appending a prefix "L_" or whatever
-//
-// if required by user community, we could add a property in 
isis.properties to enable if requested.
-//
-if(keyValue instanceof String) {
-return "S" + SEPARATOR + keyValue;
-}
-if(keyValue instanceof Long) {
-return "L" + SEPARATOR + keyValue;
-}
-
-if(keyValue instanceof BigInteger) {
-return "B" + SEPARATOR + keyValue;
-}
-if(keyValue instanceof Integer) {
-return "I" + SEPARATOR + keyValue;
-}
-
-} else {
-if( keyValue instanceof String ||
-keyValue instanceof Long ||
-keyValue instanceof BigDecimal || // 1.8.0 did not 
support BigDecimal
-keyValue instanceof BigInteger ||
-keyValue instanceof Integer) {
-
-// no separator
-return "" + keyValue;
-}
+if( keyValue instanceof String ||
+keyValue instanceof Long ||
+keyValue instanceof BigDecimal || // 1.8.0 did not support 
BigDecimal
+keyValue instanceof BigInteger ||
+keyValue instanceof Integer) {
+
+// no separator
+return "" + keyValue;
 }
 }
 
@@ -201,7 +178,11 @@ public final class JdoObjectIdSerializer {
 // @javax.jdo.annotations.PersistenceCapable(identityType = 
IdentityType.DATASTORE)
 // for one of the common types (prettier handling)
 
-return idStr + "[OID]" + spec.getFullIdentifier();
+// in DN 4.1, we did this...
+// return idStr + "[OID]" + spec.getFullIdentifier();
+
+// in DN 5.1, we simply do this...
+return idStr;
 
 }
 }

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

[isis] 04/13: ISIS-1276: fixes compile issues in metamodel and runtime

2017-10-26 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-1636-j8-time
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 2af08d35e515cc4cd9a5497c91f68acc0e0e8757
Author: Dan Haywood 
AuthorDate: Mon Sep 18 22:29:13 2017 +0100

ISIS-1276: fixes compile issues in metamodel and runtime
---
 .../facets/object/parseable/ParserUtil.java|  2 +-
 .../value/vsp/ValueSemanticsProviderUtil.java  |  3 +--
 ...ionParameterAbstractTest_getId_and_getName.java |  8 +++
 .../DataNucleusApplicationComponents.java  |  2 +-
 .../persistence/PersistenceSessionFactory.java |  2 +-
 .../CreateSchemaObjectFromClassMetadata.java   |  3 ++-
 .../service/support/IsisJdoSupportImpl.java| 27 +-
 7 files changed, 21 insertions(+), 26 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
index 3f70174..acc1105 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParserUtil.java
@@ -43,7 +43,7 @@ public final class ParserUtil {
 public static Class> parserOrNull(final Class 
candidateClass, final String classCandidateName) {
 @SuppressWarnings("rawtypes")
 final Class type = candidateClass != null ? 
ClassUtil.implementingClassOrNull(candidateClass.getName(), Parser.class, 
FacetHolder.class) : null;
-return type != null ? type : 
ClassUtil.implementingClassOrNull(classCandidateName, Parser.class, 
FacetHolder.class);
+return type != null ? type : 
(Class)ClassUtil.implementingClassOrNull(classCandidateName, Parser.class, 
FacetHolder.class);
 }
 
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
index f93ebe1..b34d5fe 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderUtil.java
@@ -24,7 +24,6 @@ import com.google.common.base.Strings;
 import org.apache.isis.applib.adapters.ValueSemanticsProvider;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.lang.ClassUtil;
-import org.apache.isis.core.commons.lang.StringExtensions;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
 public final class ValueSemanticsProviderUtil {
@@ -45,7 +44,7 @@ public final class ValueSemanticsProviderUtil {
 public static Class> 
valueSemanticsProviderOrNull(final Class candidateClass, final String 
classCandidateName) {
 @SuppressWarnings("rawtypes")
 final Class clazz = candidateClass != null ? 
ClassUtil.implementingClassOrNull(candidateClass.getName(), 
ValueSemanticsProvider.class, FacetHolder.class) : null;
-return clazz != null ? clazz : 
ClassUtil.implementingClassOrNull(classCandidateName, 
ValueSemanticsProvider.class, FacetHolder.class);
+return clazz != null ? clazz : 
(Class)ClassUtil.implementingClassOrNull(classCandidateName, 
ValueSemanticsProvider.class, FacetHolder.class);
 }
 
 }
diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index c5b46ec..691bc95 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -19,6 +19,7 @@
 
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
 import org.jmock.Expectations;
@@ -27,7 +28,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.base.Predicate;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -164,7 +164,7 @@ public class 
ObjectActionParameterAbstractTest_getId_and_getName {
 one(actionParamPeer).getFacet(NamedFacet.class);
 will(returnValue(null));
 
-

[isis] 07/07: ISIS-1632: updates to helloworld just for testing @Meta

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit f3b2dba9b9465ba67439a263618ed1fb1b83d457
Author: Dan Haywood 
AuthorDate: Mon Oct 23 17:32:05 2017 +0100

ISIS-1632: updates to helloworld just for testing @Meta
---
 .../main/java/domainapp/dom/annot/AreYouSure.java  | 39 
 .../src/main/java/domainapp/dom/annot/Name.java| 43 ++
 .../src/main/java/domainapp/dom/annot/Notes.java   | 39 
 .../java/domainapp/dom/impl/HelloWorldObject.java  | 16 
 4 files changed, 128 insertions(+), 9 deletions(-)

diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/annot/AreYouSure.java
 
b/example/application/helloworld/src/main/java/domainapp/dom/annot/AreYouSure.java
new file mode 100644
index 000..be22801
--- /dev/null
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/annot/AreYouSure.java
@@ -0,0 +1,39 @@
+/*
+ *  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 domainapp.dom.annot;
+
+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.annotation.Action;
+import org.apache.isis.applib.annotation.Meta;
+import org.apache.isis.applib.annotation.SemanticsOf;
+
+@Meta
+@Action(semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE)
+@Inherited
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, 
ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AreYouSure {
+
+}
\ No newline at end of file
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/annot/Name.java 
b/example/application/helloworld/src/main/java/domainapp/dom/annot/Name.java
new file mode 100644
index 000..c4fd1c5
--- /dev/null
+++ b/example/application/helloworld/src/main/java/domainapp/dom/annot/Name.java
@@ -0,0 +1,43 @@
+/*
+ *  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 domainapp.dom.annot;
+
+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.annotation.Editing;
+import org.apache.isis.applib.annotation.Meta;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.Property;
+
+@Meta
+@Property(editing = Editing.DISABLED)
+@Parameter(maxLength = 40)
+@ParameterLayout(named = "Name")
+@Inherited
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, 
ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Name {
+
+}
\ No newline at end of file
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/annot/Notes.java 
b/example/application/helloworld/src/main/java/domainapp/dom/annot/Notes.java
new file mode 100644
index 000..22fad39
--- /dev/null
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/annot/Notes.java
@@ -0,0 +1,39 @@
+/*
+ *  Licensed to the Apache Software

[isis] 03/07: ISIS-1742: deletes unused OptionHandlerXxx classes (Debug, Quiet, Verbose)

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 9c0ea74e59f2c729db7b1e6daf60937f92859885
Author: Dan Haywood 
AuthorDate: Tue Oct 17 18:51:09 2017 +0100

ISIS-1742: deletes unused OptionHandlerXxx classes (Debug, Quiet, Verbose)
---
 .../runtime/runner/opts/OptionHandlerDebug.java| 56 -
 .../runtime/runner/opts/OptionHandlerQuiet.java| 56 -
 .../runtime/runner/opts/OptionHandlerVerbose.java  | 57 --
 3 files changed, 169 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDebug.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDebug.java
deleted file mode 100644
index 5f3874e..000
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDebug.java
+++ /dev/null
@@ -1,56 +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.runtime.runner.opts;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-
-import static org.apache.isis.core.runtime.runner.Constants.DEBUG_OPT;
-
-/**
- * @deprecated - this seems to be a no-op; it is no longer registered in 
IsisRunner/IsisWebServer
- */
-@Deprecated
-public class OptionHandlerDebug extends OptionHandlerAbstract {
-
-public OptionHandlerDebug() {
-super();
-}
-
-@Override
-public void addOption(final Options options) {
-options.addOption(DEBUG_OPT, false, "print debugging messages");
-}
-
-@Override
-public boolean handle(final CommandLine commandLine, final BootPrinter 
bootPrinter, final Options options) {
-return true;
-}
-
-@Override
-public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) 
{
-// TODO need to prime or otherwise set logging.
-}
-
-}
diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerQuiet.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerQuiet.java
deleted file mode 100644
index 0327090..000
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerQuiet.java
+++ /dev/null
@@ -1,56 +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.runtime.runner.opts;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-
-import static org.apache.isis.core.runtime.runner.Constants.QUIET_OPT;
-
-/**
- * @deprecated - this seems to be a no-op; it is no longer registered in 
IsisRunner/IsisWebServer
- */
-@Deprecated
-public class OptionHandlerQuiet extends OptionHandlerAbstract {
-
-public OptionHandlerQuiet() {
-super();
-}
-
-

[isis] 06/07: ISIS-1632: adds initial support for @Meta annotation.

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 197fa8376d246468b72b6f0c69cf4b078cdd8a6a
Author: Dan Haywood 
AuthorDate: Mon Oct 23 17:31:22 2017 +0100

ISIS-1632: adds initial support for @Meta annotation.

However, these are not recursive, and does not merge in multiple 
definitions of various attributes at different levels.
---
 .../java/org/apache/isis/applib/AppManifest.java   |  13 ++-
 .../org/apache/isis/applib/annotation/Action.java  |   2 +-
 .../isis/applib/annotation/ActionLayout.java   |   2 +-
 .../apache/isis/applib/annotation/Collection.java  |   2 +-
 .../isis/applib/annotation/CollectionLayout.java   |   2 +-
 .../isis/applib/annotation/DomainObject.java   |   2 +-
 .../isis/applib/annotation/DomainObjectLayout.java |   2 +-
 .../isis/applib/annotation/DomainService.java  |   2 +-
 .../applib/annotation/DomainServiceLayout.java |   2 +-
 .../isis/applib/annotation/MemberGroupLayout.java  |   2 +-
 .../org/apache/isis/applib/annotation/Meta.java|  34 +++
 .../apache/isis/applib/annotation/Parameter.java   |   2 +-
 .../isis/applib/annotation/ParameterLayout.java|   2 +-
 .../apache/isis/applib/annotation/Property.java|   4 +-
 .../isis/applib/annotation/PropertyLayout.java |   2 +-
 .../apache/isis/applib/annotation/ViewModel.java   |   2 +-
 .../isis/applib/annotation/ViewModelLayout.java|   2 +-
 .../isis/core/metamodel/facets/Annotations.java| 103 -
 .../param/layout/ParameterLayoutFacetFactory.java  |   5 +-
 .../IsisComponentProvider.java |   4 +
 20 files changed, 171 insertions(+), 20 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java 
b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index 22c4fe4..cc7ccd6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -20,6 +20,7 @@
 package org.apache.isis.applib;
 
 import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Annotation;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -32,7 +33,6 @@ import java.util.Set;
 import javax.jdo.annotations.PersistenceCapable;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import org.reflections.vfs.SystemDir;
 import org.reflections.vfs.Vfs;
@@ -224,6 +224,17 @@ public interface AppManifest {
 }
 //endregion
 
+//region > metaAnnotationTypes
+private Set metaAnnotationTypes;
+
+public Set getMetaAnnotationTypes() {
+return metaAnnotationTypes;
+}
+public void setMetaAnnotationTypes(final Set metaAnnotationTypes) {
+this.metaAnnotationTypes = metaAnnotationTypes;
+}
+//endregion
+
 //region > domainServiceTypes
 private Set domainServiceTypes;
 /**
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 9e4e3a3..11ab9f8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -31,7 +31,7 @@ import 
org.apache.isis.applib.services.eventbus.ActionDomainEvent;
  * Domain semantics for domain object collection.
  */
 @Inherited
-@Target({ ElementType.METHOD })
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Action {
 
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 3c91af5..67f54b1 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType;
  * Layout hints for actions.
  */
 @Inherited
-@Target({ ElementType.METHOD })
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ActionLayout {
 
diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 50b8f95..a9085b0 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -33,7 +33,7 @@ import 
org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
  * Domain semantics for domain object

[isis] 01/07: ISIS-1742: removes support for exploration prefix for actions

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit e6bfa0f017e82ad9fc4af327ce5599eb8d308fcf
Author: Dan Haywood 
AuthorDate: Tue Oct 17 18:37:16 2017 +0100

ISIS-1742: removes support for exploration prefix for actions
---
 .../isis/applib/annotation/NatureOfService.java|  13 +--
 .../MethodPrefixBasedFacetFactoryAbstract.java |   1 -
 .../ActionNamedExplorationFacetFactory.java| 121 -
 .../interaction/ActionNamedFacetFactory.java   |  73 +
 .../actions/ActionMethodsFacetFactoryTest.java |   6 +-
 todo-deprecation-list.txt  |  32 +++---
 6 files changed, 94 insertions(+), 152 deletions(-)

diff --git 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
index 0502d80..e64fb4f 100644
--- 
a/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
+++ 
b/core/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
@@ -30,20 +30,15 @@ public enum NatureOfService {
 VIEW,
 /**
  * The service's actions appear on menus but do not contribute.
- *
- * 
- * Equivalent to annotating all actions with (the now deprecated) {@link 
org.apache.isis.applib.annotation.NotContributed} annotation.
- * 
  */
 VIEW_MENU_ONLY,
 /**
  * The service's actions can be contributed to domain objects as actions, 
properties or collections but do not
  * appear on menus.
  *
- * 
- * Equivalent to annotating all actions with (the now deprecated) {@link 
org.apache.isis.applib.annotation.NotInServiceMenu} annotation.
- * 
+ * @deprecated - use mixins instead
  */
+@Deprecated
 VIEW_CONTRIBUTIONS_ONLY,
 /**
  * The services actions should only be visible in the REST API exposed by 
the Restful Objects viewer.
@@ -51,10 +46,6 @@ public enum NatureOfService {
 VIEW_REST_ONLY,
 /**
  * The service's actions do not appear on menus and are not contributed.
- *
- * 
- * Equivalent to annotating all actions with both (the now deprecated) 
{@link org.apache.isis.applib.annotation.NotInServiceMenu} and {@link 
org.apache.isis.applib.annotation.NotContributed} annotations).
- * 
  */
 DOMAIN;
 
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 67a20a9..e246268 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -44,7 +44,6 @@ public abstract class MethodPrefixBasedFacetFactoryAbstract
 
 private final List prefixes;
 
-protected static final Object[] NO_PARAMETERS = new Object[0];
 protected static final Class[] NO_PARAMETERS_TYPES = new Class[0];
 
 private final OrphanValidation orphanValidation;
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
deleted file mode 100644
index b14ceee..000
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
+++ /dev/null
@@ -1,121 +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.interaction;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import

[isis] 04/07: ISIS-1742: deletes ObjectFixtureService, ObjectFixtureFilePersistor, ObjectLoaderFixture.

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 6a9e81eeb4c5feaf6b37bcaf585bfa38d91d826c
Author: Dan Haywood 
AuthorDate: Sun Oct 22 14:49:41 2017 +0100

ISIS-1742: deletes ObjectFixtureService, ObjectFixtureFilePersistor, 
ObjectLoaderFixture.

Also:
- removes support for SERVICES_PREFIX_KEY (common package prefix for 
services) from ServicesInstallerFromConfiguration
---
 .../fixturedomainservice/FixtureException.java |  43 
 .../ObjectFixtureFilePersistor.java| 243 ---
 .../fixturedomainservice/ObjectFixtureService.java | 264 -
 .../FixturesInstallerFromConfiguration.java|   4 -
 .../domainservice/ObjectLoaderFixture.java |  45 
 .../ServicesInstallerFromConfiguration.java|  59 +
 todo-deprecation-list.txt  |   9 +-
 7 files changed, 5 insertions(+), 662 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/FixtureException.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/FixtureException.java
deleted file mode 100644
index ff91921..000
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/FixtureException.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.core.runtime.fixturedomainservice;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-
-public class FixtureException extends IsisException {
-private static final long serialVersionUID = 1L;
-
-public FixtureException() {
-super();
-}
-
-public FixtureException(final String msg, final Throwable cause) {
-super(msg, cause);
-}
-
-public FixtureException(final String msg) {
-super(msg);
-}
-
-public FixtureException(final Throwable cause) {
-super(cause);
-}
-
-}
diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
deleted file mode 100644
index 8c5780a..000
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ /dev/null
@@ -1,243 +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.runtime.fixturedomainservice;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import com.google.common.collect.Maps;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import 
org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import 
org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
-import

[isis] 02/07: ISIS-1742: deletes unused facet impl, PrototypeFacetViaExplorationPrefixNamingConvention

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 3b887bafdb373f17fccd3dd9135ec906ad3ccd36
Author: Dan Haywood 
AuthorDate: Tue Oct 17 18:48:25 2017 +0100

ISIS-1742: deletes unused facet impl, 
PrototypeFacetViaExplorationPrefixNamingConvention
---
 ...eFacetViaExplorationPrefixNamingConvention.java | 37 --
 todo-deprecation-list.txt  |  2 --
 2 files changed, 39 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java
deleted file mode 100644
index 7ce457a..000
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.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.actions.interaction;
-
-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 PrototypeFacetViaExplorationPrefixNamingConvention extends 
PrototypeFacetAbstract {
-
-public PrototypeFacetViaExplorationPrefixNamingConvention(
-final FacetHolder holder, final DeploymentCategory 
deploymentCategory) {
-super(holder, deploymentCategory);
-}
-
-}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index bebb90b..246576a 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -40,8 +40,6 @@ Also for 2.0.0, new features/deprecations:
 OTHER STUFF:
 
 
-remove prototypeXxx() prefix
-remove debugXxx() prefix
 
 
 debug() stuff

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

[isis] 05/07: ISIS-1742: updates todo list

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit a6cf98a148d2c58757595b1a4227d77011908b23
Author: Dan Haywood 
AuthorDate: Mon Oct 23 16:11:25 2017 +0100

ISIS-1742: updates todo list
---
 todo-deprecation-list.txt | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index cd99195..1d54d15 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -31,7 +31,9 @@ Also for 2.0.0, new features/deprecations:
 deprecate FixtureScripts service with view to removing from applib ... the 
framework provides an implementation by default
 get rid of automatic initialization of fields (perhaps behind a config 
property)
 deprecate the Apache Isis' DateTime classes for removal in the future) ... 
and probably all of the custom value types, subclasses of Magnitude
-
+flag to make @Action mandatory, @Programmatic the default
+merge metamodel and runtime
+remove *Installer
 
 
 
~
@@ -41,7 +43,6 @@ OTHER STUFF:
 
 
 
-ObjectFixtureService + supporting classes
 
 SwitchUserService
 AbstractFixtureSusa
@@ -492,3 +493,5 @@ 
org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceFor
 - unused
 
 
+
+ObjectFixtureService + supporting classes

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

[isis] branch ISIS-1632-meta-annotations updated (9d15b17 -> f3b2dba)

2017-10-26 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


 discard 9d15b17  ISIS-1632: updates to helloworld just for testing @Meta
 discard 2861102  ISIS-1632: adds initial support for @Meta annotation.
 discard a5d371c  ISIS-1742: updates todo list
 discard 6b72d79  ISIS-1742: removes stale unit test (referencing facet factory 
long since deleted...)
 discard bd4118a  ISIS-1742: deletes ObjectFixtureService, 
ObjectFixtureFilePersistor, ObjectLoaderFixture.
 discard 4cac2bc  ISIS-1742: deletes unused OptionHandlerXxx classes (Debug, 
Quiet, Verbose)
 discard 144e8f0  ISIS-1742: deletes unused facet impl, 
PrototypeFacetViaExplorationPrefixNamingConvention
 discard 575a313  ISIS-1742: removes support for exploration prefix for actions
 add 74befd5  Update _rgsvc_integration-api_BookmarkService.adoc
 add f9f0418  Update _rgsvc_integration-api_BookmarkService.adoc
 add ddc251a  Merge pull request #107 from ppirus/patch-8
 add c7f738e  Update _ugfun_building-blocks_identifiers_oid.adoc
 add b323e58  Merge pull request #106 from ppirus/patch-7
 add ebefcb3  Update _rgant-DomainObject_nature.adoc
 add 67cea8a  Merge pull request #108 from ppirus/patch-9
 add aed996d  ISIS-1465: adds stuff on cgcom rel process
 add b6e96db  ISIS-1752: adds new 'menuBars' resource to RO viewer
 add edcebfa  adds new 'menuBars' resource to RO viewer
 add 0173c20  fixes comment in github-pr.sh
 add 00ce18d  Merge remote-tracking branch 'origin/master'
 add b08d3c2  ISIS-1752: moves oid from MenuSection down into ActionLayout, 
so that could support custom menus in the future.
 add 19a47a8  Merge branch 'ISIS-1752-menu-layout-resource'
 add d70337f  ISIS-1752: factors out MenuBarsService, refactors Wicket UI 
to use MenuBarsService.
 add 1360bc3  ISIS-1752: deletes unused methods in ServiceActionUtil (now 
within MenuBarsServiceDefault).
 add 0b7f445  ISIS-1572: adds outline docs for MenuBarsService
 add bc5fdbe  ISIS-1752: fixes unit test
 add 1b9db57  ISIS-1752: removes unused import
 add 70e6bd1  Merge branch 'master' into 
dev/2.0.0/ISIS-1742-remove-deprecations
 add 63cded2  ISIS-1742: having to delete unit test again (?!?) after merge 
from master.
 add ec9ee59  ISIS-1742: removes merge conflict markers accidentally left 
in file
 add 10b9e04  ISIS-1742: replaces Filter with Predicate in new 
MenuBarsServiceDefault
 add d96dc04  Proper lifecycling in preparation of ISIS-1756
 add aba7a26  Update IsisContext.java
 new e6bfa0f  ISIS-1742: removes support for exploration prefix for actions
 new 3b887ba  ISIS-1742: deletes unused facet impl, 
PrototypeFacetViaExplorationPrefixNamingConvention
 new 9c0ea74  ISIS-1742: deletes unused OptionHandlerXxx classes (Debug, 
Quiet, Verbose)
 new 6a9e81e  ISIS-1742: deletes ObjectFixtureService, 
ObjectFixtureFilePersistor, ObjectLoaderFixture.
 new a6cf98a  ISIS-1742: updates todo list
 new 197fa83  ISIS-1632: adds initial support for @Meta annotation.
 new f3b2dba  ISIS-1632: updates to helloworld just for testing @Meta

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9d15b17)
\
 N -- N -- N   refs/heads/ISIS-1632-meta-annotations (f3b2dba)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 7 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/cgcom/_cgcom_cutting-a-release.adoc |   9 +-
 .../cgcom/images/docker/020-docker-nat-public.png  | Bin 0 -> 28329 bytes
 .../images/docker/022-local-security-policy.png| Bin 0 -> 29071 bytes
 .../images/docker/024-unidentified-are-private.png | Bin 0 -> 7330 bytes
 .../cgcom/images/docker/026-docker-nat-private.png | Bin 0 -> 28808 bytes
 .../cgcom/images/{ => docker}/docker-daemon.png| Bin
 .../guides/rgant/_rgant-DomainObject_nature.adoc   |   6 +-
 .../_rgsvc_integration-api_BookmarkService.adoc|   2 +-
 .../_rgsvc_presentation-layer-spi_GridService.adoc |  35 ++-
 ...vc_presentation-layer-spi_MenuBarsService.adoc} |  40 ++--
 .../_ugfun_building-blocks_identifiers_oid.adoc|   2 +-
 .../{component => menus}/ActionLayoutData.java

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated: Update IsisContext.java

2017-10-26 Thread ahuber

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to 
refs/heads/dev/2.0.0/ISIS-1742-remove-deprecations by this push:
 new aba7a26  Update IsisContext.java
aba7a26 is described below

commit aba7a2652675f37d8415cf2201bd2422509dc6bd
Author: Andi Huber 
AuthorDate: Thu Oct 26 12:09:57 2017 +0200

Update IsisContext.java
---
 .../org/apache/isis/core/runtime/system/context/IsisContext.java  | 8 
 1 file changed, 8 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index ba61579..55cc5bd 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -72,14 +72,6 @@ public final class IsisContext {
 }
 IsisContext.sessionFactory = sessionFactory;
 }
-
-
-/**
- * Resets
- */
-public static void testReset() {
-destroy();
-}
 
 /**
  * Resets

-- 
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: Proper lifecycling in preparation of ISIS-1756

2017-10-26 Thread ahuber

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to 
refs/heads/dev/2.0.0/ISIS-1742-remove-deprecations by this push:
 new d96dc04  Proper lifecycling in preparation of ISIS-1756
d96dc04 is described below

commit d96dc04587a80db6b87f5f6f67ba11fe477ca983
Author: Andi Huber 
AuthorDate: Thu Oct 26 11:48:47 2017 +0200

Proper lifecycling in preparation of ISIS-1756
---
 .../isis/core/runtime/system/context/IsisContext.java  | 18 ++
 1 file changed, 18 insertions(+)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 495458b..ba61579 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -78,7 +78,25 @@ public final class IsisContext {
  * Resets
  */
 public static void testReset() {
+destroy();
+}
+
+/**
+ * Resets
+ * @deprecated replaced by {@link #destroy()}
+ * 
+ */
+public static void testReset() {
+   destroy();
+}
+
+/**
+ * Destroys this context and clears any state associated with it. 
+ * It marks the end of IsisContext's lifecycle. Subsequent calls have no 
effect. 
+ */
+public static void destroy() {
 sessionFactory = null;
+metamodelInvalidException = null;
 }
 
 //endregion

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

[isis] 04/04: ISIS-1742: replaces Filter with Predicate in new MenuBarsServiceDefault

2017-10-26 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 10b9e0436116242353bd214231a83a2bb189a625
Author: Dan Haywood 
AuthorDate: Thu Oct 26 08:28:54 2017 +0100

ISIS-1742: replaces Filter with Predicate in new MenuBarsServiceDefault
---
 .../isis/core/runtime/services/menu/MenuBarsServiceDefault.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
index 684b365..eae62df 100644
--- 
a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
+++ 
b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
@@ -25,6 +25,7 @@ import java.util.Set;
 import javax.inject.Inject;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
@@ -35,7 +36,6 @@ import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.filter.Filters;
 import org.apache.isis.applib.layout.menus.ActionLayoutData;
 import org.apache.isis.applib.layout.menus.Menu;
 import org.apache.isis.applib.layout.menus.MenuBar;
@@ -210,7 +210,7 @@ public class MenuBarsServiceDefault implements 
MenuBarsService {
 }
 
 for (final ObjectAction objectAction : serviceSpec.getObjectActions(
-actionType, Contributed.INCLUDED, 
Filters.any())) {
+actionType, Contributed.INCLUDED, 
Predicates.alwaysTrue())) {
 
 // skip if annotated to not be included in repository menu using 
legacy mechanism
 if (objectAction.getFacet(NotInServiceMenuFacet.class) != null) {

-- 
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 (2c8ddaa -> 10b9e04)

2017-10-26 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 2c8ddaa  ISIS-1742: removes "notInServiceMenu" prefix, "name" prefix, 
"plural" prefix, "description", "optional", "alwaysHide", "protect" prefixes.
 add 74befd5  Update _rgsvc_integration-api_BookmarkService.adoc
 add f9f0418  Update _rgsvc_integration-api_BookmarkService.adoc
 add ddc251a  Merge pull request #107 from ppirus/patch-8
 add c7f738e  Update _ugfun_building-blocks_identifiers_oid.adoc
 add b323e58  Merge pull request #106 from ppirus/patch-7
 add ebefcb3  Update _rgant-DomainObject_nature.adoc
 add 67cea8a  Merge pull request #108 from ppirus/patch-9
 add aed996d  ISIS-1465: adds stuff on cgcom rel process
 add b6e96db  ISIS-1752: adds new 'menuBars' resource to RO viewer
 add edcebfa  adds new 'menuBars' resource to RO viewer
 add 0173c20  fixes comment in github-pr.sh
 add 00ce18d  Merge remote-tracking branch 'origin/master'
 add b08d3c2  ISIS-1752: moves oid from MenuSection down into ActionLayout, 
so that could support custom menus in the future.
 add 19a47a8  Merge branch 'ISIS-1752-menu-layout-resource'
 add d70337f  ISIS-1752: factors out MenuBarsService, refactors Wicket UI 
to use MenuBarsService.
 add 1360bc3  ISIS-1752: deletes unused methods in ServiceActionUtil (now 
within MenuBarsServiceDefault).
 add 0b7f445  ISIS-1572: adds outline docs for MenuBarsService
 add bc5fdbe  ISIS-1752: fixes unit test
 add 1b9db57  ISIS-1752: removes unused import
 new 70e6bd1  Merge branch 'master' into 
dev/2.0.0/ISIS-1742-remove-deprecations
 new 63cded2  ISIS-1742: having to delete unit test again (?!?) after merge 
from master.
 new ec9ee59  ISIS-1742: removes merge conflict markers accidentally left 
in file
 new 10b9e04  ISIS-1742: replaces Filter with Predicate in new 
MenuBarsServiceDefault

The 4 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/cgcom/_cgcom_cutting-a-release.adoc |   9 +-
 .../cgcom/images/docker/020-docker-nat-public.png  | Bin 0 -> 28329 bytes
 .../images/docker/022-local-security-policy.png| Bin 0 -> 29071 bytes
 .../images/docker/024-unidentified-are-private.png | Bin 0 -> 7330 bytes
 .../cgcom/images/docker/026-docker-nat-private.png | Bin 0 -> 28808 bytes
 .../cgcom/images/{ => docker}/docker-daemon.png| Bin
 .../guides/rgant/_rgant-DomainObject_nature.adoc   |   6 +-
 .../_rgsvc_integration-api_BookmarkService.adoc|   2 +-
 .../_rgsvc_presentation-layer-spi_GridService.adoc |  35 ++-
 ...vc_presentation-layer-spi_MenuBarsService.adoc} |  40 ++--
 .../_ugfun_building-blocks_identifiers_oid.adoc|   2 +-
 .../{component => menus}/ActionLayoutData.java | 107 +++--
 .../ActionLayoutDataOwner.java |   4 +-
 .../org/apache/isis/applib/layout/menus/Menu.java  |  93 
 .../apache/isis/applib/layout/menus/MenuBar.java}  |  42 ++--
 .../apache/isis/applib/layout/menus/MenuBars.java  | 111 ++
 .../isis/applib/layout/menus/MenuSection.java} |  41 +++-
 .../layout/{component => menus}/package-info.java  |   9 +-
 .../fixturespec/FixtureScriptsDefault.java |   6 +
 .../isis/applib/services/menu/MenuBarsService.java |   9 +
 .../services/swagger/SwaggerServiceMenu.java   |  44 +++-
 .../layout/menus/MenuBars_roundtrip_Test.java  |  79 +++
 .../NotInServiceMenuMethodFacetFactoryTest.java|  73 --
 .../services/menu/MenuBarsServiceDefault.java  | 245 +
 .../runtime/services/menu/ServiceAndAction.java|  27 +++
 .../isis/viewer/restfulobjects/applib/Rel.java |   1 +
 .../restfulobjects/applib/RepresentationType.java  |   4 +
 .../restfulobjects/applib/RestfulMediaType.java|   2 +
 .../MenuBarsResource.java} |  41 ++--
 .../server/RestfulObjectsApplication.java  |   2 +
 .../server/resources/HomePageReprRenderer.java |   9 +-
 .../resources/HomePageResourceServerside.java  |   5 +
 ...erside.java => MenuBarsResourceServerside.java} |  55 +++--
 .../serviceactions/ServiceActionUtil.java  | 235 +++-
 .../serviceactions/ServiceActionsPanelFactory.java |  20 +-
 .../serviceactions/TertiaryActionsPanel.html   |  12 +
 .../serviceactions/TertiaryMenuPanelFactory.java   |  20 +-
 github-pr.sh   |   2 +-
 38 files changed, 970 insertions(+), 422 deletions(-)
 create mode 100644 
adocs/documentation/src/main/asciidoc/guides/cgcom/images/docker/020-docker-nat-public.png
 create mode 100644

[isis] 02/04: ISIS-1742: having to delete unit test again (?!?) after merge from master.

2017-10-26 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 63cded262e56b99b6a68ce955dff06d49f56053c
Author: Dan Haywood 
AuthorDate: Thu Oct 26 08:23:40 2017 +0100

ISIS-1742: having to delete unit test again (?!?) after merge from master.
---
 .../NotInServiceMenuMethodFacetFactoryTest.java| 73 --
 1 file changed, 73 deletions(-)

diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
deleted file mode 100644
index 4b9be47..000
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
+++ /dev/null
@@ -1,73 +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.notinservicemenu.method;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import 
org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
-import 
org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
-
-public class NotInServiceMenuMethodFacetFactoryTest extends 
AbstractFacetFactoryTest {
-
-private NotInServiceMenuFacetViaMethodFactory facetFactory;
-
-@Override
-protected void setUp() throws Exception {
-super.setUp();
-
-facetFactory = new NotInServiceMenuFacetViaMethodFactory();
-}
-
-@Override
-protected void tearDown() throws Exception {
-facetFactory = null;
-super.tearDown();
-}
-
-public void testSupportingMethodForActionPickedUp() {
-// given
-class CustomerRepository {
-@SuppressWarnings("unused")
-public void someAction() {
-}
-
-@SuppressWarnings("unused")
-public boolean notInServiceMenuSomeAction() {
-return true;
-}
-}
-final Method actionMethod = findMethod(CustomerRepository.class, 
"someAction");
-
-// when
-facetFactory.process(new 
ProcessMethodContext(CustomerRepository.class, null, actionMethod, 
methodRemover, facetedMethod));
-
-// then
-final Facet facet = 
facetedMethod.getFacet(NotInServiceMenuFacet.class);
-assertNotNull(facet);
-assertTrue(facet instanceof NotInServiceMenuFacetAbstract);
-
-// assertNoMethodsRemoved();
-assertEquals(1, methodRemover.getRemovedMethodMethodCalls().size());
-}
-
-}

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

[isis] 03/04: ISIS-1742: removes merge conflict markers accidentally left in file

2017-10-26 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 ec9ee590771388cd3f4cbe5d5be695d4c87de6a2
Author: Dan Haywood 
AuthorDate: Thu Oct 26 08:28:29 2017 +0100

ISIS-1742: removes merge conflict markers accidentally left in file
---
 .../serviceactions/ServiceActionUtil.java  | 22 --
 1 file changed, 22 deletions(-)

diff --git 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index af8d968..38c648d 100644
--- 
a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ 
b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -21,27 +21,6 @@ package 
org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
 
 import java.util.List;
 
-<<< HEAD
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import 
org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import 
org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.ActionType;
-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;
-import org.apache.isis.core.runtime.system.IsisSystem;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
-import 
org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-===
 import com.google.common.base.Function;
 import com.google.common.base.Strings;
 import com.google.common.collect.FluentIterable;
@@ -49,7 +28,6 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
->>> master
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;

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

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated (f3b2dba -> 197fa83)

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations created (now f3b2dba)

[isis] branch ISIS-1632-meta-annotations deleted (was f3b2dba)

[isis] 08/13: ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib

[isis] 01/13: ISIS-1276: updates references for datanucleus.

[isis] 09/13: ISIS-1725: requires that an AppManifest is supplied (used to obtain list of entities).

[isis] 03/13: ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery

[isis] 05/13: ISIS-1276: fixes compile issue in specsupport

[isis] 10/13: ISIS-1727: uses lambda in IsisSessionFactoryBuilder

[isis] 13/13: ISIS-1636 UI enhancement - java 8 Time

[isis] 12/13: ISIS-1728: uses typesafe queries for helloworld

[isis] 11/13: ISIS-1726: generalizes the logic that searches for @PersistenceCapable entities, to also take into account meta-annotations.

[isis] 02/13: ISIS-1276: updates core to compile under JDK 1.8 only

[isis] 06/13: ISIS-1276: fixes algorithm for lookup of datastore id's, at least

[isis] 04/13: ISIS-1276: fixes compile issues in metamodel and runtime

[isis] 07/07: ISIS-1632: updates to helloworld just for testing @Meta

[isis] 03/07: ISIS-1742: deletes unused OptionHandlerXxx classes (Debug, Quiet, Verbose)

[isis] 06/07: ISIS-1632: adds initial support for @Meta annotation.

[isis] 01/07: ISIS-1742: removes support for exploration prefix for actions

[isis] 04/07: ISIS-1742: deletes ObjectFixtureService, ObjectFixtureFilePersistor, ObjectLoaderFixture.

[isis] 02/07: ISIS-1742: deletes unused facet impl, PrototypeFacetViaExplorationPrefixNamingConvention

[isis] 05/07: ISIS-1742: updates todo list

[isis] branch ISIS-1632-meta-annotations updated (9d15b17 -> f3b2dba)

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated: Update IsisContext.java

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated: Proper lifecycling in preparation of ISIS-1756

[isis] 04/04: ISIS-1742: replaces Filter with Predicate in new MenuBarsServiceDefault

[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated (2c8ddaa -> 10b9e04)

[isis] 02/04: ISIS-1742: having to delete unit test again (?!?) after merge from master.

[isis] 03/04: ISIS-1742: removes merge conflict markers accidentally left in file

29 matches

Site Navigation

Mail list logo

Footer information