[jboss-svn-commits] JBossWS SVN: r1159 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/deployment test/java/org/jboss/test/ws/jaxws/jbws1178 test/resources/jaxws/jbws1178/WEB-INF

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

Author: thomas.diesler at jboss.com
Date: 2006-10-06 02:49:39 -0400 (Fri, 06 Oct 2006)
New Revision: 1159

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
   branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
   branches/jbossws-1.0/src/test/resources/jaxws/jbws1178/WEB-INF/web.xml
Log:
[JBWS-864] soap:address in wsdl ignores <url-pattern>

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java	2006-10-06 06:03:09 UTC (rev 1158)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java	2006-10-06 06:49:39 UTC (rev 1159)
@@ -121,11 +121,13 @@
    protected void processPortComponent(UnifiedDeploymentInfo udi, Class wsClass, String linkName, ServerEndpointMetaData epMetaData)
    {
       String contextRoot = null;
+      String urlPattern = null;
 
       // init contextRoot from jboss-web.xml
       if (udi.metaData instanceof UnifiedWebMetaData)
       {
          UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData;
+         urlPattern = webMetaData.getServletMappings().get(linkName);
          contextRoot = webMetaData.getContextRoot();
       }
 
@@ -154,7 +156,6 @@
          }
          epMetaData.setContextRoot(contextRoot);
 
-         String urlPattern;
          if (anPortComponent.urlPattern().length() > 0)
          {
             urlPattern = anPortComponent.urlPattern();
@@ -186,8 +187,6 @@
             contextRoot = "/" + shortName.substring(0, shortName.indexOf('.'));
          }
          epMetaData.setContextRoot(contextRoot);
-
-         String urlPattern = "/" + linkName;
          epMetaData.setURLPattern(urlPattern);
 
          String servicePath = contextRoot + urlPattern;

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java	2006-10-06 06:03:09 UTC (rev 1158)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java	2006-10-06 06:49:39 UTC (rev 1159)
@@ -116,8 +116,7 @@
             {
                QName portName = pcMetaData.getWsdlPort();
 
-               // JBWS-722 
-               // <wsdl-port> in webservices.xml should be qualified
+               // [JBWS-722] <wsdl-port> in webservices.xml should be qualified
                if (portName.getNamespaceURI().length() == 0)
                {
                   String nsURI = wsdlDefinitions.getTargetNamespace();

Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java	2006-10-06 06:03:09 UTC (rev 1158)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java	2006-10-06 06:49:39 UTC (rev 1159)
@@ -37,9 +37,8 @@
 import org.jboss.ws.jaxrpc.CallImpl;
 
 /**
- * Multiple virtual host and soap:address problem
- * 
- * http://jira.jboss.org/jira/browse/JBWS-1178
+ * [JBWS-1178] Multiple virtual host and soap:address problem
+ * [JBWS-864] soap:address in wsdl ignores <url-pattern>
  *
  * @author Thomas.Diesler at jboss.com
  * @since 05-Oct-2006
@@ -70,7 +69,7 @@
    public void testHostAddress() throws Exception
    {
       InetAddress inetAddr = InetAddress.getByName(getServerHost());
-      URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178?wsdl");
+      URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178/testpattern?wsdl");
       
       ServiceFactory factory = ServiceFactory.newInstance();
       QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService");
@@ -85,7 +84,7 @@
    public void testHostName() throws Exception
    {
       InetAddress inetAddr = InetAddress.getByName(getServerHost());
-      URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178?wsdl");
+      URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178/testpattern?wsdl");
       
       ServiceFactory factory = ServiceFactory.newInstance();
       QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService");

Modified: branches/jbossws-1.0/src/test/resources/jaxws/jbws1178/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jbws1178/WEB-INF/web.xml	2006-10-06 06:03:09 UTC (rev 1158)
+++ branches/jbossws-1.0/src/test/resources/jaxws/jbws1178/WEB-INF/web.xml	2006-10-06 06:49:39 UTC (rev 1159)
@@ -10,6 +10,7 @@
   
   <servlet-mapping>
     <servlet-name>TestEndpoint</servlet-name>
-    <url-pattern>/*</url-pattern>
+    <!-- [JBWS-864] soap:address in wsdl ignores <url-pattern> -->
+    <url-pattern>/testpattern</url-pattern>
   </servlet-mapping>
 </web-app>
\ No newline at end of file