[jboss-cvs] JBossAS SVN: r57427 - trunk/tomcat/src/tests/org/jboss/test/deployers

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

Author: scott.stark at jboss.org
Date: 2006-10-04 13:25:36 -0400 (Wed, 04 Oct 2006)
New Revision: 57427

Modified:
   trunk/tomcat/src/tests/org/jboss/test/deployers/WebAppParsingDeployerTestCase.java
Log:
Update for AbstractParsingDeployer changes to propagate an existing deployment type to the parse phase.

Modified: trunk/tomcat/src/tests/org/jboss/test/deployers/WebAppParsingDeployerTestCase.java
===================================================================
--- trunk/tomcat/src/tests/org/jboss/test/deployers/WebAppParsingDeployerTestCase.java	2006-10-04 17:16:57 UTC (rev 57426)
+++ trunk/tomcat/src/tests/org/jboss/test/deployers/WebAppParsingDeployerTestCase.java	2006-10-04 17:25:36 UTC (rev 57427)
@@ -23,9 +23,11 @@
 import org.jboss.deployment.WebAppParsingDeployer;
 
 /**
- * This is a test of the org.jboss.deployment.WebAppParsingDeployer deployer. It should be in a server related testsuite, but
- * including such a test in the server project slows the workspace build so its here until there is better
- * separation of tests/projects.
+ * This is a test of the org.jboss.deployment.WebAppParsingDeployer and
+ * JBossWebAppParsingDeployer metadata deployers. It should be in a server
+ * related testsuite, but including such a test in the server project slows the
+ * workspace build so its here until there is better separation of
+ * tests/projects.
  * 
  * @author Scott.Stark at jboss.org
  * @version $Revision:$
@@ -38,6 +40,11 @@
       super(name);
    }
 
+   /**
+    * Overriden to direct the LogginPlugin to the
+    * org.jboss.test.logging.Log4jConsoleLoggingPlugin version to avoid
+    * finding spurious log4j configuration resources in the classpath.
+    */
    @Override
    protected void setUp() throws Exception
    {
@@ -64,6 +71,13 @@
       validateWebMetaData24Ex1(dd, false);
    }
 
+   /**
+    * Parse a servlet 2.4 web.xml descriptor and a jboss-web.xml descriptor to
+    * validate that the WebAppParsingDeployer and JBossWebAppParsingDeployer
+    * work together to build an aggregate WebMetaData instance.
+    * 
+    * @throws Exception
+    */
    public void testWebAppJBossWebApp()
       throws Exception
    {
@@ -85,6 +99,14 @@
       validateWebMetaData24Ex1(dd, true);
    }
 
+   /**
+    * Utility method that validates the web.xml/jboss-web.xml to WebMetaData
+    * mappings.
+    * 
+    * @param dd - the WebMetaData instance to validate
+    * @param hasJBossWeb - a flag indicating if the jboss-web.xml specific
+    *    fields should be validated.
+    */
    protected void validateWebMetaData24Ex1(WebMetaData dd, boolean hasJBossWeb)
    {
       assertEquals("web-app/description", "Web App 2.4 Descriptor", dd.getDescription());