[jbossws-commits] JBossWS SVN: r3694 - in branches/jbossws-2.0: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 11 other directories.

Friday, 22 June 2007

Author: thomas.diesler(a)jboss.com
Date: 2007-06-22 07:40:18 -0400 (Fri, 22 Jun 2007)
New Revision: 3694

Added:
  
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java
  
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/
  
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
  
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java
  
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java
   branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/
   branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/
  
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl
Removed:
  
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
  
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java
  
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java
  
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java
Modified:
  
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
  
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
  
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
  
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
  
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java
  
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
   branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
Log:
Restore address rewriting test case

Deleted:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
===================================================================
---
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.management.BasicServerConfig;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ManagedServerConfig extends BasicServerConfig implements
ManagedServerConfigMBean
-{
-   // provide logging
-   private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
-
-   public void create() throws Exception
-   {
-      MBeanServer server = getMBeanServer();
-      if (server != null)
-      {
-         server.registerMBean(this, OBJECT_NAME);
-      }
-   }
-
-   public void destroy() throws Exception
-   {
-      MBeanServer server = getMBeanServer();
-      if (server != null)
-      {
-         server.unregisterMBean(OBJECT_NAME);
-      }
-   }
-
-   private MBeanServer getMBeanServer()
-   {
-      MBeanServer server = null;
-      ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-      if (servers.size() > 0)
-      {
-         server = (MBeanServer)servers.get(0);
-      }
-      return server;
-   }
-}

Deleted:
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java
===================================================================
---
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-import org.jboss.wsf.spi.management.ServerConfig;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ManagedServerConfigMBean extends ServerConfig
-{
-}

Deleted:
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java
===================================================================
---
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.management.BasicServerConfig;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ManagedServerConfig extends BasicServerConfig implements
ManagedServerConfigMBean
-{
-   // provide logging
-   private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
-
-   public void create() throws Exception
-   {
-      log.debug("WebServiceHost: " + getWebServiceHost());
-      log.debug("WebServicePort: " + getWebServicePort());
-      log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
-      MBeanServer server = getMBeanServer();
-      if (server != null)
-      {
-         server.registerMBean(this, OBJECT_NAME);
-      }
-   }
-
-   public void destroy() throws Exception
-   {
-      MBeanServer server = getMBeanServer();
-      if (server != null)
-      {
-         server.unregisterMBean(OBJECT_NAME);
-      }
-   }
-
-   private MBeanServer getMBeanServer()
-   {
-      MBeanServer server = null;
-      ArrayList servers = MBeanServerFactory.findMBeanServer(null);
-      if (servers.size() > 0)
-      {
-         server = (MBeanServer)servers.get(0);
-      }
-      return server;
-   }
-}

Deleted:
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java
===================================================================
---
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss50;
-
-import org.jboss.wsf.spi.management.ServerConfig;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ManagedServerConfigMBean extends ServerConfig
-{
-}

Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -3,7 +3,7 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
   
     
-  <bean name="WSServerConfig"
class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+  <bean name="WSServerConfig"
class="org.jboss.wsf.spi.management.BasicServerConfig">
     
     <property
name="webServiceHost">${jboss.bind.address}</property>
     <property name="modifySOAPAddress">true</property>

Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -3,7 +3,7 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
   
     
-  <bean name="WSServerConfig"
class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+  <bean name="WSServerConfig"
class="org.jboss.wsf.spi.management.BasicServerConfig">
     
     <property
name="webServiceHost">${jboss.bind.address}</property>
     <property name="modifySOAPAddress">true</property>

Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -3,7 +3,7 @@
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
   
     
-  <bean name="WSServerConfig"
class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+  <bean name="WSServerConfig"
class="org.jboss.wsf.spi.management.BasicServerConfig">
     
     <property
name="webServiceHost">${jboss.bind.address}</property>
     <property name="modifySOAPAddress">true</property>

Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -3,7 +3,7 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
     
