svn commit: r575494 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: ConfigurationFactory.java EjbModule.java

[dblevins]

Author: dblevins
Date: Thu Sep 13 16:21:16 2007
New Revision: 575494

URL: http://svn.apache.org/viewvc?rev=575494&view=rev
Log:
Moved the "just EjbJar" EjbModule construction logic from ConfigurationFactory 
to EjbModule

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

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=575494&r1=575493&r2=575494&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
 Thu Sep 13 16:21:16 2007
@@ -286,8 +286,7 @@
     }
 
     public EjbJarInfo configureApplication(EjbJar ejbJar) throws 
OpenEJBException {
-        String moduleId = (ejbJar.getId() == null) ? ejbJar.getId(): 
ejbJar.toString();
-        EjbModule ejbModule = new 
EjbModule(Thread.currentThread().getContextClassLoader(), moduleId, moduleId, 
ejbJar, null);
+        EjbModule ejbModule = new EjbModule(ejbJar);
         return configureApplication(ejbModule);
     }
 

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=575494&r1=575493&r2=575494&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
 Thu Sep 13 16:21:16 2007
@@ -40,6 +40,10 @@
     private String moduleId;
     private final Map<String,Object> altDDs = new HashMap<String,Object>();
 
+    public EjbModule(EjbJar ejbJar){
+        this(Thread.currentThread().getContextClassLoader(), null, ejbJar, 
null);
+    }
+
     public EjbModule(ClassLoader classLoader, String moduleId, String jarURI, 
EjbJar ejbJar, OpenejbJar openejbJar) {
         if (classLoader == null) {
             throw new NullPointerException("classLoader is null");
@@ -61,7 +65,7 @@
 
         if (moduleId == null){
             if (ejbJar != null && ejbJar.getId() != null){
-                jarURI = ejbJar.getId();
+                moduleId = ejbJar.getId();
             } else {
                 File file = new File(jarURI);
                 moduleId = file.getName();
@@ -71,10 +75,6 @@
         validation = new ValidationContext(EjbModule.class, jarLocation);
     }
 
-    public EjbModule(EjbJar ejbJar){
-        this(Thread.currentThread().getContextClassLoader(), null, ejbJar, 
null);
-    }
-    
     public EjbModule(ClassLoader classLoader, String jarURI, EjbJar ejbJar, 
OpenejbJar openejbJar) {
         this(classLoader, null, jarURI, ejbJar, openejbJar);
     }