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 2013/09/24 08:38:06 UTC
svn commit: r1525801 - in /tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common: ConfigurationOverrides.java TomEEContainer.java

Author: rmannibucau
Date: Tue Sep 24 06:38:05 2013
New Revision: 1525801

URL: http://svn.apache.org/r1525801
Log:
TOMEE-1043 always reading system properties when overriding arquillian config

Modified:
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java?rev=1525801&r1=1525800&r2=1525801&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java Tue Sep 24 06:38:05 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.arquillian.co
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +45,10 @@ public class ConfigurationOverrides {
         }
 
         propertiesFiles.addAll(overridePropFiles);
+
+        // use system properties in all cases
+        apply(configuration, systemProperties, Collections.<URL>emptyList(), true, prefixes);
+
         return propertiesFiles;
     }
 

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1525801&r1=1525800&r2=1525801&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Tue Sep 24 06:38:05 2013
@@ -49,8 +49,10 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -79,7 +81,8 @@ public abstract class TomEEContainer<Con
 
         if (prefixes == null) return;
 
-        ConfigurationOverrides.apply(configuration, System.getProperties(), prefixes.value());
+        final Properties systemProperties = System.getProperties();
+        ConfigurationOverrides.apply(configuration, systemProperties, prefixes.value());
 
         setPorts();