svn commit: r1518139 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Wed Aug 28 10:13:23 2013
New Revision: 1518139

URL: http://svn.apache.org/r1518139
Log:
TOMEE-1023 merging app env-entry with ejbs

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1518139&r1=1518138&r2=1518139&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
 Wed Aug 28 10:13:23 2013
@@ -45,6 +45,7 @@ import org.apache.openejb.config.sys.Con
 import org.apache.openejb.config.sys.Resource;
 import org.apache.openejb.config.sys.ServiceProvider;
 import org.apache.openejb.jee.AdminObject;
+import org.apache.openejb.jee.Application;
 import org.apache.openejb.jee.ApplicationClient;
 import org.apache.openejb.jee.ConfigProperty;
 import org.apache.openejb.jee.ConnectionDefinition;
@@ -235,6 +236,8 @@ class AppInfoBuilder {
                 // Get the ejb-jar.xml object
                 final EnterpriseBean enterpriseBean = 
beanData.get(beanInfo.ejbName);
 
+                setApplicationEnvEntries(appModule.getApplication(), 
enterpriseBean);
+
                 // Build the JNDI info tree for the EJB
                 jndiEncInfoBuilder.build(enterpriseBean, beanInfo.ejbName, 
ejbJar.moduleName, ejbModule.getModuleUri(), ejbJar.moduleJndiEnc, 
beanInfo.jndiEnc);
 
@@ -304,6 +307,14 @@ class AppInfoBuilder {
 
     }
 
+    private void setApplicationEnvEntries(final Application app, final 
EnterpriseBean enterpriseBean) {
+        if (app == null || enterpriseBean == null) {
+            return;
+        }
+
+        enterpriseBean.getEnvEntry().addAll(app.getEnvEntry());
+    }
+
     private void buildPojoConfiguration(final AppModule appModule, final 
AppInfo appInfo) {
         for (final Map.Entry<String, PojoConfiguration> config : 
appModule.getPojoConfigurations().entrySet()) {
             final IdPropertiesInfo info = new IdPropertiesInfo();