svn commit: r1392382 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java tck/cdi-tomee/pom.xml tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Mon Oct  1 15:16:54 2012
New Revision: 1392382

URL: http://svn.apache.org/viewvc?rev=1392382&view=rev
Log:
TOMEE-439 ClassListInfo should be comparable (or we should change the set in 
webappinfo) + removing ROOT webapp from TCK (useless) + overriding standard 
context name when updating it because of the extension (.war)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
    openejb/trunk/openejb/tck/cdi-tomee/pom.xml
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java?rev=1392382&r1=1392381&r2=1392382&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
 Mon Oct  1 15:16:54 2012
@@ -21,7 +21,12 @@ import java.util.Set;
 
 // just to store a kind of Map<String, Set<String>>
 // TODO: find a better name, key can be a classname, a jar/file path...
-public class ClassListInfo extends InfoObject {
+public class ClassListInfo extends InfoObject implements 
Comparable<ClassListInfo> {
     public String name;
     public final Set<String> list = new HashSet<String>();
+
+    @Override
+    public int compareTo(final ClassListInfo o) {
+        return name.compareTo(o.name);
+    }
 }

Modified: openejb/trunk/openejb/tck/cdi-tomee/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/pom.xml?rev=1392382&r1=1392381&r2=1392382&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tck/cdi-tomee/pom.xml Mon Oct  1 15:16:54 2012
@@ -192,6 +192,7 @@
             </goals>
             <configuration>
               <target>
+                <delete dir="${openejb.home}/webapps/ROOT" />
                 <delete dir="${openejb.home}/webapps/docs" />
                 <delete dir="${openejb.home}/webapps/manager" />
                 <delete dir="${openejb.home}/webapps/host-manager" />

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1392382&r1=1392381&r2=1392382&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Mon Oct  1 15:16:54 2012
@@ -412,6 +412,7 @@ public class TomcatWebAppBuilder impleme
                     DeploymentLoader.unpack(new 
File(standardContext.getDocBase()));
                     if (standardContext.getPath().endsWith(".war")) {
                         standardContext.setPath(removeFirstSlashAndWar("/" + 
standardContext.getPath()));
+                        standardContext.setName(standardContext.getPath());
                         webApp.contextRoot = standardContext.getPath();
                     }
                     
standardContext.setDocBase(standardContext.getDocBase().substring(0, 
standardContext.getDocBase().length() - 4));