[seam-commits] Seam SVN: r8610 - trunk/src/main/org/jboss/seam/mock.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-08-06 12:27:01 -0400 (Wed, 06 Aug 2008)
New Revision: 8610

Modified:
   trunk/src/main/org/jboss/seam/mock/MockServletContext.java
Log:
Only read webxml if it is present


Modified: trunk/src/main/org/jboss/seam/mock/MockServletContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/MockServletContext.java	2008-08-06 14:47:54 UTC (rev 8609)
+++ trunk/src/main/org/jboss/seam/mock/MockServletContext.java	2008-08-06 16:27:01 UTC (rev 8610)
@@ -48,9 +48,9 @@
                webInfClassesRoot = new File(webInfRoot.getParentFile().getPath() + "/classes");
                webappRoot = webInfRoot.getParentFile();
             }
+            // call processing of context parameters
+            processContextParameters(webxml);
          }
-         // call processing of context parameters
-         processContextParameters();
       }
       catch (URISyntaxException e)
       {
@@ -58,13 +58,13 @@
       }
    }
    
-   private void processContextParameters()
+   private void processContextParameters(URL webXML)
    {
       SAXReader reader = new SAXReader();
       Document document;
       try
       {
-         document = reader.read(getClass().getResourceAsStream("/WEB-INF/web.xml"));
+         document = reader.read(webXML);
 
          List<Node> nodes = document.selectNodes("//*[name()='context-param']");
          for (Node node : nodes)