You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/05/04 12:22:02 UTC
tomee git commit: TOMEE-1800 system properties should be merged using
Import in tomee.xml
Repository: tomee
Updated Branches:
refs/heads/master 8203e7c77 -> a9e29701b
TOMEE-1800 system properties should be merged using Import in tomee.xml
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a9e29701
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a9e29701
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a9e29701
Branch: refs/heads/master
Commit: a9e29701b7e7e242e1ee43283cc2728f292ce219
Parents: 8203e7c
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed May 4 14:21:36 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed May 4 14:21:36 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/sys/SaxOpenejb.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a9e29701/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
index ce8fdc4..88944f4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
@@ -17,6 +17,7 @@
package org.apache.openejb.config.sys;
+import org.apache.openejb.config.SystemProperty;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Saxs;
import org.xml.sax.Attributes;
@@ -316,6 +317,11 @@ class SaxOpenejb extends StackHandler {
openejb.add(deployment);
}
}
+ if (importedOpenEJB.systemProperties != null) {
+ for (final SystemProperty systemProp : importedOpenEJB.systemProperties) {
+ openejb.add(systemProp);
+ }
+ }
}
}
}