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

[rm...@apache.org]

Author: rmannibucau
Date: Thu Feb  7 17:32:04 2013
New Revision: 1443618

URL: http://svn.apache.org/viewvc?rev=1443618&view=rev
Log:
OPENEJB-1997 no need to look for nested deployments with additional deployments

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

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1443618&r1=1443617&r2=1443618&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Feb  7 17:32:04 2013
@@ -72,6 +72,7 @@ import org.apache.openejb.jee.HandlerCha
 import org.apache.openejb.jee.ParamValue;
 import org.apache.openejb.jee.SessionBean;
 import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.Files;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.loader.SystemInstance;
@@ -555,6 +556,7 @@ public class ConfigurationFactory implem
             deployments.addAll(openejb.getDeployments());
         }
 
+        Collection<Deployments> additionalDeploymentsList = Collections.emptyList();
         try {
             final File additionalDeploymentFile = SystemInstance.get().getBase().getFile(ADDITIONAL_DEPLOYMENTS, false);
 
@@ -563,7 +565,7 @@ public class ConfigurationFactory implem
                 try {
                     fis = IO.read(additionalDeploymentFile);
                     final AdditionalDeployments additionalDeployments = JaxbOpenejb.unmarshal(AdditionalDeployments.class, fis);
-                    deployments.addAll(additionalDeployments.getDeployments());
+                    additionalDeploymentsList = additionalDeployments.getDeployments();
                 } catch (Exception e) {
                     logger.error("can't read " + ADDITIONAL_DEPLOYMENTS, e);
                 } finally {
@@ -591,6 +593,16 @@ public class ConfigurationFactory implem
                 logger.warning("Security check failed on deployment: " + deployment.getFile(), se);
             }
         }
+        for (final Deployments additionalDep : additionalDeploymentsList) {
+            if (additionalDep.getFile() != null) {
+                declaredAppsUrls.add(Files.path(base.getDirectory().getAbsoluteFile(), additionalDep.getFile()));
+            } else if (additionalDep.getDir() != null) {
+                declaredAppsUrls.add(Files.path(base.getDirectory().getAbsoluteFile(), additionalDep.getDir()));
+            }
+            if (additionalDep.isAutoDeploy()) {
+                autoDeploy.add(additionalDep);
+            }
+        }
 
         if (autoDeploy.size() > 0) {
             final AutoDeployer autoDeployer = new AutoDeployer(this, autoDeploy);