You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ng...@apache.org on 2006/08/23 07:09:43 UTC
svn commit: r433905 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws:
handler/PortInfoImpl.java i18n/resource.properties spi/ServiceDelegate.java
Author: ngallardo
Date: Tue Aug 22 22:09:42 2006
New Revision: 433905
URL: http://svn.apache.org/viewvc?rev=433905&view=rev
Log:
AXIS2-985
Contributor: Jeff Barrett
Jeff's patch for this issue.
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/PortInfoImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/resource.properties
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/PortInfoImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/PortInfoImpl.java?rev=433905&r1=433904&r2=433905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/PortInfoImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/PortInfoImpl.java Tue Aug 22 22:09:42 2006
@@ -45,9 +45,6 @@
if (bindingId == null) {
throw new WebServiceException(Messages.getMessage("portInfoErr2", "<null>"));
}
- if (serviceEndpoint == null) {
- throw new WebServiceException(Messages.getMessage("portInfoErr3", "<null>"));
- }
this.serviceName = serviceName;
this.portName = portName;
this.bindingId = bindingId;
@@ -69,13 +66,15 @@
public String getEndpointAddress(){
return serviceEndpoint;
}
-
+
/* TODO: I don't think we need the setters, let's leave the commented for now...
- public void setServiceName(QName serviceName){
- if (serviceName == null)
- throw new RuntimeException("serviceName cannot be null");
- this.serviceName = serviceName;
- }
+
+ public void setServiceName(QName serviceName){
+ if (serviceName == null)
+ throw new RuntimeException("serviceName cannot be null");
+ this.serviceName = serviceName;
+ }
+
public void setPortName(QName portName){
if (portName == null)
@@ -106,8 +105,7 @@
PortData info = (PortData) obj;
if (bindingId.equals(info.getBindingID())
&& portName.equals(info.getPortName())
- && serviceName.equals(info.getServiceName())
- && serviceEndpoint.equals(info.getEndpointAddress())) {
+ && serviceName.equals(info.getServiceName())) {
return true;
}
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/resource.properties?rev=433905&r1=433904&r2=433905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/resource.properties Tue Aug 22 22:09:42 2006
@@ -33,7 +33,8 @@
createDispatchFail2=Dispatch creation failed. Could not find PortData for Port {0}.
addPortDup=An attempt was made to add port {0} to the ServiceDelegate. The port already exists.
addPortErr0=Only SOAP11HTTP_BINDING and SOAP12HTTP_BINDING are supported at this time. Port {0} is cannot be added to the ServiceDelegate.
-addPortErr1=An attempt was made to add port {0} with invalid endpoint address {1} to the ServiceDelegate. This is not allowed.
+# The key addPortErr1 is not currently used
+# addPortErr1=An attempt was made to add port {0} with invalid endpoint address {1} to the ServiceDelegate. This is not allowed.
addPortErr2=An attempt was made to add a port with no name to the ServiceDelegate. This is not allowed.
serviceDelegateConstruct0=An attempt was made to construct the ServiceDelegate with invalid service name, {0}.
serviceDelegateConstruct1=An attempt was made to construct the ServiceDelegate with service {0}, but the service is not defined in the wsdl {1}.
@@ -45,7 +46,8 @@
portInfoErr0=Cannot construct port data. The service name is invalid: {0}
portInfoErr1=Cannot construct port data. The port name is invalid: {0}
portInfoErr2=Cannot construct port data. The binding id is invalid: {0}
-portInfoErr3=Cannot construct port data. The service endpoint is invalid: {0}
+# The key portInfoErr3 is not currently used
+# portInfoErr3=Cannot construct port data. The service endpoint is invalid: {0}
warnAxisFault=Caught AxisFault. Processing continues. AxisFault = {0}
handlerChainErr0=Internal error. Logical handler {0} occurs after the protocol handlers.
handlerChainErr1=Handler {0} should not directly implement javax.xml.ws.handler.Handler.
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java?rev=433905&r1=433904&r2=433905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/ServiceDelegate.java Tue Aug 22 22:09:42 2006
@@ -107,10 +107,6 @@
throw ExceptionFactory.makeWebServiceException(Messages.getMessage("addPortErr2"));
}
- if (endpointAddress == null) {
- throw ExceptionFactory.makeWebServiceException(Messages.getMessage("addPortErr1", portName.toString(), "null"));
- }
-
if(bindingId!=null && !(bindingId.equals(SOAPBinding.SOAP11HTTP_BINDING) ||
bindingId.equals(SOAPBinding.SOAP12HTTP_BINDING))){
// TODO Is this the correct exception. Shouldn't this be a WebServiceException ?
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org