You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/05/10 15:47:39 UTC
svn commit: r536866 - in /incubator/tuscany/java/sca:
modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/
modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/
modules/interface-wsdl-xml/src/main/java/org...
Author: antelder
Date: Thu May 10 06:47:38 2007
New Revision: 536866
URL: http://svn.apache.org/viewvc?view=rev&rev=536866
Log:
Get <binding.ws /> working for services. still doesn't work for referneces
Modified:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.composite
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.wsdl
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/WebServiceBindingImpl.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/WSDLInterface.java
incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.composite?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.composite (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.composite Thu May 10 06:47:38 2007
@@ -23,8 +23,7 @@
<service name="helloWorld" promote="HelloWorldService">
<interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />
- <!-- interface.java interface="org.apache.tuscany.binding.axis2.itests.HelloWorld" / -->
- <binding.ws wsdlElement="http://helloworld-om#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+ <binding.ws/>
</service>
<component name="HelloWorldService">
@@ -38,7 +37,9 @@
<reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">
<interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld-om#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+ <binding.ws wsdlElement="http://helloworld-om#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
+ uri="http://localhost:8080/HelloWorldService/helloWorld" />
+ <!-- binding.ws uri="http://localhost:8080/HelloWorldService/helloWorld" / -->
</reference>
</composite>
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.wsdl?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.wsdl (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/binding/axis2/itests/helloworld-om.wsdl Thu May 10 06:47:38 2007
@@ -71,7 +71,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
+ <wsdlsoap:address location="http://endpoint.not.used"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/WebServiceBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/WebServiceBindingImpl.java?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/WebServiceBindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/binding/ws/impl/WebServiceBindingImpl.java Thu May 10 06:47:38 2007
@@ -28,8 +28,10 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.binding.ws.WebServiceBinding;
+import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.InterfaceContract;
import org.apache.tuscany.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.policy.Intent;
import org.apache.tuscany.policy.PolicySet;
@@ -208,6 +210,12 @@
}
public WSDLDefinition getWSDLDefinition() {
+ if (wsdlDefinition == null) {
+ Interface iface = bindingInterfaceContract.getInterface();
+ if (iface instanceof WSDLInterface) {
+ wsdlDefinition = ((WSDLInterface) iface).getWsdlDefinition();
+ }
+ }
return wsdlDefinition;
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Thu May 10 06:47:38 2007
@@ -167,6 +167,7 @@
throw new ContributionResolveException(e);
}
resolver.addModel(wsdlInterface);
+ wsdlInterface.setWsdlDefinition(wsdlDefinition);
}
}
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/WSDLInterface.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/WSDLInterface.java?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/WSDLInterface.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/WSDLInterface.java Thu May 10 06:47:38 2007
@@ -59,4 +59,8 @@
*/
void setPortType(PortType portType);
+ public WSDLDefinition getWsdlDefinition();
+
+ public void setWsdlDefinition(WSDLDefinition wsdlDefinition);
+
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/impl/WSDLInterfaceImpl.java?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/impl/WSDLInterfaceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/interfacedef/wsdl/impl/WSDLInterfaceImpl.java Thu May 10 06:47:38 2007
@@ -22,6 +22,7 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.interfacedef.impl.InterfaceImpl;
+import org.apache.tuscany.interfacedef.wsdl.WSDLDefinition;
import org.apache.tuscany.interfacedef.wsdl.WSDLInterface;
/**
@@ -33,6 +34,7 @@
private QName name;
private PortType portType;
+ private WSDLDefinition wsdlDefinition;
protected WSDLInterfaceImpl() {
setRemotable(true);
@@ -79,5 +81,13 @@
} else {
return false;
}
+ }
+
+ public WSDLDefinition getWsdlDefinition() {
+ return wsdlDefinition;
+ }
+
+ public void setWsdlDefinition(WSDLDefinition wsdlDefinition) {
+ this.wsdlDefinition = wsdlDefinition;
}
}
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl Thu May 10 06:47:38 2007
@@ -72,7 +72,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/>
+ <wsdlsoap:address location="http://localhost:8080/HelloWorldServiceComponent/HelloWorldWebService"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite?view=diff&rev=536866&r1=536865&r2=536866
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite (original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite Thu May 10 06:47:38 2007
@@ -23,8 +23,10 @@
name="helloworldws">
<service name="HelloWorldWebService" promote="HelloWorldServiceComponent">
- <interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
+ <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
+ <!-- interface.java interface="helloworld.HelloWorldService" / -->
+ <!-- binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/ -->
+ <binding.ws />
</service>
<component name="HelloWorldServiceComponent">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org