tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r513346 - in /incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src: main/java/org/apache/tuscany/binding/axis2/ test/java/org/apache/tuscany/binding/axis2/
Date Thu, 01 Mar 2007 14:27:58 GMT
Author: antelder
Date: Thu Mar  1 06:27:57 2007
New Revision: 513346

URL: http://svn.apache.org/viewvc?view=rev&rev=513346
Log:
Get Axis2 binding working with services and references using default endpoint URIs

Modified:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilderTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
Thu Mar  1 06:27:57 2007
@@ -145,6 +145,10 @@
                 throw new Axis2BindingBuilderRuntimeException(e);
             }
 
+            if (wsBinding.isSpec10Compliant()) {
+                wsBinding.setActualURI(computeActualURI(wsBinding, BASE_URI, parent.getName(),
serviceDefinition.getName()));
+            }
+
             ServiceBinding serviceBinding =
                 new Axis2ServiceBinding(serviceDefinition.getName(), outboundContract, inboundContract,
parent, wsBinding,
                     servletHost, configContext, workContext);
@@ -207,10 +211,12 @@
             throw new Axis2BindingBuilderRuntimeException(e);
         }
 
-        String endpoint = computeActualURI(wsBinding, BASE_URI, parent.getName(), boundReferenceDefinition.getName());
+        if (wsBinding.isSpec10Compliant()) {
+            wsBinding.setActualURI(computeActualURI(wsBinding, BASE_URI, parent.getName(),
boundReferenceDefinition.getName()));
+        }
 
         return new Axis2ReferenceBinding(boundReferenceDefinition.getName(), parent, wsBinding,
-            inboundContract, outboundContract, workContext, endpoint);
+            inboundContract, outboundContract, workContext);
 
     }
 
@@ -236,7 +242,7 @@
      * If the <binding.ws> has no wsdlElement but does have a uri attribute then the
uri takes precidence
      * over any implicitly used WSDL.
      */
-    protected String computeActualURI(WebServiceBindingDefinition wsBinding, String baseURI,
String compositeName, String name) {
+    protected URI computeActualURI(WebServiceBindingDefinition wsBinding, String baseURI,
String compositeName, String name) {
         try {
 
             URI portURI = null;         
@@ -245,7 +251,7 @@
                 portURI = wsBinding.getPortURI();
             }
             if (portURI != null && portURI.isAbsolute()) {
-                return portURI.toString();
+                return new URI(portURI.toString());
             }
             
             URI explicitURI = null;
@@ -275,8 +281,12 @@
                 }
             }
             
+            if (actualURI.endsWith("/")) {
+                actualURI = actualURI.substring(0, actualURI.length() -1);
+            }
+            
             // normalize to handle any . or .. occurances 
