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 2012/06/11 08:30:06 UTC

svn commit: r1348722 - /openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java

Author: rmannibucau
Date: Mon Jun 11 06:30:06 2012
New Revision: 1348722

URL: http://svn.apache.org/viewvc?rev=1348722&view=rev
Log:
allowing to override default properties

Modified:
    openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java

Modified: openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java?rev=1348722&r1=1348721&r2=1348722&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java Mon Jun 11 06:30:06 2012
@@ -2,6 +2,7 @@ package org.apache.openejb.arquillian.op
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.Map;
 import java.util.Properties;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -119,7 +120,7 @@ public class OpenEJBDeployableContainer 
 
     @Override
     public void setup(final OpenEJBConfiguration openEJBConfiguration) {
-        properties = new Properties(PROPERTIES);
+        properties = new Properties();
 
         final ByteArrayInputStream bais = new ByteArrayInputStream(openEJBConfiguration.getProperties().getBytes());
         try {
@@ -129,6 +130,13 @@ public class OpenEJBDeployableContainer 
         } finally {
             IO.close(bais);
         }
+
+        for (Map.Entry<Object, Object> defaultKey : PROPERTIES.entrySet()) {
+            final String key = defaultKey.getKey().toString();
+            if (!properties.containsKey(key)) {
+                properties.setProperty(key, defaultKey.getValue().toString());
+            }
+        }
     }
 
     @Override