[jboss-cvs] JBossAS SVN: r63190 - branches/Branch_4_2/server/src/main/org/jboss/metadata.

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

Author: thomas.diesler at jboss.com
Date: 2007-05-23 03:54:49 -0400 (Wed, 23 May 2007)
New Revision: 63190

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java
Log:
Remove <port-component-uri> first token as <context-root>

Modified: branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-05-23 05:52:46 UTC (rev 63189)
+++ branches/Branch_4_2/server/src/main/org/jboss/metadata/EjbPortComponentMetaData.java	2007-05-23 07:54:49 UTC (rev 63190)
@@ -23,8 +23,6 @@
 
 // $Id$
 
-import java.util.StringTokenizer;
-
 import org.jboss.deployment.DeploymentException;
 import org.w3c.dom.Element;
 
@@ -78,7 +76,7 @@
    {
       return transportGuarantee;
    }
-   
+
    public Boolean getSecureWSDLAccess()
    {
       return secureWSDLAccess;
@@ -94,9 +92,6 @@
     */
    public void importJBossXml(Element element) throws DeploymentException
    {
-      ApplicationMetaData appMetaData = sessionMetaData.getApplicationMetaData();
-      String contextRoot = appMetaData.getWebServiceContextRoot();
-
       // port-component/port-component-name
       portComponentName = MetaData.getUniqueChildContent(element, "port-component-name");
 
@@ -106,26 +101,6 @@
       {
          if (portComponentURI.charAt(0) != '/')
             portComponentURI = "/" + portComponentURI;
-
-         if (contextRoot == null)
-         {
-            // The first token is the webservice context root
-            StringTokenizer st = new StringTokenizer(portComponentURI, "/");
-            if (st.countTokens() < 2)
-               throw new DeploymentException("Expected at least two tokens <port-component-uri>");
-
-            contextRoot = "/" + st.nextToken();
-            String prevContextRoot = contextRoot;
-            if (prevContextRoot != null && prevContextRoot.equals(contextRoot) == false)
-               throw new DeploymentException("Invalid <port-component-uri>, expected to start with: " + prevContextRoot);
-
-            appMetaData.setWebServiceContextRoot(contextRoot);
-            portComponentURI = portComponentURI.substring(portComponentURI.indexOf('/', 1));
-         }
-         else if (portComponentURI.startsWith(contextRoot))
-         {
-            portComponentURI = portComponentURI.substring(contextRoot.length());
-         }
       }
       else
       {