svn commit: r634125 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

[da...@apache.org]

Author: dain
Date: Wed Mar  5 18:24:52 2008
New Revision: 634125

URL: http://svn.apache.org/viewvc?rev=634125&view=rev
Log:
Fixed OPENEJB-761 Tomcat EAR double deployment bug

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=634125&r1=634124&r2=634125&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Wed Mar  5 18:24:52 2008
@@ -426,8 +426,17 @@
             File[] files = appBase.listFiles();
             for (File file : files) {
                 String name = file.getName();
+                // ignore war files
                 if (name.toLowerCase().endsWith(".war") || name.equals("ROOT") || name.equalsIgnoreCase("META-INF") || name.equalsIgnoreCase("WEB-INF")) continue;
+                // ignore unpacked web apps
                 if (file.isDirectory() && new File(file, "WEB-INF").exists()) continue;
+                // ignore unpacked apps where packed version is present (packed version is owner)
+                if (file.isDirectory() && (new File(file.getParent(), file.getName() + ".ear").exists() ||
+                        new File(file.getParent(), file.getName() + ".war").exists() ||
+                        new File(file.getParent(), file.getName() + ".rar").exists())) {
+                    continue;
+                }
+                // ignore already deployed apps
                 if (isDeployed(file, standardHost)) continue;
 
                 AppInfo appInfo = null;