[jboss-cvs] JBossAS SVN: r69383 - in trunk/testsuite: src/main/org/jboss/test/web/servlets and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 28 01:40:03 EST 2008
Author: scott.stark at jboss.org
Date: 2008-01-28 01:40:03 -0500 (Mon, 28 Jan 2008)
New Revision: 69383
Modified:
trunk/testsuite/imports/sections/web.xml
trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet2.java
trunk/testsuite/src/main/org/jboss/test/web/servlets/lib/SimpleServlet.java
trunk/testsuite/src/main/org/jboss/test/web/test/ClasspathUnitTestCase.java
trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml
trunk/testsuite/src/resources/web/html/manifest/classpath.jsp
Log:
Fix the war manifest test
Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/imports/sections/web.xml 2008-01-28 06:40:03 UTC (rev 69383)
@@ -84,6 +84,14 @@
<fileset dir="${build.resources}/web/html/manifest">
<include name="**/*.jsp"/>
</fileset>
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/web/servlets/ClasspathServlet2.class"/>
+ <include name="org/jboss/test/util/Debug.class"/>
+ </classes>
+ <lib dir="${build.lib}">
+ <include name="jbosstest-web-libservlet.jar"/>
+ <include name="resources.jar"/>
+ </lib>
</war>
<ear earfile="${build.lib}/manifest-web.ear"
appxml="${build.resources}/web/META-INF/application-mf.xml">
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet2.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet2.java 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/ClasspathServlet2.java 2008-01-28 06:40:03 UTC (rev 69383)
@@ -80,8 +80,11 @@
}
catch(Exception e)
{
- log.debug("Failed to load "+className, e);
- throw new ServletException("Failed to load "+className, e);
+ out.println("Failed to load "+className);
+ out.println("<pre>\n");
+ e.printStackTrace(out);
+ out.println("</pre>");
+ response.addHeader("X-Exception", e.getMessage());
}
out.println("</html>");
Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/lib/SimpleServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/lib/SimpleServlet.java 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/lib/SimpleServlet.java 2008-01-28 06:40:03 UTC (rev 69383)
@@ -46,7 +46,7 @@
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("<html>");
- out.println("<head><title>SpeedServlet</title></head>");
+ out.println("<head><title>SimpleServlet</title></head>");
out.println("<body>Done</body>");
out.println("</html>");
out.close();
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/ClasspathUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/ClasspathUnitTestCase.java 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/ClasspathUnitTestCase.java 2008-01-28 06:40:03 UTC (rev 69383)
@@ -66,7 +66,7 @@
public void testClassesServlet()
throws Exception
{
- URL url = new URL(baseURL+"manifest/ClassesServlet");
+ URL url = new URL(baseURL+"manifest/ClassesServlet?class=org.jboss.test.web.util2.ClassInUtil2");
HttpMethodBase request = HttpUtils.accessURL(url);
Header errors = request.getResponseHeader("X-Exception");
log.info("X-Exception: "+errors);
Modified: trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml
===================================================================
--- trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/src/resources/web/WEB-INF/manifest-web.xml 2008-01-28 06:40:03 UTC (rev 69383)
@@ -5,4 +5,20 @@
<web-app>
<description>A war that references classes via a manifest Class-Path</description>
+ <servlet>
+ <servlet-name>ClassesServlet</servlet-name>
+ <servlet-class>org.jboss.test.web.servlets.ClasspathServlet2</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>LibServlet</servlet-name>
+ <servlet-class>org.jboss.test.web.servlets.lib.SimpleServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ClassesServlet</servlet-name>
+ <url-pattern>/ClassesServlet</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>LibServlet</servlet-name>
+ <url-pattern>/LibServlet</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: trunk/testsuite/src/resources/web/html/manifest/classpath.jsp
===================================================================
--- trunk/testsuite/src/resources/web/html/manifest/classpath.jsp 2008-01-28 04:27:26 UTC (rev 69382)
+++ trunk/testsuite/src/resources/web/html/manifest/classpath.jsp 2008-01-28 06:40:03 UTC (rev 69383)
@@ -84,12 +84,17 @@
%>
</pre>
-<jsp:useBean id="util" scope="session" class="org.jboss.test.web.util.Util" />
+<!--
+Not working in jboss5?
+jsp:useBean id="util" scope="session" type="org.jboss.test.web.util.Util"
+-->
+
<h2>JSP ClassLoaders</h2>
<pre>
<%
try
{
+ org.jboss.test.web.util.Util util = new org.jboss.test.web.util.Util();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
String loaders = util.displayClassLoaders(loader);
out.println(loaders);
More information about the jboss-cvs-commits
mailing list