[prev in list] [next in list] [prev in thread] [next in thread] 

List:       axis-dev
Subject:    svn commit: r451633 -
From:       barrettj () apache ! org
Date:       2006-09-30 18:19:40
Message-ID: 20060930181941.114191A981A () eris ! apache ! org
[Download RAW message or body]

Author: barrettj
Date: Sat Sep 30 11:19:40 2006
New Revision: 451633

URL: http://svn.apache.org/viewvc?view=rev&rev=451633
Log:
Change to not use QName.toString() to create the AxisService name.  That name is used \
to create URL patterns and the toString method returns characters that are invalid in \
URLs.

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointDescription.java


Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointDescription.java
                
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/a \
pache/axis2/jaxws/description/EndpointDescription.java?view=diff&rev=451633&r1=451632&r2=451633
 ==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointDescription.java \
                (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointDescription.java \
Sat Sep 30 11:19:40 2006 @@ -488,7 +488,7 @@
         if (axisService == null) {
             // TODO: RAS & NLS
             throw ExceptionFactory.makeWebServiceException("Unable to create \
                AxisService for "
-                    + createFQServicePlusPortName());
+                    + createAxisServiceName());
         }
 
         // Save the Service QName as a parameter.
@@ -522,7 +522,7 @@
         serviceBuilder.setServerSide(false);
         try {
             axisService = serviceBuilder.populateService();
-            axisService.setName(createFQServicePlusPortName());
+            axisService.setName(createAxisServiceName());
         } catch (AxisFault e) {
             // TODO We should not swallow a fault here.
             log.warn(Messages.getMessage("warnAxisFault", e.toString()));
@@ -533,7 +533,7 @@
         // TODO: Refactor this to create from annotations.
         String serviceName = null;
         if (portQName != null) {
-            serviceName = createFQServicePlusPortName();
+            serviceName = createAxisServiceName();
         }
         else {
             // REVIEW: Can the portQName ever be null?
@@ -564,7 +564,7 @@
         Definition wsdlDefinition = \
                getServiceDescription().getWSDLWrapper().getDefinition();
         javax.wsdl.Service wsdlService = \
wsdlDefinition.getService(getServiceDescription().getServiceQName());  if \
                (wsdlService == null) {
-            throw ExceptionFactory.makeWebServiceException(Messages.getMessage("serviceDescErr2", \
createFQServicePlusPortName())); +            throw \
ExceptionFactory.makeWebServiceException(Messages.getMessage("serviceDescErr2", \
createAxisServiceName()));  }
         
         Map wsdlPorts = wsdlService.getPorts();
@@ -624,16 +624,16 @@
         return serviceClient;
     }
  
-    private String createFQServicePlusPortName() {
+    private String createAxisServiceName() {
         String portName = null;
         if (portQName != null) {
-            portName = portQName.toString();
+            portName = portQName.getLocalPart();
         }
         else {
             portName = "NoPortNameSpecified";
 
         }
-        return getServiceDescription().getServiceQName().toString() + "#" + \
portName; +        return getServiceDescription().getServiceQName().getLocalPart() + \
"." + portName;  }
 
 }



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


[prev in list] [next in list] [prev in thread] [next in thread]