You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/19 03:05:03 UTC
svn commit: r548540 - in /incubator/tuscany/java/sca:
demos/mortgage-creditcheck/src/main/java/credit/
itest/wsdl/src/main/resources/ modules/
modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/
modules/binding-jsonrpc/src/tes...
Author: jsdelfino
Date: Mon Jun 18 18:05:01 2007
New Revision: 548540
URL: http://svn.apache.org/viewvc?view=rev&rev=548540
Log:
Changed default Tomcat and Jetty ports to 8080. Adjusted all test cases that don't specify a port to specify 8085 as 8080 is used on the Confluence build machine.
Modified:
incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite
incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite
incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/BindingSCDLProcessor.java
incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
incubator/tuscany/java/sca/modules/pom.xml
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/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java (original)
+++ incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java Mon Jun 18 18:05:01 2007
@@ -29,7 +29,7 @@
System.out.println("Starting the CreditCheck Service...");
- SCADomain domain = SCADomain.newInstance("http://localhost:8085", "/", "CreditCheck.composite");
+ SCADomain domain = SCADomain.newInstance("http://localhost", "/", "CreditCheck.composite");
System.out.println("Press Enter to Exit...");
System.in.read();
Modified: incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite (original)
+++ incubator/tuscany/java/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite Mon Jun 18 18:05:01 2007
@@ -24,67 +24,67 @@
<service name="AccountService1a2a3a4a" promote="Component2a3a4a">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2a3a4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4a"/>
</service>
<service name="AccountService1a2a3a4b" promote="Component2a3a4b">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2a3a4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3a4b"/>
</service>
<service name="AccountService1a2a3b4a" promote="Component2a3b4a">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2a3b4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4a"/>
</service>
<service name="AccountService1a2a3b4b" promote="Component2a3b4b">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2a3b4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2a3b4b"/>
</service>
<service name="AccountService1a2b3a4a" promote="Component2b3a4a">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2b3a4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4a"/>
</service>
<service name="AccountService1a2b3a4b" promote="Component2b3a4b">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2b3a4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3a4b"/>
</service>
<service name="AccountService1a2b3b4a" promote="Component2b3b4a">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2b3b4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4a"/>
</service>
<service name="AccountService1a2b3b4b" promote="Component2b3b4b">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1a2b3b4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1a2b3b4b"/>
</service>
<service name="AccountService1b2a3a4a" promote="Component2a3a4a">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2a3a4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4a"/>
</service>
<service name="AccountService1b2a3a4b" promote="Component2a3a4b">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2a3a4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3a4b"/>
</service>
<service name="AccountService1b2a3b4a" promote="Component2a3b4a">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2a3b4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4a"/>
</service>
<service name="AccountService1b2a3b4b" promote="Component2a3b4b">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2a3b4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2a3b4b"/>
</service>
<service name="AccountService1b2b3a4a" promote="Component2b3a4a">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2b3a4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4a"/>
</service>
<service name="AccountService1b2b3a4b" promote="Component2b3a4b">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2b3a4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3a4b"/>
</service>
<service name="AccountService1b2b3b4a" promote="Component2b3b4a">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2b3b4a"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4a"/>
</service>
<service name="AccountService1b2b3b4b" promote="Component2b3b4b">
<interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService1b2b3b4b"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService1b2b3b4b"/>
</service>
<component name="Component2a3a4a">
@@ -161,7 +161,7 @@
<service name="AccountService" promote="AccountServiceComponent">
<interface.java interface="bigbank.account.services.accountdata.AccountDataService" />
- <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="../AccountService"/>
+ <binding.ws wsdlElement="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)" uri="http://localhost:8085/AccountService"/>
</service>
<component name="AccountServiceComponent">
Modified: incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite (original)
+++ incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite Mon Jun 18 18:05:01 2007
@@ -23,68 +23,68 @@
<service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2a3a4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4a"/>
</service>
<service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2a3a4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3a4b"/>
</service>
<service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2a3b4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4a"/>
</service>
<service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2a3b4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2a3b4b"/>
</service>
<service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2b3a4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4a"/>
</service>
<service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2b3a4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3a4b"/>
</service>
<service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2b3b4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4a"/>
</service>
<service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
<interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1a2b3b4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1a2b3b4b"/>
</service>
<service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2a3a4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4a"/>
</service>
<service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2a3a4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3a4b"/>
</service>
<service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2a3b4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4a"/>
</service>
<service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2a3b4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2a3b4b"/>
</service>
<service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2b3a4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4a"/>
</service>
<service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2b3a4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3a4b"/>
</service>
<service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2b3b4a"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4a"/>
</service>
<service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldService1b2b3b4b"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldService1b2b3b4b"/>
</service>
<component name="Component2a3a4a">
@@ -167,7 +167,7 @@
<service name="HelloWorldWebService" promote="HelloWorldServiceComponent" >
<!-- interface.java interface="helloworld.HelloWorldService" / -->
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="../HelloWorldWebService"/>
+ <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" uri="http://localhost:8085/HelloWorldWebService"/>
</service>
<component name="HelloWorldServiceComponent">
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java Mon Jun 18 18:05:01 2007
@@ -68,7 +68,11 @@
Class<?> serviceInterface = getTargetJavaClass(service.getInterfaceContract().getInterface());
Object instance = component.createSelfReference(serviceInterface).getService();
JSONRPCServiceServlet serviceServlet = new JSONRPCServiceServlet(binding.getName(), serviceInterface, instance);
- servletHost.addServletMapping(SERVICE_PREFIX + binding.getName(), serviceServlet);
+ if (binding.getURI() != null) {
+ servletHost.addServletMapping(binding.getURI(), serviceServlet);
+ } else {
+ servletHost.addServletMapping(SERVICE_PREFIX + binding.getName(), serviceServlet);
+ }
// get the ScaDomainScriptServlet, if it doesn't yet exist create one
// this uses removeServletMapping / addServletMapping as theres no getServletMapping facility
@@ -86,7 +90,11 @@
public void stop() {
// Unregister from the service servlet mapping
- servletHost.removeServletMapping(SERVICE_PREFIX + binding.getName());
+ if (binding.getURI() != null) {
+ servletHost.removeServletMapping(binding.getURI());
+ } else {
+ servletHost.removeServletMapping(SERVICE_PREFIX + binding.getName());
+ }
// Unregister the service from the scaDomain script servlet
// don't unregister the scaDomain script servlet if it still has other service names
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/resources/JSONRPCBinding.composite Mon Jun 18 18:05:01 2007
@@ -24,7 +24,7 @@
<service name="EchoService" promote="EchoComponent">
<interface.java interface="org.apache.tuscany.sca.binding.jsonrpc.Echo"/>
- <binding.jsonrpc />
+ <binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>
</service>
<component name="EchoComponent">
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ServiceBindingProvider.java Mon Jun 18 18:05:01 2007
@@ -65,7 +65,7 @@
private MessageFactory messageFactory;
// TODO: what to do about the base URI?
- private static final String BASE_URI = "http://localhost:8085/";
+ private static final String BASE_URI = "http://localhost:8080/";
public Axis2ServiceBindingProvider(RuntimeComponent component,
RuntimeComponentService service,
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultMultiService.composite Mon Jun 18 18:05:01 2007
@@ -29,7 +29,8 @@
<service name="helloWorld" promote="HelloWorldService/HelloWorldOM">
<interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>
+ <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
+ wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>
</service>
<component name="HelloWorldService">
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/DefaultSingleService.composite Mon Jun 18 18:05:01 2007
@@ -29,7 +29,8 @@
<service name="helloWorld" promote="HelloWorldService">
<interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />
- <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>
+ <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
+ wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>
</service>
<component name="HelloWorldService">
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl Mon Jun 18 18:05:01 2007
@@ -71,7 +71,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="myRelativeURI"/>
+ <wsdlsoap:address location="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/>
</wsdl:port>
</wsdl:service>
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/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/sca/binding/axis2/itests/helloworld-om.composite?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite Mon Jun 18 18:05:01 2007
@@ -23,7 +23,7 @@
<service name="helloWorld" promote="HelloWorldService">
<interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>
</service>
<component name="HelloWorldService">
Modified: incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/BindingSCDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/BindingSCDLProcessor.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/BindingSCDLProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/extension-helper/src/main/java/org/apache/tuscany/sca/spi/impl/BindingSCDLProcessor.java Mon Jun 18 18:05:01 2007
@@ -115,6 +115,10 @@
}
}
+ //FIXME: none of the attributes of Binding seem to be working with PojoBinding
+ // For now at least read the binding URI
+ String uri = reader.getAttributeValue(null, "uri");
+
if (elementTextSetter != null) {
try {
String value = reader.getElementText();
@@ -132,6 +136,12 @@
if (!(impl instanceof Binding)) {
impl = new PojoBinding(impl);
+
+ //FIXME: none of the attributes of Binding seem to be working with PojoBinding
+ // For now at least read the binding URI
+ if (uri != null) {
+ ((PojoBinding)impl).setURI(uri);
+ }
}
return (Binding)impl;
}
Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java Mon Jun 18 18:05:01 2007
@@ -59,7 +59,7 @@
private static final int STARTED = 2;
private static final int STOPPING = 3;
private static final int STOPPED = 4;
- private static final int DEFAULT_PORT = 8085;
+ private static final int DEFAULT_PORT = 8080;
private final Object joinLock = new Object();
private int state = UNINITIALIZED;
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java Mon Jun 18 18:05:01 2007
@@ -48,7 +48,7 @@
@SuppressWarnings("deprecation")
public class TomcatServer implements ServletHost {
- private static final int DEFAULT_PORT = 8085;
+ private static final int DEFAULT_PORT = 8080;
private StandardEngine engine;
private StandardHost host;
private Connector connector;
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?view=diff&rev=548540&r1=548539&r2=548540
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Mon Jun 18 18:05:01 2007
@@ -84,6 +84,9 @@
<module>implementation-java-runtime</module>
<module>implementation-script</module>
<module>implementation-spring</module>
+ <!--
+ <module>implementation-web-resource</module>
+ -->
<module>java2wsdl</module>
<!--
<module>jmx</module>
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=548540&r1=548539&r2=548540
==============================================================================
--- 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 Mon Jun 18 18:05:01 2007
@@ -72,7 +72,7 @@
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>
+ <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
</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=548540&r1=548539&r2=548540
==============================================================================
--- 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 Mon Jun 18 18:05:01 2007
@@ -25,7 +25,7 @@
<component name="HelloWorldServiceComponent">
<service name="HelloWorldService">
<interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws />
+ <binding.ws uri="http://localhost:8085/HelloWorldService"/>
</service>
<implementation.java class="helloworld.HelloWorldImpl" />
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org