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/11/14 17:32:50 UTC
[isis] branch master updated: ISIS-1710: append to existing list of
services if using AppManifest's withAdditionalServices
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
The following commit(s) were added to refs/heads/master by this push:
new af07e74 ISIS-1710: append to existing list of services if using AppManifest's withAdditionalServices
af07e74 is described below
commit af07e749a3bc830fdcb1fb4b47cd31df5e389de8
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 14 17:13:44 2017 +0000
ISIS-1710: append to existing list of services if using AppManifest's withAdditionalServices
---
.../systemusinginstallers/IsisComponentProvider.java | 5 ++++-
.../src/main/java/domainapp/application/isis.properties | 4 +++-
.../helloworld/src/main/webapp/WEB-INF/isis.properties | 13 -------------
3 files changed, 7 insertions(+), 15 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 cf7b30b..f6e61a8 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
@@ -174,8 +174,11 @@ public abstract class IsisComponentProvider {
final List<Class<?>> additionalServices = appManifest.getAdditionalServices();
if(additionalServices != null) {
+ String existingServicesCsv = configuration.getString(ServicesInstallerFromConfiguration.SERVICES_KEY);
+ String additionalServicesCsv = classNamesFrom(additionalServices);
+ String servicesCsv = Joiner.on(",").join(existingServicesCsv, additionalServicesCsv);
putConfigurationProperty(
- ServicesInstallerFromConfiguration.SERVICES_KEY, classNamesFrom(additionalServices));
+ ServicesInstallerFromConfiguration.SERVICES_KEY, servicesCsv);
}
}
diff --git a/example/application/helloworld/src/main/java/domainapp/application/isis.properties b/example/application/helloworld/src/main/java/domainapp/application/isis.properties
index cc7ef35..2451b83 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/isis.properties
+++ b/example/application/helloworld/src/main/java/domainapp/application/isis.properties
@@ -16,7 +16,9 @@
# under the License.
-isis.appManifest=domainapp.application.HelloWorldAppManifest
+
+#isis.services.eventbus.implementation=guava
+isis.services.eventbus.implementation=axon
isis.reflector.validator.allowDeprecated=false
isis.reflector.validator.noParamsOnly=true
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
index 5a42451..2a6f36c 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
@@ -16,22 +16,9 @@
# under the License.
-
-
-#
-# Specify the modules (= entities + services) and other components that make up
-# this application.
-#
-
isis.appManifest=domainapp.application.HelloWorldAppManifest
-
-#isis.services.eventbus.implementation=guava
-isis.services.eventbus.implementation=axon
-
-
-
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].