subject:"\[isis\] 01\/02\: Merge branch 'maint\-1.16.2'"

[isis] 01/02: Merge branch 'maint-1.16.2'

2018-03-06 Thread danhaywood

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

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

commit 9da1440920bb1516caeeaf292f2de5599775c815
Merge: f071427 fb83729
Author: Dan Haywood 
AuthorDate: Tue Mar 6 12:31:58 2018 +

Merge branch 'maint-1.16.2'

# Conflicts:
#   core/pom.xml
#   core/runtime/pom.xml
#   core/security-shiro/pom.xml
#   example/application/helloworld/pom.xml
#   example/application/simpleapp/pom.xml
#   example/archetype/simpleapp/pom.xml

 STATUS |  4 +++
 .../documentation/src/main/asciidoc/doap_isis.rdf  | 24 ++
 .../documentation/src/main/asciidoc/downloads.adoc | 12 +++
 ...ugfun_getting-started_helloworld-archetype.adoc |  2 +-
 ..._ugfun_getting-started_simpleapp-archetype.adoc |  2 +-
 adocs/documentation/src/main/asciidoc/index.html   | 11 ---
 .../src/main/asciidoc/pages/tg/tg.adoc |  2 +-
 .../release-notes/_release-notes_1.16.2.adoc   | 36 +
 .../main/asciidoc/release-notes/release-notes.adoc |  9 ++
 adocs/template/document.html.erb   |  2 +-
 .../core/metamodel/spec/feature/ObjectAction.java  |  2 +-
 .../viewer/wicket/model/models/ScalarModel.java| 32 ++-
 .../actionresponse/ActionResultResponseType.java   | 11 +++
 .../actionmenu/serviceactions/CssMenuItem.java | 10 +-
 .../serviceactions/ServiceActionUtil.java  |  1 +
 .../serviceactions/ServiceActionsPanel.java| 37 ++
 .../serviceactions/TertiaryActionsPanel.html   |  2 +-
 .../components/actions/ActionParametersForm.java   | 22 +++--
 .../actions/ActionParametersFormPanel.java |  2 +-
 .../CollectionContentsAsAjaxTablePanel.java|  2 +-
 .../columns/ObjectAdapterPropertyColumn.java   |  3 +-
 .../wicket/ui/components/header/HeaderPanel.html   |  2 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |  2 +-
 .../components/scalars/ScalarPanelAbstract2.java   |  6 ++--
 .../StandaloneCollectionPanel.java |  6 ++--
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |  4 +--
 .../wicket/ui/pages/login/IsisSignInPanel.html |  4 +--
 .../viewer/wicket/ui/util/CssClassAppender.java|  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 .../resources/projects/basic/archetype.properties  |  2 +-
 .../META-INF/maven/archetype-metadata.xml  | 19 ---
 .../application/logging-integtest.properties   | 10 ++
 .../application/DomainAppApplicationModule.java|  3 ++
 .../module-simple/logging-integtest.properties |  9 ++
 .../domainapp/modules/simple/SimpleModule.java |  5 ++-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 .../resources/projects/basic/archetype.properties  |  2 +-
 37 files changed, 234 insertions(+), 74 deletions(-)


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

[isis] 01/02: Merge branch 'maint-1.16.2'

2018-02-28 Thread danhaywood

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

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

commit e3ecefd11686294dee3c9080a418b9a10bc14f6f
Merge: 4485ce6 bc7253b
Author: Dan Haywood 
AuthorDate: Wed Feb 28 13:28:30 2018 +

