You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by db...@apache.org on 2008/05/13 00:46:03 UTC

svn commit: r655679 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Author: dblevins
Date: Mon May 12 15:46:03 2008
New Revision: 655679

URL: http://svn.apache.org/viewvc?rev=655679&view=rev
Log:
OPENEJB-799: Support META-INF/env-entry.properites as an alternative to META-INF/env-entries.properies

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java?rev=655679&r1=655678&r2=655679&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EnvEntriesPropertiesDeployer.java Mon May 12 15:46:03 2008
@@ -112,6 +112,9 @@
     @SuppressWarnings({"unchecked"})
     private Map<String, String> getEnvEntries(DeploymentModule module) {
         URL propsUrl = (URL) module.getAltDDs().get("env-entries.properties");
+        if (propsUrl == null){
+            propsUrl = (URL) module.getAltDDs().get("env-entry.properties");
+        }
         if (propsUrl == null) return Collections.emptyMap();
         try {