You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/01 17:30:06 UTC
svn commit: r1392393 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic:
ClassListInfo.java WebAppInfo.java
Author: rmannibucau
Date: Mon Oct 1 15:30:06 2012
New Revision: 1392393
URL: http://svn.apache.org/viewvc?rev=1392393&view=rev
Log:
TOMEE-439 ClassListInfo store in a linkedhashset (because we can't impl comparable)
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ClassListInfo.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.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=1392393&r1=1392392&r2=1392393&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:30:06 2012
@@ -21,12 +21,7 @@ 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 implements Comparable<ClassListInfo> {
+public class ClassListInfo extends InfoObject {
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/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java?rev=1392393&r1=1392392&r2=1392393&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java Mon Oct 1 15:30:06 2012
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import java.util.ArrayList;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -35,7 +36,7 @@ public class WebAppInfo extends CommonIn
public final Set<String> restApplications = new TreeSet<String>();
public final Set<String> ejbWebServices = new TreeSet<String>();
public final Set<String> ejbRestServices = new TreeSet<String>();
- public final Set<ClassListInfo> webAnnotatedClasses = new TreeSet<ClassListInfo>();
+ public final Set<ClassListInfo> webAnnotatedClasses = new LinkedHashSet<ClassListInfo>();
public final List<PortInfo> portInfos = new ArrayList<PortInfo>();
public final JndiEncInfo jndiEnc = new JndiEncInfo();
public final List<ServletInfo> servlets = new ArrayList<ServletInfo>();