Merge branch 'maint-1.16.2'

 ...esentation-layer_ContentNegotiationService.adoc |  10 +-
 .../apache/isis/applib/AppManifestAbstract2.java   |  32 
 .../org/apache/isis/applib/IsisApplibModule.java   |  27 +++-
 .../isis/applib/ModuleOrBuilderAbstract.java   |  39 -
 .../isis/applib/domain/DomainObjectList.java   | 176 +
 .../isis/applib/services/jaxb/JaxbService.java |  42 +++--
 .../applib/services/jaxb/JaxbServiceDefault.java   |  67 +++-
 .../java/org/apache/isis/applib/util/JaxbUtil.java |   8 +-
 .../apache/isis/schema/utils/ChangesDtoUtils.java  |   1 +
 .../jaxbadapters/PersistentEntitiesAdapter.java|  70 
 .../action/ActionAnnotationFacetFactory.java   |  12 +-
 .../action/associateWith/AssociatedWithFacet.java  |  21 +--
 .../associateWith/AssociatedWithFacetAbstract.java |  28 ++--
 .../AssociatedWithFacetForActionAnnotation.java|  19 +--
 ...onParameterDefaultsAndChoicesPostProcessor.java |  91 +++
 ...eterDefaultsFacetFromAssociatedCollection.java} |   4 +-
 .../services/swagger/internal/Generation.java  |   1 +
 .../core/metamodel/spec/feature/ObjectAction.java  |  15 +-
 .../viewer/restfulobjects/rendering/Responses.java |  15 ++
 .../domainobjects/ActionResultReprRenderer.java|   7 +
 .../domainobjects/ObjectAndActionInvocation.java   |   9 ++
 ...entNegotiationServiceForRestfulObjectsV1_0.java | 174 ++--
 .../server/resources/DomainResourceHelper.java |   2 +-
 .../ui/components/collection/CollectionPanel.java  |   7 +-
 .../linkandlabel/ActionLinkFactoryAbstract.java|   6 +-
 .../application/logging-integtest.properties   |  10 ++
 .../application/DomainAppApplicationModule.java|   3 +
 .../module-simple/logging-integtest.properties |   9 ++
 .../domainapp/modules/simple/SimpleModule.java |   5 +-
 29 files changed, 737 insertions(+), 173 deletions(-)

diff --cc core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index 5ef90ac,20771a0..a98a5ef
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@@ -18,22 -18,85 +18,39 @@@
   */
  package org.apache.isis.applib;
  
