Author: rmannibucau
Date: Wed May 2 21:08:27 2012
New Revision: 1333208
URL: http://svn.apache.org/viewvc?rev=1333208&view=rev
Log:
TOMEE-183 managing properties of the container for openejb adapter
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/test/resources/arquillian.xml
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java?rev=1333208&r1=1333207&r2=1333208&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
Wed May 2 21:08:27 2012
@@ -4,8 +4,18 @@ import org.jboss.arquillian.container.sp
import
org.jboss.arquillian.container.spi.client.container.ContainerConfiguration;
public class OpenEJBConfiguration implements ContainerConfiguration {
+ private String properties = "";
+
@Override
public void validate() throws ConfigurationException {
// no-op
}
+
+ public String getProperties() {
+ return properties;
+ }
+
+ public void setProperties(String properties) {
+ this.properties = properties;
+ }
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java?rev=1333208&r1=1333207&r2=1333208&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
Wed May 2 21:08:27 2012
@@ -1,11 +1,14 @@
package org.apache.openejb.arquillian.openejb;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.util.Properties;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.openejb.AppContext;
import org.apache.openejb.OpenEJB;
+import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
@@ -14,6 +17,7 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.config.DeploymentFilterable;
import org.apache.openejb.core.LocalInitialContext;
import org.apache.openejb.core.LocalInitialContextFactory;
+import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
@@ -45,6 +49,9 @@ public class OpenEJBDeployableContainer
}
}
+ // config
+ private Properties properties;
+
// system
private Assembler assembler;
private InitialContext initialContext;
@@ -73,14 +80,22 @@ public class OpenEJBDeployableContainer
@Override
public void setup(final OpenEJBConfiguration openEJBConfiguration) {
- // no-op
+ properties = new Properties();
+ final ByteArrayInputStream bais = new
ByteArrayInputStream(openEJBConfiguration.getProperties().getBytes());
+ try {
+ properties.load(bais);
+ } catch (IOException e) {
+ throw new OpenEJBRuntimeException(e);
+ } finally {
+ IO.close(bais);
+ }
+ properties.putAll(PROPERTIES);
}
@Override
public void start() throws LifecycleException {
- // todo: manage properties (aquillian.xml)
try {
- initialContext = new InitialContext(PROPERTIES);
+ initialContext = new InitialContext(properties);
} catch (NamingException e) {
throw new LifecycleException("can't start the OpenEJB container",
e);
}
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/test/resources/arquillian.xml?rev=1333208&r1=1333207&r2=1333208&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian-tomee/arquillian-openejb-container/src/test/resources/arquillian.xml
Wed May 2 21:08:27 2012
@@ -18,4 +18,10 @@
-->
<arquillian
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd"; />
+ xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd";>
+ <container qualifier="openejb" default="true">
+ <configuration>
+ <property name="properties" />
+ </configuration>
+ </container>
+</arquillian>