-            return new URI(actualURI).normalize().toString();
+            return new URI(actualURI).normalize();
 
         } catch (URISyntaxException e) {
             throw new Axis2BindingBuilderRuntimeException(e);

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
Thu Mar  1 06:27:57 2007
@@ -60,15 +60,19 @@
                                  WebServiceBindingDefinition wsBinding,
                                  ServiceContract contract,
                                  ServiceContract<?> bindingServiceContract,
-                                 WorkContext workContext,
-                                 String endpointURI) {
+                                 WorkContext workContext) {
         super(theName, parent);
         this.bindingServiceContract = bindingServiceContract;
         this.workContext = workContext;
         try {
             Definition wsdlDefinition = wsBinding.getWSDLDefinition();
-            wsPortMetaData =
-                new WebServicePortMetaData(wsdlDefinition, wsBinding.getWSDLPort(), endpointURI,
false);
+            if (wsBinding.isSpec10Compliant()) {
+                wsPortMetaData =
+                    new WebServicePortMetaData(wsdlDefinition, wsBinding.getWSDLPort(), wsBinding.getActualURI().toString(),
false);
+            } else {
+                wsPortMetaData =
+                    new WebServicePortMetaData(wsdlDefinition, wsBinding.getWSDLPort(), wsBinding.getURI(),
false);
+            }
             serviceClient = createServiceClient(wsdlDefinition, wsPortMetaData);
         } catch (AxisFault e) {
             throw new Axis2BindingRunTimeException(e);

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
Thu Mar  1 06:27:57 2007
@@ -18,8 +18,11 @@
  */
 package org.apache.tuscany.binding.axis2;
 
+import static org.osoa.sca.Constants.SCA_NS;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,29 +30,12 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
+
 import javax.wsdl.Definition;
 import javax.wsdl.Operation;
 import javax.wsdl.PortType;
 import javax.xml.namespace.QName;
 
-import static org.osoa.sca.Constants.SCA_NS;
-import org.osoa.sca.annotations.Destroy;
-
-import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.TargetInvokerCreationException;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.extension.ServiceBindingExtension;
-import org.apache.tuscany.spi.host.ServletHost;
-import org.apache.tuscany.spi.model.InteractionScope;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.InvocationChain;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
@@ -64,6 +50,21 @@
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
 import org.apache.tuscany.binding.axis2.util.WebServicePortMetaData;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.TargetInvokerCreationException;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
+import org.apache.tuscany.spi.host.ServletHost;
+import org.apache.tuscany.spi.model.InteractionScope;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.osoa.sca.annotations.Destroy;
 
 // org.apache.tuscany.spi.model
 /**
@@ -124,12 +125,21 @@
         Axis2ServiceServlet servlet = new Axis2ServiceServlet();
         servlet.init(configContext);
         configContext.setContextRoot(getName());
-        servletHost.registerMapping("/services/" + getName(), servlet);
+        if (binding.isSpec10Compliant()) {
+            // TODO: TUSCANY-xxx, sort out what to do with system base URI etc
+            servletHost.registerMapping(binding.getActualURI().getPath(), servlet);
+        } else {
+            servletHost.registerMapping("/services/" + getName(), servlet);
+        }
     }
 
     @Destroy
     public void stop() {
-        servletHost.unregisterMapping("/services/" + getName());
+        if (binding.isSpec10Compliant()) {
+            servletHost.unregisterMapping(binding.getActualURI().getPath());
+        } else {
+            servletHost.unregisterMapping("/services/" + getName());
+        }
         try {
             configContext.getAxisConfiguration().removeService(getName());
         } catch (AxisFault e) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/java/org/apache/tuscany/binding/axis2/WebServiceBindingDefinition.java
Thu Mar  1 06:27:57 2007
@@ -50,6 +50,8 @@
     private String portName;
     private String bindingName;
     private Binding binding;
+    private boolean spec10Compliant; // hack just to allow any existing WS scdl to still
work for now
+    private URI actualURI;
 
     /**
      * @deprecated pre 1.0 binding.ws spec
@@ -69,6 +71,7 @@
         this.portName = portName;
         this.bindingName = bindingName;
         this.uri = uri;
+        this.spec10Compliant = true;
     }
 
     public Port getWSDLPort() {
@@ -179,5 +182,17 @@
 
     public String getBindingName() {
         return bindingName;
+    }
+
+    public boolean isSpec10Compliant() {
+        return spec10Compliant;
+    }
+
+    public URI getActualURI() {
+        return actualURI;
+    }
+
+    public void setActualURI(URI actualURI) {
+        this.actualURI = actualURI;
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilderTestCase.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilderTestCase.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilderTestCase.java
Thu Mar  1 06:27:57 2007
@@ -22,6 +22,7 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -35,8 +36,6 @@
 
 import junit.framework.TestCase;
 
-import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
-
 /**
  * Tests for the WebServicebindingLoader class
  */
@@ -50,109 +49,109 @@
     public void testDefaultURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(null, null,
null, null, null, null);
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://localhost/services/MyComposite/MyService/", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://localhost/services/MyComposite/MyService", uri.toString());
     }
 
     public void testExplicitURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(null, null,
null, null, null, "http://foo/bar");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://foo/bar", uri.toString());
     }
     
     public void testExplicitWSDL() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("http://my/wsdl/uri"),
"myService", "myPort", null, null);
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://my/wsdl/uri", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://my/wsdl/uri", uri.toString());
     }
     
     public void testExplicitWSDLExplicitURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("http://my/wsdl/uri"),
