[jboss-cvs] webservice/src/main/org/jboss/webservice ServiceDeployer.java

[Thomas D. <tdi...@us...>]

  User: tdiesler
  Date: 04/05/26 15:46:49

  Modified:    src/main/org/jboss/webservice ServiceDeployer.java
  Log:
  + wsdl request style someService/wsdl/ does not work with absolute url-mapping
  + use wsdl request style someService?wsdl, wsdl imports won't work with this [todo]
  
  Revision  Changes    Path
  1.8       +5 -6      webservice/src/main/org/jboss/webservice/ServiceDeployer.java
  
  Index: ServiceDeployer.java
  ===================================================================
  RCS file: /cvsroot/jboss/webservice/src/main/org/jboss/webservice/ServiceDeployer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServiceDeployer.java	26 May 2004 19:02:51 -0000	1.7
  +++ ServiceDeployer.java	26 May 2004 22:46:48 -0000	1.8
  @@ -5,10 +5,10 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: ServiceDeployer.java,v 1.7 2004/05/26 19:02:51 tdiesler Exp $
  +// $Id: ServiceDeployer.java,v 1.8 2004/05/26 22:46:48 tdiesler Exp $
   package org.jboss.webservice;
   
  -// $Id: ServiceDeployer.java,v 1.7 2004/05/26 19:02:51 tdiesler Exp $
  +// $Id: ServiceDeployer.java,v 1.8 2004/05/26 22:46:48 tdiesler Exp $
   
   import org.dom4j.Document;
   import org.dom4j.io.OutputFormat;
  @@ -678,7 +678,7 @@
            String servicePath = "/ws4ee/services/" + serviceName;
   
            // For a web based service endpoint it is derived from the servlet mapping
  -         if (di.metaData instanceof WebMetaData)
  +         if (servletLink != null)
            {
               WebMetaData metaData = (WebMetaData)di.metaData;
               Map servletMappings = metaData.getServletMappings();
  @@ -690,13 +690,12 @@
                  urlPattern = "/" + urlPattern;
   
               servicePath = metaData.getContextRoot() + urlPattern;
  +
               if (servicePath.endsWith("/*"))
  -            {
                  servicePath = servicePath.substring(0, servicePath.indexOf("/*"));
  -               servicePath += "/" + serviceName;
  -            }
            }
   
  +
            String host = null;
            int port = 0;
            try