-  <bean name="WSServerConfig"
class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
+  <bean name="WSServerConfig"
class="org.jboss.wsf.spi.management.BasicServerConfig">
     
     <property
name="webServiceHost">${jboss.bind.address}</property>
     <property name="modifySOAPAddress">true</property>

Modified:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java
===================================================================
---
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -39,13 +39,13 @@
 import org.jboss.wsf.spi.utils.ObjectNameFactory;
 
 /**
- * JBoss specific implementation of a ServerConfig 
+ * Basic implementation of a ServerConfig 
  *
  * @author Thomas.Diesler(a)jboss.org
  * @author darran.lofthouse(a)jboss.com
  * @since 08-May-2006
  */
-public class BasicServerConfig implements ServerConfig
+public class BasicServerConfig implements BasicServerConfigMBean
 {
    private static final Logger log = Logger.getLogger(BasicServerConfig.class);
 
@@ -163,6 +163,24 @@
       return localPort;
    }
 
+   public void create() throws Exception
+   {
+      MBeanServer server = getMBeanServer();
+      if (server != null)
+      {
+         server.registerMBean(this, BasicServerConfigMBean.OBJECT_NAME);
+      }
+   }
+
+   public void destroy() throws Exception
+   {
+      MBeanServer server = getMBeanServer();
+      if (server != null)
+      {
+         server.unregisterMBean(BasicServerConfigMBean.OBJECT_NAME);
+      }
+   }
+
    private int getConnectorPort(final String protocol, final boolean secure)
    {
       int port = -1;

Added:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java
===================================================================
---
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java	
                       (rev 0)
+++
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.management;
+
+import javax.management.ObjectName;
+
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.utils.ObjectNameFactory;
+
+public interface BasicServerConfigMBean extends ServerConfig
+{
+   /** The object name in the MBean server */
+   ObjectName OBJECT_NAME =
ObjectNameFactory.create("jboss.ws:service=ServerConfig");
+}

Modified:
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
---
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java	2007-06-22
10:04:47 UTC (rev 3693)
+++
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -26,9 +26,7 @@
 import java.io.File;
 import java.net.UnknownHostException;
 
-import javax.management.ObjectName;
 
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
 
 /**
  * Interface to container independent config 
@@ -41,9 +39,6 @@
    /** The default bean name */
    String BEAN_NAME = "WSServerConfig";
 
-   /** The object name in the MBean server */
-   ObjectName OBJECT_NAME =
ObjectNameFactory.create("jboss.ws:service=ServerConfig");
-   
    /** The host name that is returned if there is no other defined */
    String UNDEFINED_HOSTNAME = "jbossws.undefined.host";
    

Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
===================================================================

--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml	2007-06-22
10:04:47 UTC (rev 3693)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -20,6 +20,30 @@
     
     <mkdir dir="${tests.output.dir}/libs"/>
     
+    <!-- jaxrpc-addressrewrite -->
+    <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite.war"
webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/classes">
+        <include
name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
+        <include
name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
+      </classes>
+      <webinf
dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="webservices.xml"/>
+        <include name="wsdl/**"/>
+      </webinf>
+    </war>
+    <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite-sec.war"
webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml">
+      <classes dir="${tests.output.dir}/classes">
+        <include
name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
+        <include
name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
+      </classes>
+      <webinf
dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="webservices.xml"/>
+        <include name="wsdl/**"/>
+      </webinf>
+    </war>
+    
     <!-- jaxrpc-anonymous -->
     <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war"
webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/classes">

Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.addressrewrite;
+
+import java.net.URL;
+
+import javax.management.Attribute;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Call;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+
+import org.jboss.wsf.spi.management.BasicServerConfigMBean;
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ * Test soap:address rewriting in the WSDL.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 22-Jun-2007
+ */
+public class AddressRewriteTestCase extends JBossWSTest
+{
+   private static String NAMESPACE = "http://test.jboss.org/addressrewrite";
+   private String wsdlLocation;
+   private String wsdlLocationSec;
+
+   private Boolean modifySOAPAddress;
+   private String webServiceHost;
+
+   public void setUp() throws Exception
+   {
+      wsdlLocation = "http://" + getServerHost() +
":8080/jaxrpc-addressrewrite/ValidURL?wsdl";
+      wsdlLocationSec = "http://" + getServerHost() +
":8080/jaxrpc-addressrewrite-sec/ValidURL?wsdl";
+      modifySOAPAddress =
(Boolean)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME,
"ModifySOAPAddress");
+      webServiceHost =
(String)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME,
"WebServiceHost");
+   }
+
+   public void tearDown() throws Exception
+   {
+      Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress);
+      getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
+   }
+
+   public void testRewrite() throws Exception
+   {
+      setModifySOAPAddress(true);
+      deploy("jaxrpc-addressrewrite.war");
+      try
+      {
+         ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+         Service service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "ValidURLService"));
+         Call call = (Call)service.createCall(new QName(NAMESPACE,
"ValidURLPort"), "sayHello");
+         assertEquals("http://" + webServiceHost +
":8080/jaxrpc-addressrewrite/ValidURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "InvalidURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidURLPort"), "sayHello");
+         assertEquals("http://" + webServiceHost +
":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "ValidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"ValidSecureURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite/ValidSecureURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "InvalidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidSecureURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite/InvalidSecureURL",
call.getTargetEndpointAddress());
+      }
+      finally
+      {
+         undeploy("jaxrpc-addressrewrite.war");
+      }
+   }
+
+   /**
+    * Rewrite soap:address URL according to transport guarantee
+    * 
+    * http://jira.jboss.org/jira/browse/JBWS-454
+    */
+   public void testSecureRewrite() throws Exception
+   {
+      deploy("jaxrpc-addressrewrite-sec.war");
+      try
+      {
+         ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+         Service service = serviceFactory.createService(new URL(wsdlLocationSec), new
QName(NAMESPACE, "ValidURLService"));
+         Call call = (Call)service.createCall(new QName(NAMESPACE,
"ValidURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite-sec/ValidURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocationSec), new
QName(NAMESPACE, "InvalidURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite-sec/InvalidURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocationSec), new
QName(NAMESPACE, "ValidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"ValidSecureURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite-sec/ValidSecureURL",
call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocationSec), new
QName(NAMESPACE, "InvalidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidSecureURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite-sec/InvalidSecureURL",
call.getTargetEndpointAddress());
+      }
+      finally
+      {
+         undeploy("jaxrpc-addressrewrite-sec.war");
+      }
+   }
+
+   public void testNoRewrite() throws Exception
+   {
+      setModifySOAPAddress(false);
+      deploy("jaxrpc-addressrewrite.war");
+      try
+      {
+         ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+         Service service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "ValidURLService"));
+         Call call = (Call)service.createCall(new QName(NAMESPACE,
"ValidURLPort"), "sayHello");
+         assertEquals("http://somehost:80/somepath",
call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "InvalidURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidURLPort"), "sayHello");
+         assertEquals("http://" + webServiceHost +
":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "ValidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"ValidSecureURLPort"), "sayHello");
+         assertEquals("https://somehost:443/some-secure-path",
call.getTargetEndpointAddress());
+
+         service = serviceFactory.createService(new URL(wsdlLocation), new
QName(NAMESPACE, "InvalidSecureURLService"));
+         call = (Call)service.createCall(new QName(NAMESPACE,
"InvalidSecureURLPort"), "sayHello");
+         assertEquals("https://" + webServiceHost +
":8443/jaxrpc-addressrewrite/InvalidSecureURL",
call.getTargetEndpointAddress());
+      }
+      finally
+      {
+         undeploy("jaxrpc-addressrewrite.war");
+      }
+   }
+
+   private void setModifySOAPAddress(Boolean value) throws Exception
+   {
+      Attribute attr = new Attribute("ModifySOAPAddress", value);
+      getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
+   }
+}
\ No newline at end of file


