[jboss-cvs] JBossAS SVN: r92171 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/web/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Aug 9 10:16:21 EDT 2009
Author: jaikiran
Date: 2009-08-09 10:16:21 -0400 (Sun, 09 Aug 2009)
New Revision: 92171
Added:
branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/
branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml
Removed:
branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml
Modified:
branches/Branch_5_x/testsuite/imports/sections/web.xml
branches/Branch_5_x/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
JBAS-7147 Merged the fix for JBAS-6478 into Branch_5_x
Modified: branches/Branch_5_x/testsuite/imports/sections/web.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/sections/web.xml 2009-08-09 12:39:13 UTC (rev 92170)
+++ branches/Branch_5_x/testsuite/imports/sections/web.xml 2009-08-09 14:16:21 UTC (rev 92171)
@@ -777,6 +777,22 @@
<include name="org/jboss/test/util/Debug.class"/>
</classes>
</war>
+
+ <!-- WAR with servlet classes -->
+ <war destfile="${build.lib}/servlet-classes.war"
+ webxml="${build.resources}/web/servlet-classes/web.xml">
+ <lib dir="${jboss.web.lib}">
+ <include name="servlet-api.jar" />
+ </lib>
+ <lib dir="${build.lib}">
+ <include name="jbosstest-web-util.jar"/>
+ <include name="resources.jar"/>
+ </lib>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/web/servlets/ClasspathServlet2.class"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </classes>
+ </war>
<!-- Legacy classloader tests -->
<jar destfile="${build.lib}/jbossweb-legacy-classloader-fromdd.sar">
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2009-08-09 12:39:13 UTC (rev 92170)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2009-08-09 14:16:21 UTC (rev 92171)
@@ -471,6 +471,29 @@
getLog().info("+++ End testJava2ClassLoadingComplianceOverride");
}
}
+ public void testWARWithServletAPIClasses() throws Exception
+ {
+ getLog().info("+++ Begin testWARWithServletAPIClasses");
+ deploy("servlet-classes.war");
+ try
+ {
+ String baseURL = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + '/';
+ // Load a servlet class
+ URL url = new URL(baseURL+"servlet-classes/ClasspathServlet2?class=javax.servlet.http.HttpServletResponse");
+ HttpMethodBase request = HttpUtils.accessURL(url, REALM, HttpURLConnection.HTTP_OK);
+ Header cs = request.getResponseHeader("X-CodeSource");
+ log.info(cs);
+ // Validate it has not come from the war
+ assertTrue("X-CodeSource("+cs+") does not contain war",
+ cs.getValue().indexOf(".war") < 0 );
+ getLog().debug(url+" OK");
+ }
+ finally
+ {
+ undeploy("servlet-classes.war");
+ getLog().info("+++ End testWARWithServletAPIClasses");
+ }
+ }
/**
* Setup the test suite.
Copied: branches/Branch_5_x/testsuite/src/resources/web/servlet-classes (from rev 83964, branches/Branch_5_0/testsuite/src/resources/web/servlet-classes)
Deleted: branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml
===================================================================
--- branches/Branch_5_0/testsuite/src/resources/web/servlet-classes/web.xml 2009-02-06 15:32:29 UTC (rev 83964)
+++ branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml 2009-08-09 14:16:21 UTC (rev 92171)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <description>Test of war containing war classes</description>
-
- <!-- The Welcome File List -->
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
- <servlet>
- <servlet-name>ClasspathServlet2</servlet-name>
- <servlet-class>org.jboss.test.web.servlets.ClasspathServlet2</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ClasspathServlet2</servlet-name>
- <url-pattern>/ClasspathServlet2</url-pattern>
- </servlet-mapping>
-</web-app>
Copied: branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml (from rev 83964, branches/Branch_5_0/testsuite/src/resources/web/servlet-classes/web.xml)
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml (rev 0)
+++ branches/Branch_5_x/testsuite/src/resources/web/servlet-classes/web.xml 2009-08-09 14:16:21 UTC (rev 92171)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <description>Test of war containing war classes</description>
+
+ <!-- The Welcome File List -->
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+ <servlet>
+ <servlet-name>ClasspathServlet2</servlet-name>
+ <servlet-class>org.jboss.test.web.servlets.ClasspathServlet2</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ClasspathServlet2</servlet-name>
+ <url-pattern>/ClasspathServlet2</url-pattern>
+ </servlet-mapping>
+</web-app>
Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2009-08-09 12:39:13 UTC (rev 92170)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2009-08-09 14:16:21 UTC (rev 92171)
@@ -25,6 +25,8 @@
import java.util.Properties;
import java.util.Set;
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.RecursivePackageClassFilter;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.version.Version;
@@ -163,7 +165,12 @@
classLoadingMetaData.setImportAll(true);
classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
classLoadingMetaData.setJ2seClassLoadingCompliance(j2seClassLoadingCompliance);
- classLoadingMetaData.setExcludedPackages(filteredPackages);
+ ClassFilter filter = null;
+ if (filteredPackages != null)
+ {
+ filter = RecursivePackageClassFilter.createRecursivePackageClassFilterFromString(filteredPackages);
+ classLoadingMetaData.setExcluded(filter);
+ }
unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
}
}
More information about the jboss-cvs-commits
mailing list