"myService", "myPort", null, "foo");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
 
         // explicit URI 'foo' should be ignored
-        assertEquals("http://my/wsdl/uri", uri);
+        assertEquals("http://my/wsdl/uri", uri.toString());
     }
 
     public void testExplicitWSDLBindingExplicitURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDLBinding("http://my/wsdl/uri"),
null, null, "myBinding", "http://my/uri");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
 
         // explicit URI should be used as the WSDL binding is used not the wsdl service/port
-        assertEquals("http://my/uri", uri);
+        assertEquals("http://my/uri", uri.toString());
     }
 
     public void testExplicitWSDLBindingExplicitRelativeURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDLBinding("http://my/wsdl/uri"),
null, null, "myBinding", "x/y");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
 
         // explicit URI should be used as the WSDL binding is used not the wsdl service/port
-        assertEquals("http://localhost/services/MyComposite/MyService/x/y", uri);
+        assertEquals("http://localhost/services/MyComposite/MyService/x/y", uri.toString());
     }
 
     public void testExplicitWSDLBindingExplicitRelativeURIWithDot() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDLBinding("http://my/wsdl/uri"),
null, null, "myBinding", "x/./y");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
 
         // explicit URI should be used as the WSDL binding is used not the wsdl service/port
-        assertEquals("http://localhost/services/MyComposite/MyService/x/y", uri);
+        assertEquals("http://localhost/services/MyComposite/MyService/x/y", uri.toString());
     }
 
     public void testExplicitWSDLBindingExplicitRelativeURIWithDots() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDLBinding("http://my/wsdl/uri"),
null, null, "myBinding", "../../x/y");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
 
         // explicit URI should be used as the WSDL binding is used not the wsdl service/port
-        assertEquals("http://localhost/services/x/y", uri);
+        assertEquals("http://localhost/services/x/y", uri.toString());
     }
 
     public void testExplicitRelativeWSDL() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("foo/bar"),
"myService", "myPort", null, null);
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://localhost/services/MyComposite/MyService/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://localhost/services/MyComposite/MyService/foo/bar", uri.toString());
     }
 
     public void testExplicitRelativeWSDLWithDots() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("../foo/bar"),
"myService", "myPort", null, null);
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://localhost/services/MyComposite/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://localhost/services/MyComposite/foo/bar", uri.toString());
     }
 
     public void testExplicitRelativeWSDLExplicitURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("foo/bar"),
"myService", "myPort", null, "http://my/wsdl/uri");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://my/wsdl/uri/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://my/wsdl/uri/foo/bar", uri.toString());
     }
 
     public void testExplicitRelativeWSDLWithDotsExplicitURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("../foo/bar"),
"myService", "myPort", null, "http://my/wsdl/uri");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://my/wsdl/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://my/wsdl/foo/bar", uri.toString());
     }
 
     public void testExplicitRelativeWSDLExplicitRelativeURI() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("foo/bar"),
"myService", "myPort", null, "x/y");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://localhost/services/MyComposite/MyService/x/y/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://localhost/services/MyComposite/MyService/x/y/foo/bar", uri.toString());
     }
 
     public void testExplicitRelativeWSDLExplicitRelativeURIWithDots() throws Exception {
         Axis2BindingBuilder builder = new Axis2BindingBuilder();
         WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition("myNS", createMockWSDL("foo/bar"),
"myService", "myPort", null, "../x/y");
-        String uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
-        assertEquals("http://localhost/services/MyComposite/x/y/foo/bar", uri);
+        URI uri = builder.computeActualURI(wsBinding, BASE_URI, COMPOSITE_NAME, NAME);
+        assertEquals("http://localhost/services/MyComposite/x/y/foo/bar", uri.toString());
     }
 
     protected Definition createMockWSDL(String endpoint) {

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java?view=diff&rev=513346&r1=513345&r2=513346
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
Thu Mar  1 06:27:57 2007
@@ -106,7 +106,6 @@
             wsBinding,
             contract,
             null,
-            null,
             null);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message