Property changes on:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
___________________________________________________________________
Name: svn:executable
   + *

Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.addressrewrite;
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+public class HelloJavaBean implements HelloWs, Serializable
+{
+   public HelloJavaBean()
+   {
+   }
+
+   public String sayHello(String input) throws RemoteException
+   {
+      return "'" + input + "' to you too!";
+   }
+
+}

Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.addressrewrite;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface HelloWs extends Remote
+{
+   public String sayHello(String input) throws RemoteException;
+}

Added:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping
version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee   
http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+  <package-type>org.jboss.test.ws.jaxrpc.addressrewrite</package-type>
+  <namespaceURI>http://test.jboss.org/addressrewrite/types</namespaceU...
+ </package-mapping>
+ <service-interface-mapping>
+ 
<service-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloService</service-interface>
+  <wsdl-service-name
xmlns:serviceNS='http://test.jboss.org/addressrewrite'>service...
+  <port-mapping>
+   <port-name>HelloWsPort</port-name>
+   <java-port-name>HelloWsPort</java-port-name>
+  </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ 
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloWs</service-endpoint-interface>
+  <wsdl-port-type
xmlns:portTypeNS='http://test.jboss.org/addressrewrite'>portTy...
+  <wsdl-binding
xmlns:bindingNS='http://test.jboss.org/addressrewrite'>binding...
+  <service-endpoint-method-mapping>
+   <java-method-name>sayHello</java-method-name>
+   <wsdl-operation>sayHello</wsdl-operation>
+   <method-param-parts-mapping>
+    <param-position>0</param-position>
+    <param-type>java.lang.String</param-type>
+    <wsdl-message-mapping>
+     <wsdl-message
xmlns:wsdlMsgNS='http://test.jboss.org/addressrewrite'>wsdlMsg...
+     <wsdl-message-part-name>String_1</wsdl-message-part-name>
+     <parameter-mode>IN</parameter-mode>
+    </wsdl-message-mapping>
+   </method-param-parts-mapping>
+   <wsdl-return-value-mapping>
+    <method-return-value>java.lang.String</method-return-value>
+    <wsdl-message
xmlns:wsdlMsgNS='http://test.jboss.org/addressrewrite'>wsdlMsg...
+    <wsdl-message-part-name>result</wsdl-message-part-name>
+   </wsdl-return-value-mapping>
+  </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file

