You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by jo...@apache.org on 2016/08/09 16:30:32 UTC
[3/6] cayenne git commit: Allow specifying multiple comma-separated
DataDomain locations for CayenneFilter (web.xml)
Allow specifying multiple comma-separated DataDomain locations for CayenneFilter (web.xml)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7e0f8011
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7e0f8011
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7e0f8011
Branch: refs/heads/ics11
Commit: 7e0f8011e63abc869abc65b297b9c146c96a8e61
Parents: b30e0fa
Author: John Huss <jo...@apache.org>
Authored: Mon Oct 6 16:43:45 2014 -0500
Committer: John Huss <jo...@apache.org>
Committed: Wed Jun 24 11:42:25 2015 -0500
----------------------------------------------------------------------
.../org/apache/cayenne/configuration/web/CayenneFilter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7e0f8011/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
index 12226a1..d218f79 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/web/CayenneFilter.java
@@ -70,11 +70,15 @@ public class CayenneFilter implements Filter {
WebConfiguration configAdapter = new WebConfiguration(config);
String configurationLocation = configAdapter.getConfigurationLocation();
+ String[] configurationLocations = null;
+ if (configurationLocation != null) {
+ configurationLocations = configurationLocation.split(",\\s*");
+ }
Collection<Module> modules = configAdapter.createModules(new WebModule());
modules.addAll(getAdditionalModules());
ServerRuntime runtime = new ServerRuntime(
- configurationLocation,
+ configurationLocations,
modules.toArray(new Module[modules.size()]));
WebUtil.setCayenneRuntime(config.getServletContext(), runtime);