diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-24 19:12:29 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-24 19:12:29 +0000 |
commit | 06942a3a38de5bf28302ccbf79dc83552ecf7d96 (patch) | |
tree | 5f6cc12f71d43ecd17838a3bdeb7e839d85363f0 /sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src | |
parent | 7d0186bd737c4fa1ac2dbce6ba1aee1a8fd54216 (diff) |
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
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java index a7244ce13c..9fed67dd0e 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java @@ -32,6 +32,7 @@ import org.apache.tuscany.sca.assembly.Extension; import org.apache.tuscany.sca.assembly.ExtensionFactory; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; @@ -57,7 +58,7 @@ import com.ibm.wsdl.OperationImpl; * * @version $Rev$ $Date$ */ -public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants { +public class WSDLInterfaceProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants { private WSDLFactory wsdlFactory; private ExtensionFactory extensionFactory; @@ -152,14 +153,14 @@ public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfa String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION); wsdlInterfaceContract.setLocation(location); - String uri = reader.getAttributeValue(null, INTERFACE); + String uri = getURIString(reader, INTERFACE); if (uri != null) { WSDLInterface wsdlInterface = createWSDLInterface(uri); if (wsdlInterface != null) wsdlInterfaceContract.setInterface(wsdlInterface); } - uri = reader.getAttributeValue(null, CALLBACK_INTERFACE); + uri = getURIString(reader, CALLBACK_INTERFACE); if (uri != null) { WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri); if (wsdlCallbackInterface != null) |