Added:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+  version="2.4">
+
+  <servlet>
+    <servlet-name>ValidURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>InvalidURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>ValidSecureURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>InvalidSecureURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  
+  <servlet-mapping>
+    <servlet-name>ValidURL</servlet-name>
+    <url-pattern>/ValidURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>InvalidURL</servlet-name>
+    <url-pattern>/InvalidURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>ValidSecureURL</servlet-name>
+    <url-pattern>/ValidSecureURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>InvalidSecureURL</servlet-name>
+    <url-pattern>/InvalidSecureURL</url-pattern>
+  </servlet-mapping>
+  
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>ValidURL</web-resource-name>
+      <url-pattern>/ValidURL</url-pattern>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>InvalidURL</web-resource-name>
+      <url-pattern>/InvalidURL</url-pattern>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>ValidSecureURL</web-resource-name>
+      <url-pattern>/ValidSecureURL</url-pattern>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>InvalidSecureURL</web-resource-name>
+      <url-pattern>/InvalidSecureURL</url-pattern>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+  
+</web-app>
+

Added:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+  version="2.4">
+
+  <servlet>
+    <servlet-name>ValidURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>InvalidURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>ValidSecureURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>InvalidSecureURL</servlet-name>
+   
<servlet-class>org.jboss.test.ws.jaxrpc.addressrewrite.HelloJavaBean</servlet-class>
+  </servlet>
+  
+  <servlet-mapping>
+    <servlet-name>ValidURL</servlet-name>
+    <url-pattern>/ValidURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>InvalidURL</servlet-name>
+    <url-pattern>/InvalidURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>ValidSecureURL</servlet-name>
+    <url-pattern>/ValidSecureURL</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>InvalidSecureURL</servlet-name>
+    <url-pattern>/InvalidSecureURL</url-pattern>
+  </servlet-mapping>
+  
+</web-app>
+

