From 06942a3a38de5bf28302ccbf79dc83552ecf7d96 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 Aug 2010 19:12:29 +0000
Subject: Merge revision 921286 from trunk into the 1.6.1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988675 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml')

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index a3dfcc3c5b..12995f19de 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
@@ -47,6 +47,7 @@ import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXAttributeProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
@@ -77,7 +78,7 @@ import com.ibm.wsdl.OperationImpl;
  *
  * @version $Rev$ $Date$
  */
-public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
+public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
 
     private ExtensionPointRegistry extensionPoints;
     private WSDLFactory wsdlFactory;
@@ -172,7 +173,7 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
         }
 
         // Read URI
-        String uri = reader.getAttributeValue(null, URI);
+        String uri = getURIString(reader, URI);
         if (uri != null) {
             wsBinding.setURI(uri);
         }
@@ -180,7 +181,7 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
         // Read a qname in the form:
         // namespace#wsdl.???(name)
         Boolean wsdlElementIsBinding = null;
-        String wsdlElement = reader.getAttributeValue(null, WSDL_ELEMENT);
+        String wsdlElement = getURIString(reader, WSDL_ELEMENT);
         if (wsdlElement != null) {
             int index = wsdlElement.indexOf('#');
             if (index == -1) {
-- 
cgit v1.2.3