[jboss-cvs] JBossAS SVN: r95754 - in branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50: transport and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2009-10-29 09:17:24 -0400 (Thu, 29 Oct 2009)
New Revision: 95754

Modified:
   branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
   branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java
Log:
[JBPAPP-3002] backporting fix

Modified: branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2009-10-29 12:52:44 UTC (rev 95753)
+++ branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2009-10-29 13:17:24 UTC (rev 95754)
@@ -75,6 +75,9 @@
       if (servletClass == null)
          throw new IllegalStateException("Cannot obtain context property: " + PROPERTY_WEBAPP_SERVLET_CLASS);
 
+      String contextRoot = dep.getService().getContextRoot();
+      jbwmd.setContextRoot(contextRoot);
+
       Map<String, String> depCtxParams = (Map<String, String>)dep.getProperty(PROPERTY_WEBAPP_CONTEXT_PARAMETERS);
       if (depCtxParams != null)
       {

Modified: branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java
===================================================================
--- branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java	2009-10-29 12:52:44 UTC (rev 95753)
+++ branches/JBPAPP_5_0/webservices/src/main/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java	2009-10-29 13:17:24 UTC (rev 95754)
@@ -255,19 +255,12 @@
       /* Create a jboss-web
        <jboss-web>
        <security-domain>java:/jaas/cts</security-domain>
-       <context-root>/ws/ejbN/</context-root>
        <virtual-host>some.domain.com</virtual-host>
        </jboss-web>
        */
       if (securityHandler != null)
          securityHandler.addSecurityDomain(jbwmd, dep);
 
-      // Get the context root for this deployment
-      String contextRoot = dep.getService().getContextRoot();
-      if (contextRoot == null)
-         throw new WSFDeploymentException("Cannot obtain context root");
-
-      jbwmd.setContextRoot(contextRoot);
       String[] virtualHosts = dep.getService().getVirtualHosts();
       if (virtualHosts != null && virtualHosts.length > 0)
       {