svn commit: r1298952 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config: AppModule.java AutoConfig.java

[rm...@apache.org]

Author: rmannibucau
Date: Fri Mar  9 18:14:49 2012
New Revision: 1298952

URL: http://svn.apache.org/viewvc?rev=1298952&view=rev
Log:
sorting resources (from resources.xml) before adding them to the container. thanks dblevins for the tip.

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

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1298952&r1=1298951&r2=1298952&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Fri Mar  9 18:14:49 2012
@@ -26,7 +26,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -48,7 +48,7 @@ public class AppModule implements Deploy
     private final List<EjbModule> ejbModules = new ArrayList<EjbModule>();
     private final List<PersistenceModule> persistenceModules = new ArrayList<PersistenceModule>();
     // TODO We could turn this into the Resources JAXB object and support containers and other things as well
-    private final Collection<Resource> resources = new LinkedHashSet<Resource>();
+    private final Collection<Resource> resources = new HashSet<Resource>();
     private final ClassLoader classLoader;
     private EntityMappings cmpMappings;
     private final Map<String,Object> altDDs = new HashMap<String,Object>();

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1298952&r1=1298951&r2=1298952&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Fri Mar  9 18:14:49 2012
@@ -857,6 +857,7 @@ public class AutoConfig implements Dynam
             Collections.addAll(jndiConsumers, ejbModule.getEjbJar().getEnterpriseBeans());
         }
 
+        final List<ResourceInfo> resourceInfos = new ArrayList<ResourceInfo>();
         for (Resource resource : resources) {
             Properties properties = resource.getProperties();
 
@@ -899,9 +900,15 @@ public class AutoConfig implements Dynam
                 }
             }
 
+            resourceInfos.add(resourceInfo);
+        }
+
+        Collections.sort(resourceInfos, new ConfigurationFactory.ResourceInfoComparator(resourceInfos));
+        for (ResourceInfo resourceInfo : resourceInfos) {
             installResource(module.getModuleId(), resourceInfo);
         }
 
+        resourceInfos.clear();
         resources.clear();
     }