svn commit: r1329380 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/util/reflection/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

[rm...@apache.org]

Author: rmannibucau
Date: Mon Apr 23 19:19:31 2012
New Revision: 1329380

URL: http://svn.apache.org/viewvc?rev=1329380&view=rev
Log:
this part is fixed in tomcat normally so no more need to do it in tomee

Removed:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/reflection/
Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1329380&r1=1329379&r2=1329380&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Mon Apr 23 19:19:31 2012
@@ -16,24 +16,19 @@
  */
 package org.apache.tomee.catalina;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.WebXml;
 import org.apache.catalina.startup.ContextConfig;
-import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.assembler.classic.WebAppInfo;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.reflection.ReflectionUtil;
 import org.xml.sax.InputSource;
 
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.LinkedHashSet;
-
 public class OpenEJBContextConfig extends ContextConfig {
 
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB.createChild("catalina").createChild("context"), OpenEJBContextConfig.class);
@@ -64,14 +59,6 @@ public class OpenEJBContextConfig extend
 
         public OpenEJBWebXml(String prefix) {
             this.prefix = prefix;
-
-            // some hack since tomcat doesn't preserve order of jsppropertygroup because of the hashset
-            // to remove if tomcat fixes it.
-            try {
-                ReflectionUtil.set(this, "jspPropertyGroups", new LinkedHashSet<JspPropertyGroupDescriptor>());
-            } catch (OpenEJBException e) {
-                // ignored, applications often work even with this error...which shouldn't happen often
-            }
         }
 
         @Override

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=1329380&r1=1329379&r2=1329380&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 Apr 23 19:19:31 2012
@@ -469,7 +469,6 @@ public class TomcatWebAppBuilder impleme
      */
     @Override
     public void init(final StandardContext standardContext) {
-        replaceHashSetForJspPropertyGroupsByLinkedHashSet(standardContext);
         standardContext.setCrossContext(SystemInstance.get().getOptions().get(OPENEJB_CROSSCONTEXT_PROPERTY, false));
         standardContext.setNamingResources(new OpenEJBNamingResource());
 
@@ -548,21 +547,6 @@ public class TomcatWebAppBuilder impleme
     }
 
     /**
-     * a small hack to preserve order of jsppropertygroups.
-     * <p/>
-     * to remove if tomcat fixes it.
-     *
-     * @param standardContext
-     */
-    private static void replaceHashSetForJspPropertyGroupsByLinkedHashSet(final StandardContext standardContext) {
-        try {
-            ReflectionUtil.set(standardContext.getJspConfigDescriptor(), "jspPropertyGroups", new LinkedHashSet<JspPropertyGroupDescriptor>());
-        } catch (OpenEJBException e) {
-            // ignored, applications often work even with this error...which shouldn't happen often
-        }
-    }
-
-    /**
      * {@inheritDoc}
      */
     @Override