[seam-commits] Seam SVN: r9935 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-01-15 10:56:29 -0500 (Thu, 15 Jan 2009)
New Revision: 9935

Modified:
   branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java
Log:
JBPAPP-1468

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java	2009-01-15 14:27:24 UTC (rev 9934)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java	2009-01-15 15:56:29 UTC (rev 9935)
@@ -42,13 +42,13 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import javassist.util.proxy.MethodFilter;
 import javassist.util.proxy.MethodHandler;
-import org.jboss.seam.util.ProxyFactory;
 import javassist.util.proxy.ProxyObject;
 
 import javax.naming.NamingException;
@@ -110,14 +110,15 @@
 import org.jboss.seam.intercept.Proxy;
 import org.jboss.seam.log.LogProvider;
 import org.jboss.seam.log.Logging;
+import org.jboss.seam.persistence.EntityManagerProxyInterceptor;
 import org.jboss.seam.persistence.HibernateSessionProxyInterceptor;
 import org.jboss.seam.persistence.ManagedEntityIdentityInterceptor;
-import org.jboss.seam.persistence.EntityManagerProxyInterceptor;
 import org.jboss.seam.security.SecurityInterceptor;
 import org.jboss.seam.transaction.RollbackInterceptor;
 import org.jboss.seam.transaction.TransactionInterceptor;
 import org.jboss.seam.util.Conversions;
 import org.jboss.seam.util.Naming;
+import org.jboss.seam.util.ProxyFactory;
 import org.jboss.seam.util.Reflections;
 import org.jboss.seam.util.SortItem;
 import org.jboss.seam.util.Sorter;
@@ -135,7 +136,6 @@
  * 
  */
 @Scope(ScopeType.APPLICATION)
- at SuppressWarnings("deprecation")
 public class Component extends Model
 {
    public static final String PROPERTIES = "org.jboss.seam.properties";
@@ -2250,7 +2250,10 @@
 
    public static Class<ProxyObject> createProxyFactory(ComponentType type, final Class beanClass, Collection<Class> businessInterfaces)
    {
-      Set<Class> interfaces = new HashSet<Class>();
+      Set<Class> interfaces = new LinkedHashSet<Class>();
+      interfaces.add(Instance.class);
+      interfaces.add(Proxy.class);
+      
       if ( type.isSessionBean() )
       {
           interfaces.addAll(businessInterfaces);
@@ -2260,8 +2263,6 @@
          interfaces.add(HttpSessionActivationListener.class);
          interfaces.add(Mutable.class);
       }
-      interfaces.add(Instance.class);
-      interfaces.add(Proxy.class);
 
       ProxyFactory factory = new ProxyFactory();
       factory.setSuperclass( type==JAVA_BEAN ? beanClass : Object.class );