[jboss-cvs] JBossAS SVN: r95947 - in trunk/testsuite/src: resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-11-03 07:17:22 -0500 (Tue, 03 Nov 2009)
New Revision: 95947

Modified:
   trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
   trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
Log:
- Remove references to UseWebLoader in tests.

Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java	2009-11-03 11:55:59 UTC (rev 95946)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/AUnitTestCase.java	2009-11-03 12:17:22 UTC (rev 95947)
@@ -21,10 +21,6 @@
  */
 package org.jboss.test.ejb3.servlet.unit;
 
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
 import junit.framework.Test;
 
 import org.jboss.test.JBossTestCase;
@@ -35,8 +31,6 @@
  */
 public class AUnitTestCase extends JBossTestCase
 {
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
    public AUnitTestCase(String name)
    {
       super(name);
@@ -44,18 +38,6 @@
    
    public void testEJBServlet() throws Exception
    {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
-      try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-      }
-      finally
-      {
- //        server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
    }
    
    /**

Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java	2009-11-03 11:55:59 UTC (rev 95946)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/servlet/unit/EarServletUnitTestCase.java	2009-11-03 12:17:22 UTC (rev 95947)
@@ -24,10 +24,6 @@
 import java.io.IOException;
 import java.net.URL;
 
-import javax.management.Attribute;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
 import junit.framework.Test;
 
 import org.jboss.test.JBossTestCase;
@@ -43,8 +39,6 @@
    private String baseURL = HttpUtils.getBaseURL("somebody", "password"); 
    private String baseURLNoAuth = HttpUtils.getBaseURLNoAuth(); 
    
-   private static final String USE_JBOSS = "UseJBossWebLoader";
-   
    public EarServletUnitTestCase(String name)
    {
       super(name);
@@ -52,14 +46,7 @@
    
    public void testEJBServlet() throws Exception
    {
-      MBeanServerConnection server = getServer();
-      ObjectName tomcat = new ObjectName("jboss.web:service=WebServer");
-      
       try {
-         server.setAttribute(tomcat, new Attribute(USE_JBOSS, true));
-         
-         assertTrue((Boolean)server.getAttribute(tomcat, USE_JBOSS));
-         
          URL url = new URL(baseURL+"servlet/EJBServlet");
          HttpUtils.accessURL(url);
       }
@@ -67,10 +54,6 @@
       {
          fail(e.getMessage());
       }
-      finally
-      {
-  //       server.setAttribute(tomcat, new Attribute(USE_JBOSS, false));
-      }
    }
    
    /**

Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2009-11-03 11:55:59 UTC (rev 95946)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2009-11-03 12:17:22 UTC (rev 95947)
@@ -2,7 +2,7 @@
 
 <!--
     Web application deployers
-    $Id:$
+    $Id$
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
@@ -132,25 +132,9 @@
            model.
       -->
       <property name="java2ClassLoadingCompliance">false</property>
-      <!-- A flag indicating if the JBoss Loader should be used. This loader
-           uses a unified class loader as the class loader rather than the tomcat
-           specific class loader.
-           The default is false to ensure that wars have isolated class loading
-           for duplicate jars and jsp files.
-      -->
-      <property name="useJBossWebLoader">true</property>
-      <!-- The list of package prefixes that should not be loaded without
-           delegating to the parent class loader before trying the web app
-           class loader. The packages listed here are those tha are used by
-           the web container implementation and cannot be overriden. The format
-           is a comma separated list of the package names. There cannot be any
-           whitespace between the package prefixes.
-           This setting only applies when UseJBossWebLoader=false.
-      -->
-      <property name="filteredPackages">javax.servlet</property>
-        
+      
       <property name="lenientEjbLink">true</property>
-        
+      
       <!--Flag to delete the Work Dir on Context Destroy -->
       <property name="deleteWorkDirOnContextDestroy">false</property>