You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/02/06 20:43:22 UTC
[1/2] isis git commit: ISIS-1561: fixes documentation of
ConfigurationService
Repository: isis
Updated Branches:
refs/heads/maint-1.14.0 58722f9d2 -> 5666e4909
ISIS-1561: fixes documentation of ConfigurationService
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/67d082fe
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/67d082fe
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/67d082fe
Branch: refs/heads/maint-1.14.0
Commit: 67d082fec0b3c9e653c54b465afbb126a7a5e5ea
Parents: 58722f9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 6 20:23:03 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 6 20:23:03 2017 +0000
----------------------------------------------------------------------
.../guides/_rgsvc_api_ConfigurationService.adoc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/67d082fe/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
index 03faed4..7200ebd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc_api_ConfigurationService.adoc
@@ -8,6 +8,11 @@
The `ConfigurationService` allows domain objects to read the configuration properties aggregated from the various xref:rgcfg.adoc#_rgcfg_configuration-files[configuration files].
+[IMPORTANT]
+====
+Only configuration properties with the prefix "application" are be exposed.
+====
+
[NOTE]
====
The methods in this service replace similar methods (now deprecated) in xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`].
@@ -43,10 +48,10 @@ public class TweetService {
@Programmatic
@PostConstruct
public void init() {
- this.oauthConsumerKey = configurationService.getProperty("tweetservice.oauth.consumerKey");
- this.oauthConsumerSecret = configurationService.getProperty("tweetservice.oauth.consumerSecret");
- this.oauthAccessToken = configurationService.getProperty("tweetservice.oauth.accessToken");
- this.oauthAccessTokenSecret = configurationService.getProperty("tweetservice.oauth.accessTokenSecret");
+ this.oauthConsumerKey = configurationService.getProperty("application.tweetservice.oauth.consumerKey");
+ this.oauthConsumerSecret = configurationService.getProperty("application.tweetservice.oauth.consumerSecret");
+ this.oauthAccessToken = configurationService.getProperty("application.tweetservice.oauth.accessToken");
+ this.oauthAccessTokenSecret = configurationService.getProperty("application.tweetservice.oauth.accessTokenSecret");
}
...
@Inject
@@ -56,7 +61,8 @@ public class TweetService {
[TIP]
====
-If you _do_ have a domain service that needs to access properties, then note that an alternative is to define a xref:rgant.adoc#_rgant-PostConstruct[`@PostConstruct`] method and pass in a `Map<String,String>` of properties. The two techniques are almost identical; it's mostly a matter of taste.
+If you _do_ have a domain service that needs to access Isis properties, then an alternative is to define a xref:rgant.adoc#_rgant-PostConstruct[`@PostConstruct`] method and pass in a `Map<String,String>` of properties.
+This is provided all properties, not just those with the 'application' prefix.
====
[2/2] isis git commit: ISIS-785: fixes multi-select for contributed
actions and mixins
Posted by da...@apache.org.
ISIS-785: fixes multi-select for contributed actions and mixins
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5666e490
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5666e490
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5666e490
Branch: refs/heads/maint-1.14.0
Commit: 5666e4909a09692b93e0cb2f7c9ad25b3c82c816
Parents: 67d082f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 6 20:43:06 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 6 20:43:06 2017 +0000
----------------------------------------------------------------------
.../specloader/specimpl/ObjectActionContributee.java | 3 ++-
.../metamodel/specloader/specimpl/ObjectActionMixedIn.java | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5666e490/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 0d3fc46..c90106a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.TypedHolder;
@@ -132,7 +133,7 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
(ObjectActionParameterAbstract) serviceParameters.get(serviceParamNum);
final ObjectActionParameterContributee contributedParam =
- specification.isNotCollection()
+ serviceParameter.getPeer().getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR
? new OneToOneActionParameterContributee(
getServiceAdapter(), serviceParameter, contributeeParamNum, this)
: new OneToManyActionParameterContributee(
http://git-wip-us.apache.org/repos/asf/isis/blob/5666e490/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 8b9e963..5810596 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.consent.InteractionResultSet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.TypedHolder;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
@@ -143,9 +144,10 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
final ObjectSpecification specification = ObjectMemberAbstract
.getSpecification(getSpecificationLoader(), paramPeer.getType());
- final ObjectActionParameterMixedIn mixedInParameter = specification.isNotCollection()
- ? new OneToOneActionParameterMixedIn(mixinParameter, this)
- : new OneToManyActionParameterMixedIn(mixinParameter, this);
+ final ObjectActionParameterMixedIn mixedInParameter =
+ mixinParameter.getPeer().getFeatureType() == FeatureType.ACTION_PARAMETER_SCALAR
+ ? new OneToOneActionParameterMixedIn(mixinParameter, this)
+ : new OneToManyActionParameterMixedIn(mixinParameter, this);
mixedInParameters.add(mixedInParameter);
}
return mixedInParameters;