svn commit: r1500599 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

[rmannibucau]

Author: rmannibucau
Date: Mon Jul  8 08:07:04 2013
New Revision: 1500599

URL: http://svn.apache.org/r1500599
Log:
TOMEE-995 reading ejbd config even when embedded in tomcat, it needs to be sync 
manually with EjbDaemon ATM

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1500599&r1=1500598&r2=1500599&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
 Mon Jul  8 08:07:04 2013
@@ -245,8 +245,14 @@ public class TomcatLoader implements Loa
         OpenEJB.init(properties, new ServerFederation());
         
TomcatJndiBuilder.importOpenEJBResourcesInTomcat(SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.resources,
 TomcatHelper.getServer());
 
-        Properties ejbServerProps = new Properties();
+        final Properties ejbServerProps = new Properties();
         ejbServerProps.putAll(properties);
+        for (final String prop : new String[] { "serializer", "gzip" }) { // 
ensure -Dejbd.xxx are read
+            final String value = SystemInstance.get().getProperty("ejbd." + 
prop);
+            if (value != null) {
+                ejbServerProps.put(prop, value);
+            }
+        }
         ejbServerProps.setProperty("openejb.ejbd.uri", 
"http://127.0.0.1:8080/tomee/ejb";);
         ejbServer.init(ejbServerProps);