- public final class IsisApplibModule {
+ import java.util.List;
 -
+ import javax.xml.bind.annotation.XmlRootElement;
  
- private IsisApplibModule(){}
+ @XmlRootElement(name = "module")
+ public class IsisApplibModule extends ModuleAbstract {
+ 
+ //region > ui event classes
++@SuppressWarnings("serial") // serial versionId to be provided by 
concrete class
+ public abstract static class TitleUiEvent
+ extends org.apache.isis.applib.services.eventbus.TitleUiEvent 
{ }
++@SuppressWarnings("serial") // serial versionId to be provided by 
concrete class
+ public abstract static class IconUiEvent
+ extends org.apache.isis.applib.services.eventbus.IconUiEvent { 
}
++@SuppressWarnings("serial") // serial versionId to be provided by 
concrete class
+ public abstract static class CssClassUiEvent
+ extends 
org.apache.isis.applib.services.eventbus.CssClassUiEvent { }
+ //endregion
+ 
++
+ //region > domain event classes
 -public abstract static class ActionDomainEvent extends 
org.apache.isis.applib.services.eventbus.ActionDomainEvent {
 -public ActionDomainEvent() {}
  
 -/**
 - * @deprecated - use the {@link #ActionDomainEvent() no-arg 
constructor} instead to avoid boilerplate.
 - */
 -@Deprecated
 -public ActionDomainEvent(final S source, final Identifier identifier) 
{
 -super(source, identifier);
 -}
 -/**
 - * @deprecated - use the {@link #ActionDomainEvent() no-arg 
constructor} instead to avoid boilerplate.
 - */
 -@Deprecated
 -public ActionDomainEvent(final S source, final Identifier identifier, 
final Object... arguments) {
 -super(source, identifier, arguments);
 -}
 -/**
 - * @deprecated - use the {@link #ActionDomainEvent() no-arg 
constructor} instead to avoid boilerplate.
 - */
 -@Deprecated
 -public ActionDomainEvent(final S source, final Identifier identifier, 
final List arguments) {
 -super(source, identifier, arguments);
 -}
 +@SuppressWarnings("serial") // serial versionId to be provided by 
concrete class
 +  public abstract static class ActionDomainEvent extends 
org.apache.isis.applib.services.eventbus.ActionDomainEvent {
- public ActionDomainEvent() {}

[isis] 01/02: Merge branch 'maint-1.16.2'

2018-02-22 Thread danhaywood

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

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

commit 88665f627db142b411948a13f28bb1e789093cb9
Merge: ce0c4c5 826726c
Author: Dan Haywood 
AuthorDate: Fri Feb 23 00:57:09 2018 +

Merge branch 'maint-1.16.2'

 STATUS |  8 +++
 adocs/documentation/pom-pdf.xml|  2 +-
 .../documentation/src/main/asciidoc/doap_isis.rdf  | 24 +++
 .../documentation/src/main/asciidoc/downloads.adoc | 12 ++--
 .../guides/cgcom/_cgcom_cutting-a-release.adoc |  2 +-
 .../cgcom/_cgcom_post-release-successful.adoc  | 41 ---
 ...cgcom_release-process-for-interim-releases.adoc | 12 ++--
 .../guides/cgcom/_cgcom_verifying-releases.adoc| 19 ++---
 ...ugfun_getting-started_helloworld-archetype.adoc |  2 +-
 ..._ugfun_getting-started_simpleapp-archetype.adoc |  2 +-
 adocs/documentation/src/main/asciidoc/index.html   | 71 +--
 .../src/main/asciidoc/pages/tg/tg.adoc |  2 +-
 .../release-notes/_release-notes_1.13.0.adoc   |  2 +-
 .../release-notes/_release-notes_1.16.1.adoc   | 80 ++
 .../main/asciidoc/release-notes/release-notes.adoc | 10 +--
 adocs/template/document.html.erb   |  2 +-
 .../cssclassfa/annotprop/MixinInterceptor.java |  4 +-
 ...onParameterDefaultsAndChoicesPostProcessor.java |  2 +-
 .../core/metamodel/spec/feature/ObjectAction.java  | 29 +---
 core/pom.xml   | 23 +--
 .../runtime/services/ServiceInstantiatorTest.java  | 27 
 .../wicket/model/mementos/CollectionMemento.java   | 25 ---
 .../wicket/model/models/EntityCollectionModel.java | 12 +++-
 .../collection/AssociatedWithActionsHelper.java|  8 ++-
 example/application/simpleapp/README.adoc  |  2 +-
 example/archetype/helloworld/pom.xml   |  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  3 +-
 .../java/domainapp/dom/impl/HelloWorldObject.java  |  1 +
 .../resources/projects/basic/archetype.properties  |  2 +-
 .../main/resources/archetype-resources/README.adoc |  2 +-
 .../bdd/specglue/BootstrappingGlue.java| 16 -
 .../{RunBddSpecs.java => RunIntegBddSpecs.java}|  2 +-
 .../modules/simple/dom/impl/SimpleObject.java  |  3 +-
 .../simple/dom/impl/SimpleObject.layout.xml|  6 +-
 .../src/main/resources/archetype-resources/pom.xml |  3 +-
 .../resources/projects/basic/archetype.properties  |  2 +-
 36 files changed, 344 insertions(+), 121 deletions(-)

diff --cc 
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index f8166ee,acdc126..22e1d14
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@@ -380,8 -385,41 +380,8 @@@ public interface ObjectAction extends O
  private Predicates() {
  }
  
- public static Predicate associatedWith(final String 
collectionName) {
- return new AssociatedWith(collectionName);
 -public static Predicate dynamicallyVisible(
 -final ObjectAdapter target,
 -final InteractionInitiatedBy interactionInitiatedBy,
 -final Where where) {
 -return org.apache.isis.applib.filter.Filters
 -.asPredicate(Filters.dynamicallyVisible(target, 
interactionInitiatedBy, where));
 -}
 -
 -public static Predicate withId(final String actionId) {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.withId(actionId));
 -}
 -
 -public static Predicate withNoValidationRules() {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.withNoValidationRules());
 -}
 -
 -public static Predicate ofType(final ActionType type) {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.ofType(type));
 -}
 -
 -public static Predicate bulk() {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.bulk());
 -}
 -
 -// UNUSED?
 -public static Predicate notBulkOnly() {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.notBulkOnly());
 -}
 -
 -public static Predicate memberOrderOf(ObjectAssociation 
association) {
 -return 
org.apache.isis.applib.filter.Filters.asPredicate(Filters.memberOrderOf(association));
 -}
 -
+ public static Predicate associatedWith(final 
ObjectAssociation objectAssociation) {
+ return new AssociatedWith(objectAssociation);
  }
  
  public static Predicate 
associatedWithAndWithCollectionParameterFor(

-- 
To stop receiving

[isis] 01/02: Merge branch 'maint-1.16.2'

[isis] 01/02: Merge branch 'maint-1.16.2'

[isis] 01/02: Merge branch 'maint-1.16.2'

3 matches

Site Navigation

Mail list logo

Footer information