svn commit: r1333182 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java

[dblevins]

Author: dblevins
Date: Wed May  2 20:08:32 2012
New Revision: 1333182

URL: http://svn.apache.org/viewvc?rev=1333182&view=rev
Log:
Code that could be used in. Allow the Module.getAltDD() map to contain an 
object that can produce an InputStream 
TOMEE-183

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

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1333182&r1=1333181&r2=1333182&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
 Wed May  2 20:08:32 2012
@@ -215,6 +215,27 @@ public class ReadDescriptors implements 
         return url;
     }
 
+    /**
+     * All the readFooXml(URL) methods could simply use this method
+     * @param module
+     * @param name
+     * @return
+     */
+    private static Source getSource(Module module, String name) {
+        Object o = module.getAltDDs().get(name);
+        if (o != null) return getSource(o);
+
+        if (module.getClassLoader() != null) {
+            URL url = module.getClassLoader().getResource("META-INF/" + name);
+            if (url != null) {
+                module.getAltDDs().put(name, url);
+            }
+
+            return new UrlSource(url);
+        }
+        return null;
+    }
+
     public static void readResourcesXml(Module module) {
         URL url = getUrl(module, "resources.xml");
         if (url != null) {
@@ -687,7 +708,12 @@ public class ReadDescriptors implements 
         }
         return facesConfig;
     }
-    private Source getSource(Object o) {
+
+    private static Source getSource(Object o) {
+        if (o instanceof Source) {
+            return (Source) o;
+        }
+
         if (o instanceof URL) {
             return new UrlSource((URL) o);
         }