[jboss-cvs] JBossAS SVN: r62342 - trunk/server/src/main/org/jboss/deployment.

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

Author: thomas.diesler at jboss.com
Date: 2007-04-14 12:57:47 -0400 (Sat, 14 Apr 2007)
New Revision: 62342

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
Log:
Migrate webservice context root processing to jbossws

Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-04-14 14:28:09 UTC (rev 62341)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java	2007-04-14 16:57:47 UTC (rev 62342)
@@ -23,8 +23,6 @@
 
 // $Id: $
 
-import java.util.StringTokenizer;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -435,47 +433,6 @@
    {
       SessionMetaData sessionMetaData = (SessionMetaData)parent.metaData;
       sessionMetaData.setPortComponent(pcMetaData);
-
-      ApplicationMetaData appMetaData = sessionMetaData.getApplicationMetaData();
-      Webservices webservices = appMetaData.getWebservices();
-      String contextRoot = (webservices != null ? webservices.getContextRoot() : null);
-
-      // Post process portComponentURI
-      String portComponentURI = pcMetaData.getPortComponentURI();
-      if (portComponentURI != null)
-      {
-         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 IllegalStateException("Invalid <port-component-uri>, expected at least two tokens in: " + portComponentURI);
-
-            contextRoot = "/" + st.nextToken();
-            String prevContextRoot = contextRoot;
-            if (prevContextRoot != null && prevContextRoot.equals(contextRoot) == false)
-               throw new IllegalStateException("Invalid <port-component-uri>, expected to start with: " + prevContextRoot);
-
-            if (webservices != null)
-               webservices.setContextRoot(contextRoot);
-
-            portComponentURI = portComponentURI.substring(portComponentURI.indexOf('/', 1));
-         }
-         else if (portComponentURI.startsWith(contextRoot))
-         {
-            portComponentURI = portComponentURI.substring(contextRoot.length());
-         }
-         pcMetaData.setPortComponentURI(portComponentURI);
-      }
-      else
-      {
-         // The context root will be derived from deployment short name
-         portComponentURI = "/" + sessionMetaData.getEjbName();
-         pcMetaData.setPortComponentURI(portComponentURI);
-      }
    }
 
    public void addChild(BeanHolder parent, ActivationConfigPropertyMetaData child, UnmarshallingContext navigator, String namespaceURI, String localName)