Author: rmannibucau
Date: Sun Jun 10 23:13:20 2012
New Revision: 1348678
URL: http://svn.apache.org/viewvc?rev=1348678&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=1348678&r1=1348677&r2=1348678&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
Sun Jun 10 23:13:20 2012
@@ -119,7 +119,8 @@ public class OpenEJBDeployableContainer
@Override
public void setup(final OpenEJBConfiguration openEJBConfiguration) {
- properties = new Properties();
+ properties = new Properties(PROPERTIES);
+
final ByteArrayInputStream bais = new
ByteArrayInputStream(openEJBConfiguration.getProperties().getBytes());
try {
properties.load(bais);
@@ -128,7 +129,6 @@ public class OpenEJBDeployableContainer
} finally {
IO.close(bais);
}
- properties.putAll(PROPERTIES);
}
@Override