Added:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<webservices
+  xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:impl="http://test.jboss.org/addressrewrite"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
+  version="1.1">
+
+  <webservice-description>
+   
<webservice-description-name>HelloWsService</webservice-description-name>
+    <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
+    <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+    <port-component>
+      <port-component-name>ValidURL</port-component-name>
+      <wsdl-port>impl:ValidURLPort</wsdl-port>
+     
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloWs</service-endpoint-interface>
+      <service-impl-bean>
+        <servlet-link>ValidURL</servlet-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>InvalidURL</port-component-name>
+      <wsdl-port>impl:InvalidURLPort</wsdl-port>
+     
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloWs</service-endpoint-interface>
+      <service-impl-bean>
+        <servlet-link>InvalidURL</servlet-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>ValidSecureURL</port-component-name>
+      <wsdl-port>impl:ValidSecureURLPort</wsdl-port>
+     
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloWs</service-endpoint-interface>
+      <service-impl-bean>
+        <servlet-link>ValidSecureURL</servlet-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>InvalidSecureURL</port-component-name>
+      <wsdl-port>impl:InvalidSecureURLPort</wsdl-port>
+     
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.addressrewrite.HelloWs</service-endpoint-interface>
+      <service-impl-bean>
+        <servlet-link>InvalidSecureURL</servlet-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+</webservices>

Added:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl
===================================================================
---
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl	
                       (rev 0)
+++
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl	2007-06-22
11:40:18 UTC (rev 3694)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='HelloService'
targetNamespace='http://test.jboss.org/addressrewrite'
xmlns='http://schemas.xmlsoap.org/wsdl/'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://test.jboss.org/addressrewrite'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='HelloWs_sayHello'>
+  <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='HelloWs_sayHelloResponse'>
+  <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='HelloWs'>
+  <operation name='sayHello' parameterOrder='String_1'>
+   <input message='tns:HelloWs_sayHello'/>
+   <output message='tns:HelloWs_sayHelloResponse'/>
+  </operation>
+ </portType>
+ <binding name='HelloWsBinding' type='tns:HelloWs'>
+  <soap:binding style='rpc'
transport='http://schemas.xmlsoap.org/soap/http'/>
+  <operation name='sayHello'>
+   <soap:operation soapAction=''/>
+   <input>
+    <soap:body namespace='http://test.jboss.org/addressrewrite'
use='literal'/>
+   </input>
+   <output>
+    <soap:body namespace='http://test.jboss.org/addressrewrite'
use='literal'/>
+   </output>
+  </operation>
+ </binding>
+<!-- Manual Modification -->
+  <service name="ValidURLService">
+    <port name="ValidURLPort" binding="tns:HelloWsBinding">
+      <soap:address location="http://somehost:80/somepath"/>
+    </port>
+  </service>
+
+  <service name="InvalidURLService">
+    <port name="InvalidURLPort" binding="tns:HelloWsBinding">
+      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+    </port>
+  </service>
+
+  <service name="ValidSecureURLService">
+    <port name="ValidSecureURLPort"
binding="tns:HelloWsBinding">
+      <soap:address location="https://somehost:443/some-secure-path"/>
+    </port>
+  </service>
+
+  <service name="InvalidSecureURLService">
+    <port name="InvalidSecureURLPort"
binding="tns:HelloWsBinding">
+      <soap:address location="https://REPLACE_WITH_ACTUAL_URL"/>
+    </port>
+  </service>
+
+</definitions>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r3694 - in branches/jbossws-2.0: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 11 other directories.