You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2007/12/14 23:16:47 UTC
svn commit: r604313 - in /incubator/woden/branches/woden47:
src/org/apache/woden/ant/ src/org/apache/woden/internal/
src/org/apache/woden/internal/wsdl20/
src/org/apache/woden/internal/wsdl20/extensions/
src/org/apache/woden/internal/wsdl20/extensions/...
Author: jkaputin
Date: Fri Dec 14 14:16:44 2007
New Revision: 604313
URL: http://svn.apache.org/viewvc?rev=604313&view=rev
Log:
Merge static constant updates from trunk into
woden47 branch.
Modified:
incubator/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/Constants.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
incubator/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
Modified: incubator/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java Fri Dec 14 14:16:44 2007
@@ -126,9 +126,9 @@
attributes += cmbase.idAttribute(component);
out.beginElement("descriptionComponent", attributes);
- URI[] extensions = { ComponentExtensions.URI_NS_EXTENSIONS,
- ComponentExtensions.URI_NS_HTTP,
- ComponentExtensions.URI_NS_RPC, ComponentExtensions.URI_NS_SOAP };
+ URI[] extensions = { ComponentExtensions.NS_URI_WSDL_EXTENSIONS,
+ ComponentExtensions.NS_URI_HTTP,
+ ComponentExtensions.NS_URI_RPC, ComponentExtensions.NS_URI_SOAP };
cmbase.writeUris("extensions", extensions);
write("interfaces", component.getInterfaces());
@@ -271,11 +271,11 @@
cmbase.parent(component.getParent());
InterfaceOperationExtensions extensions = (InterfaceOperationExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_EXTENSIONS);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_WSDL_EXTENSIONS);
cmextensions.wsdlInterfaceOperationExtension(extensions);
RPCInterfaceOperationExtensions rpcExtensions = (RPCInterfaceOperationExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_RPC);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_RPC);
cmrpc.rpcInterfaceOperationExtension(rpcExtensions);
out.endElement();
@@ -407,11 +407,11 @@
write("bindingOperations", component.getBindingOperations());
HTTPBindingExtensions http = (HTTPBindingExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
cmhttp.httpBindingExtension(http);
SOAPBindingExtensions soap = (SOAPBindingExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapBindingExtension(soap);
out.endElement();
@@ -459,11 +459,11 @@
cmbase.parent(component.getParent());
HTTPBindingFaultExtensions http = (HTTPBindingFaultExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
cmhttp.httpBindingFaultExtension(http);
SOAPBindingFaultExtensions soap = (SOAPBindingFaultExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapBindingFaultExtension(soap);
out.endElement();
@@ -506,11 +506,11 @@
cmbase.parent(component.getParent());
HTTPBindingOperationExtensions http = (HTTPBindingOperationExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
cmhttp.httpBindingOperationExtension(http);
SOAPBindingOperationExtensions soap = (SOAPBindingOperationExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapBindingOperationExtension(soap);
out.endElement();
@@ -554,11 +554,11 @@
cmbase.parent(component.getParent());
HTTPBindingMessageReferenceExtensions http = (HTTPBindingMessageReferenceExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
cmhttp.httpBindingMessageReferenceExtension(http);
SOAPBindingMessageReferenceExtensions soap = (SOAPBindingMessageReferenceExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapBindingMessageReferenceExtension(soap);
out.endElement();
@@ -608,7 +608,7 @@
cmbase.parent(component.getParent());
SOAPBindingFaultReferenceExtensions soap = (SOAPBindingFaultReferenceExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapBindingFaultReferenceExtension(soap);
out.endElement();
@@ -681,11 +681,11 @@
cmbase.parent(component.getParent());
HTTPEndpointExtensions http = (HTTPEndpointExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
cmhttp.httpEndpointExtension(http);
SOAPEndpointExtensions soap = (SOAPEndpointExtensions) component
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
cmsoap.soapEndpointExtension(soap);
out.endElement();
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/BaseWSDLReader.java Fri Dec 14 14:16:44 2007
@@ -1533,7 +1533,7 @@
try
{
- if (namespaceURI == null || namespaceURI.equals(Constants.NS_URI_WSDL20))
+ if (namespaceURI == null || namespaceURI.equals(Constants.NS_STRING_WSDL20))
{
getErrorReporter().reportError(
new ErrorLocatorImpl(), //TODO line&col nos.
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMWSDLReader.java Fri Dec 14 14:16:44 2007
@@ -458,10 +458,10 @@
QName attrType = new QName(namespaceURI, localName, (prefix != null ? prefix : ""));
String attrValue = domAttr.getValue();
- if (namespaceURI != null && !namespaceURI.equals(Constants.NS_URI_WSDL20))
+ if (namespaceURI != null && !namespaceURI.equals(Constants.NS_STRING_WSDL20))
{
- if (!namespaceURI.equals(Constants.NS_URI_XMLNS) &&
- !namespaceURI.equals(Constants.NS_URI_XSI)) //TODO handle xsi attrs elsewhere, without need to register
+ if (!namespaceURI.equals(Constants.NS_STRING_XMLNS) &&
+ !namespaceURI.equals(Constants.NS_STRING_XSI)) //TODO handle xsi attrs elsewhere, without need to register
{
//TODO reg namespaces at appropriate element scope, not just at desc.
//DOMUtils.registerUniquePrefix(prefix, namespaceURI, desc);
@@ -518,7 +518,7 @@
String localPart = attr.getLocalName();
String value = attr.getValue();
- if ((Constants.NS_URI_XMLNS).equals(namespaceURI))
+ if ((Constants.NS_STRING_XMLNS).equals(namespaceURI))
{
if (!(Constants.ATTR_XMLNS).equals(localPart))
{
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/DOMXMLElement.java Fri Dec 14 14:16:44 2007
@@ -244,7 +244,7 @@
String namespaceURI = (prefix == null)
? getAttribute (tempEl, Constants.ATTR_XMLNS)
- : getAttributeNS (tempEl, Constants.NS_URI_XMLNS, prefix);
+ : getAttributeNS (tempEl, Constants.NS_STRING_XMLNS, prefix);
if (namespaceURI != null)
{
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java Fri Dec 14 14:16:44 2007
@@ -386,12 +386,12 @@
* created, create one now.
*/
if (oper.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_EXTENSIONS) == null) {
+ ComponentExtensions.NS_URI_WSDL_EXTENSIONS) == null) {
ComponentExtensions compExt = createComponentExtensions(
InterfaceOperation.class, oper,
- ComponentExtensions.URI_NS_EXTENSIONS);
+ ComponentExtensions.NS_URI_WSDL_EXTENSIONS);
oper.setComponentExtensions(
- ComponentExtensions.URI_NS_EXTENSIONS, compExt);
+ ComponentExtensions.NS_URI_WSDL_EXTENSIONS, compExt);
}
/*
@@ -404,7 +404,7 @@
for(int i=0; i<style.length; i++)
{
URI temp = style[i];
- if(RPCConstants.URI_STYLE_RPC.equals(temp)) {
+ if(RPCConstants.STYLE_URI_RPC.equals(temp)) {
isRPCStyle = true;
break;
}
@@ -412,12 +412,12 @@
if(isRPCStyle) {
if (oper.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_RPC) == null) {
+ ComponentExtensions.NS_URI_RPC) == null) {
ComponentExtensions compExt = createComponentExtensions(
InterfaceOperation.class, oper,
- ComponentExtensions.URI_NS_RPC);
+ ComponentExtensions.NS_URI_RPC);
oper.setComponentExtensions(
- ComponentExtensions.URI_NS_RPC, compExt);
+ ComponentExtensions.NS_URI_RPC, compExt);
}
}
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/Constants.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/Constants.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/Constants.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/Constants.java Fri Dec 14 14:16:44 2007
@@ -29,14 +29,19 @@
*/
public class Constants
{
- // Namespace URIs.
- public static final String NS_URI_WSDL20 =
+ // Namespace Strings.
+ public static final String NS_STRING_WSDL20 =
"http://www.w3.org/ns/wsdl";
- public static final String NS_URI_XMLNS =
+ public static final String NS_STRING_XMLNS =
"http://www.w3.org/2000/xmlns/";
- public static final String NS_URI_XSI =
+ public static final String NS_STRING_XSI =
"http://www.w3.org/2001/XMLSchema-instance";
+ // Namespace URIs.
+ public static final URI NS_URI_WSDL20 = URI.create(NS_STRING_WSDL20);
+ public static final URI NS_URI_XMLNS = URI.create(NS_STRING_XMLNS);
+ public static final URI NS_URI_XSI = URI.create(NS_STRING_XSI);
+
// Top-level WSDL 2.0 element names.
public static final String ELEM_DESCRIPTION = "description";
public static final String ELEM_DOCUMENTATION = "documentation";
@@ -58,37 +63,37 @@
// Top-level WSDL 2.0 qualified element names.
public static final QName Q_ELEM_DESCRIPTION =
- new QName(NS_URI_WSDL20, ELEM_DESCRIPTION);
+ new QName(NS_STRING_WSDL20, ELEM_DESCRIPTION);
public static final QName Q_ELEM_DOCUMENTATION =
- new QName(NS_URI_WSDL20, ELEM_DOCUMENTATION);
+ new QName(NS_STRING_WSDL20, ELEM_DOCUMENTATION);
public static final QName Q_ELEM_IMPORT =
- new QName(NS_URI_WSDL20, ELEM_IMPORT);
+ new QName(NS_STRING_WSDL20, ELEM_IMPORT);
public static final QName Q_ELEM_INCLUDE =
- new QName(NS_URI_WSDL20, ELEM_INCLUDE);
+ new QName(NS_STRING_WSDL20, ELEM_INCLUDE);
public static final QName Q_ELEM_TYPES =
- new QName(NS_URI_WSDL20, ELEM_TYPES);
+ new QName(NS_STRING_WSDL20, ELEM_TYPES);
public static final QName Q_ELEM_INTERFACE =
- new QName(NS_URI_WSDL20, ELEM_INTERFACE);
+ new QName(NS_STRING_WSDL20, ELEM_INTERFACE);
public static final QName Q_ELEM_BINDING =
- new QName(NS_URI_WSDL20, ELEM_BINDING);
+ new QName(NS_STRING_WSDL20, ELEM_BINDING);
public static final QName Q_ELEM_SERVICE =
- new QName(NS_URI_WSDL20, ELEM_SERVICE);
+ new QName(NS_STRING_WSDL20, ELEM_SERVICE);
// Nested WSDL 2.0 qualified element names.
public static final QName Q_ELEM_FAULT =
- new QName(NS_URI_WSDL20, ELEM_FAULT);
+ new QName(NS_STRING_WSDL20, ELEM_FAULT);
public static final QName Q_ELEM_OPERATION =
- new QName(NS_URI_WSDL20, ELEM_OPERATION);
+ new QName(NS_STRING_WSDL20, ELEM_OPERATION);
public static final QName Q_ELEM_INPUT =
- new QName(NS_URI_WSDL20, ELEM_INPUT);
+ new QName(NS_STRING_WSDL20, ELEM_INPUT);
public static final QName Q_ELEM_OUTPUT =
- new QName(NS_URI_WSDL20, ELEM_OUTPUT);
+ new QName(NS_STRING_WSDL20, ELEM_OUTPUT);
public static final QName Q_ELEM_INFAULT =
- new QName(NS_URI_WSDL20, ELEM_INFAULT);
+ new QName(NS_STRING_WSDL20, ELEM_INFAULT);
public static final QName Q_ELEM_OUTFAULT =
- new QName(NS_URI_WSDL20, ELEM_OUTFAULT);
+ new QName(NS_STRING_WSDL20, ELEM_OUTFAULT);
public static final QName Q_ELEM_ENDPOINT =
- new QName(NS_URI_WSDL20, ELEM_ENDPOINT);
+ new QName(NS_STRING_WSDL20, ELEM_ENDPOINT);
// Attribute names.
public static final String ATTR_ID = "id";
@@ -141,64 +146,17 @@
"http://www.w3.org/2001/XMLSchema";
public static final String API_W3C_DOM =
"org.w3c.dom";
- public static final String API_W3C_XS =
- "http://www.w3.org/Submission/xmlschema-api/"; //XML Schema API implemented in Xerces
public static final String API_APACHE_WS_XS =
"org.apache.ws.commons.schema"; //Apache WS-Commons XmlSchema
- //TODO determine which lists are needed
- /*
- // Lists of native attribute names.
- public static final String[] PART_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_TYPE, ATTR_ELEMENT};
- public static final String[] BINDING_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_TYPE};
- public static final String[] BINDING_FAULT_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] BINDING_INPUT_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] BINDING_OPERATION_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] BINDING_OUTPUT_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] FAULT_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_MESSAGE};
- public static final String[] IMPORT_ATTR_NAMES =
- new String[]{ATTR_NAMESPACE, ATTR_LOCATION};
- public static final String[] INPUT_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_MESSAGE};
- public static final String[] MESSAGE_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] OPERATION_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_PARAMETER_ORDER};
- public static final String[] OUTPUT_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_MESSAGE};
- public static final String[] PORT_ATTR_NAMES =
- new String[]{ATTR_NAME, ATTR_BINDING};
- public static final String[] PORT_TYPE_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] SERVICE_ATTR_NAMES =
- new String[]{ATTR_NAME};
- public static final String[] TYPES_ATTR_NAMES =
- new String[]{};
- */
-
- //TODO determine if remaining constants are still required?
-
// Qualified attribute names.
public static final QName Q_ATTR_REQUIRED =
- new QName(NS_URI_WSDL20, ATTR_REQUIRED);
+ new QName(NS_STRING_WSDL20, ATTR_REQUIRED);
// XML Declaration string.
public static final String XML_DECL_DEFAULT = "UTF-8";
public static final String XML_DECL_START =
"<?xml version=\"1.0\" encoding=\"";
public static final String XML_DECL_END = "\"?>";
-
- // Feature names.
- // TODO org.apache and import optionality
- public static final String FEATURE_VERBOSE = "javax.wsdl.verbose";
- public static final String FEATURE_IMPORT_DOCUMENTS =
- "javax.wsdl.importDocuments";
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java Fri Dec 14 14:16:44 2007
@@ -16,6 +16,8 @@
*/
package org.apache.woden.internal.wsdl20.extensions;
+import java.net.URI;
+
import javax.xml.namespace.QName;
/**
@@ -25,10 +27,14 @@
*/
public class ExtensionConstants {
- // Namespace URI
+ // Namespace String
- public static final String NS_URI_WSDL_EXTENSIONS = "http://www.w3.org/ns/wsdl-extensions";
+ public static final String NS_STRING_WSDL_EXTENSIONS = "http://www.w3.org/ns/wsdl-extensions";
+ // Namespace URI
+
+ public static final URI NS_URI_WSDL_EXTENSIONS = URI.create(NS_STRING_WSDL_EXTENSIONS);
+
// Attribute name
public static final String ATTR_SAFE = "safe";
@@ -40,6 +46,6 @@
// Qualified attribute name
public static final QName Q_ATTR_SAFE = new QName(
- NS_URI_WSDL_EXTENSIONS, ATTR_SAFE, PFX_WSDL_EXTENSIONS);
+ NS_STRING_WSDL_EXTENSIONS, ATTR_SAFE, PFX_WSDL_EXTENSIONS);
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java Fri Dec 14 14:16:44 2007
@@ -107,7 +107,7 @@
// ------------ WSDL Component Extensions ------------
registerComponentExtension(InterfaceOperation.class,
- ComponentExtensions.URI_NS_EXTENSIONS,
+ ComponentExtensions.NS_URI_WSDL_EXTENSIONS,
InterfaceOperationExtensionsImpl.class);
// ------------ RPC extension attributes ------------
@@ -117,7 +117,7 @@
// ------------ RPC Component Extensions ------------
registerComponentExtension(InterfaceOperation.class,
- ComponentExtensions.URI_NS_RPC,
+ ComponentExtensions.NS_URI_RPC,
RPCInterfaceOperationExtensionsImpl.class);
// ------------ SOAP extension attributes ------------
@@ -199,27 +199,27 @@
// ------------ SOAP Component Extensions ------------
registerComponentExtension(Binding.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPBindingExtensionsImpl.class);
registerComponentExtension(BindingFault.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPBindingFaultExtensionsImpl.class);
registerComponentExtension(BindingOperation.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPBindingOperationExtensionsImpl.class);
registerComponentExtension(BindingMessageReference.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPBindingMessageReferenceExtensionsImpl.class);
registerComponentExtension(BindingFaultReference.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPBindingFaultReferenceExtensionsImpl.class);
registerComponentExtension(Endpoint.class,
- ComponentExtensions.URI_NS_SOAP,
+ ComponentExtensions.NS_URI_SOAP,
SOAPEndpointExtensionsImpl.class);
// ------------ HTTP extension attributes ------------
@@ -303,23 +303,23 @@
// ------------ HTTP Component Extensions ------------
registerComponentExtension(Binding.class,
- ComponentExtensions.URI_NS_HTTP,
+ ComponentExtensions.NS_URI_HTTP,
HTTPBindingExtensionsImpl.class);
registerComponentExtension(BindingFault.class,
- ComponentExtensions.URI_NS_HTTP,
+ ComponentExtensions.NS_URI_HTTP,
HTTPBindingFaultExtensionsImpl.class);
registerComponentExtension(BindingOperation.class,
- ComponentExtensions.URI_NS_HTTP,
+ ComponentExtensions.NS_URI_HTTP,
HTTPBindingOperationExtensionsImpl.class);
registerComponentExtension(BindingMessageReference.class,
- ComponentExtensions.URI_NS_HTTP,
+ ComponentExtensions.NS_URI_HTTP,
HTTPBindingMessageReferenceExtensionsImpl.class);
registerComponentExtension(Endpoint.class,
- ComponentExtensions.URI_NS_HTTP,
+ ComponentExtensions.NS_URI_HTTP,
HTTPEndpointExtensionsImpl.class);
//Register other, user-defined WSDL extensions.
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -249,8 +249,7 @@
.getInterfaceOperation();
if (intOper != null) {
InterfaceOperationExtensions intOperExts = (InterfaceOperationExtensions) intOper
- .getComponentExtensionsForNamespace(URI
- .create(ExtensionConstants.NS_URI_WSDL_EXTENSIONS));
+ .getComponentExtensionsForNamespace(ExtensionConstants.NS_URI_WSDL_EXTENSIONS);
if (intOperExts != null && intOperExts.isSafety()) {
return HTTPConstants.METHOD_GET;
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java Fri Dec 14 14:16:44 2007
@@ -25,10 +25,11 @@
*/
public class HTTPConstants
{
- // Namespace URIs.
+ // Namespace Strings.
public static final String NS_STRING_HTTP =
"http://www.w3.org/ns/wsdl/http";
+ // Namespace URIs.
public static final URI NS_URI_HTTP = URI.create(NS_STRING_HTTP);
// Element names.
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java Fri Dec 14 14:16:44 2007
@@ -28,14 +28,18 @@
*/
public class RPCConstants {
- // Namespace URI
+ // Namespace String
- public static final String NS_URI_RPC = "http://www.w3.org/ns/wsdl/rpc";
+ public static final String NS_STRING_RPC = "http://www.w3.org/ns/wsdl/rpc";
+ // Namespace URI
+
+ public static final URI NS_URI_RPC = URI.create(NS_STRING_RPC);
+
// Style URI
- public static final String STYLE_URI_RPC = "http://www.w3.org/ns/wsdl/style/rpc";
- public static final URI URI_STYLE_RPC = URI.create("http://www.w3.org/ns/wsdl/style/rpc");
+ public static final String STYLE_STRING_RPC = "http://www.w3.org/ns/wsdl/style/rpc";
+ public static final URI STYLE_URI_RPC = URI.create("http://www.w3.org/ns/wsdl/style/rpc");
// Attribute name
@@ -48,6 +52,6 @@
// Qualified attribute name
public static final QName Q_ATTR_RPC_SIGNATURE = new QName(
- NS_URI_RPC, ATTR_SIGNATURE, PFX_RPC);
+ NS_STRING_RPC, ATTR_SIGNATURE, PFX_RPC);
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -91,8 +91,8 @@
return null;
}
- if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr qpsDef = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT);
@@ -114,8 +114,8 @@
return null;
}
- if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
BooleanAttr cookiesUsed = (BooleanAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_COOKIES);
@@ -137,8 +137,8 @@
return null;
}
- if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -147,15 +147,15 @@
{
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
@@ -174,15 +174,15 @@
{
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return new HTTPHeader[0];
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
ExtensionElement[] extEls = ((WSDLElement)fParent)
.getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -77,15 +77,15 @@
BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
Binding binding = (Binding) bindingOp.getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
@@ -105,15 +105,15 @@
BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
Binding binding = (Binding) bindingOp.getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return new HTTPHeader[0];
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
ExtensionElement[] extEls = ((WSDLElement)fParent)
.getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -84,15 +84,15 @@
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr httpLoc = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_LOCATION);
@@ -113,15 +113,15 @@
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr separator = (StringAttr) ((WSDLElement) fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR);
@@ -142,15 +142,15 @@
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java Fri Dec 14 14:16:44 2007
@@ -16,6 +16,8 @@
*/
package org.apache.woden.internal.wsdl20.extensions.soap;
+import java.net.URI;
+
import javax.xml.namespace.QName;
/**
@@ -23,16 +25,23 @@
*/
public class SOAPConstants
{
- // Namespace URIs.
- public static final String NS_URI_SOAP =
+ // Namespace Strings.
+ public static final String NS_STRING_SOAP =
"http://www.w3.org/ns/wsdl/soap";
- // Protocol URIs.
- public static final String URI_SOAP12_HTTP =
+ // Namespace URIs.
+ public static final URI NS_URI_SOAP = URI.create(NS_STRING_SOAP);
+
+ // Protocol Strings.
+ public static final String PROTOCOL_STRING_SOAP12_HTTP =
"http://www.w3.org/2003/05/soap/bindings/HTTP/";
- public static final String URI_SOAP11_HTTP =
+ public static final String PROTOCOL_STRING_SOAP11_HTTP =
"http://www.w3.org/2006/01/soap11/bindings/HTTP/";
+ // Protocol URIs.
+ public static final URI PROTOCOL_URI_SOAP12_HTTP = URI.create(PROTOCOL_STRING_SOAP12_HTTP);
+ public static final URI PROTOCOL_URI_SOAP11_HTTP = URI.create(PROTOCOL_STRING_SOAP11_HTTP);
+
// Element names.
public static final String ELEM_MODULE = "module";
public static final String ELEM_HEADER = "header";
@@ -53,32 +62,32 @@
// Qualified element names.
public static final QName Q_ELEM_SOAP_MODULE =
- new QName(NS_URI_SOAP, ELEM_MODULE, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ELEM_MODULE, PFX_WSOAP);
public static final QName Q_ELEM_SOAP_HEADER =
- new QName(NS_URI_SOAP, ELEM_HEADER, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ELEM_HEADER, PFX_WSOAP);
// Qualified attribute names.
public static final QName Q_ATTR_SOAP_VERSION =
- new QName(NS_URI_SOAP, ATTR_VERSION, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_VERSION, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_PROTOCOL =
- new QName(NS_URI_SOAP, ATTR_PROTOCOL, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_PROTOCOL, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_MEPDEFAULT =
- new QName(NS_URI_SOAP, ATTR_MEPDEFAULT, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_MEPDEFAULT, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_CODE =
- new QName(NS_URI_SOAP, ATTR_CODE, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_CODE, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_SUBCODES =
- new QName(NS_URI_SOAP, ATTR_SUBCODES, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_SUBCODES, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_MEP =
- new QName(NS_URI_SOAP, ATTR_MEP, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_MEP, PFX_WSOAP);
public static final QName Q_ATTR_SOAP_ACTION =
- new QName(NS_URI_SOAP, ATTR_ACTION, PFX_WSOAP);
+ new QName(NS_STRING_SOAP, ATTR_ACTION, PFX_WSOAP);
}
Modified: incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java Fri Dec 14 14:16:44 2007
@@ -56,15 +56,15 @@
}
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
HTTPAuthenticationSchemeAttr scheme = (HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME);
@@ -90,15 +90,15 @@
}
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String version = soapBindExt.getSoapVersion();
URI protocol = soapBindExt.getSoapUnderlyingProtocol();
if(protocol == null) {
return null;
}
- if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
- ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP12_HTTP)) ||
+ ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.PROTOCOL_STRING_SOAP11_HTTP)) )
{
StringAttr realm = (StringAttr) ((WSDLElement) fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_REALM);
Modified: incubator/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java (original)
+++ incubator/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java Fri Dec 14 14:16:44 2007
@@ -44,10 +44,10 @@
/**
* Namespace URIs for extensions defined by WSDL 2.0 Specification.
*/
- public static final URI URI_NS_SOAP = URI.create("http://www.w3.org/ns/wsdl/soap");
- public static final URI URI_NS_HTTP = URI.create("http://www.w3.org/ns/wsdl/http");
- public static final URI URI_NS_RPC = URI.create("http://www.w3.org/ns/wsdl/rpc");
- public static final URI URI_NS_EXTENSIONS = URI.create("http://www.w3.org/ns/wsdl-extensions");
+ public static final URI NS_URI_SOAP = URI.create("http://www.w3.org/ns/wsdl/soap");
+ public static final URI NS_URI_HTTP = URI.create("http://www.w3.org/ns/wsdl/http");
+ public static final URI NS_URI_RPC = URI.create("http://www.w3.org/ns/wsdl/rpc");
+ public static final URI NS_URI_WSDL_EXTENSIONS = URI.create("http://www.w3.org/ns/wsdl-extensions");
/**
* @return the non-WSDL URI shared by this group of extension properties
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -78,7 +78,7 @@
{
Binding binding1 = fBindings[0];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding1
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The Binding '" + binding1.getName() + "' does not contain an HTTPBindingExtensions object.",
httpBindExts);
@@ -99,7 +99,7 @@
{
Binding binding1 = fBindings[0];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding1
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
String actual = httpBindExts.getHttpQueryParameterSeparatorDefault();
assertNotNull("The value for http query parameter separator default was null", actual);
@@ -118,7 +118,7 @@
//test that a whttp:cookies value "true" equates to Boolean(true)
Binding binding1 = fBindings[0];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding1
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertTrue("Expected 'true' for for http cookies.",
httpBindExts.isHttpCookies().booleanValue());
@@ -126,7 +126,7 @@
//test that a whttp:cookies value "false" equates to Boolean(false)
Binding binding3 = fBindings[2];
httpBindExts = (HTTPBindingExtensions)binding3
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertFalse("Expected 'false' for for http cookies.",
httpBindExts.isHttpCookies().booleanValue());
@@ -141,7 +141,7 @@
{
Binding binding1 = fBindings[0];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding1
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
String actual = httpBindExts.getHttpContentEncodingDefault();
assertEquals("Unexpected value for http content encoding default.",
@@ -171,7 +171,7 @@
{
Binding binding2 = fBindings[1];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding2
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The Binding '" +
binding2.getName() +
"' does not contain an HTTPBindingExtensions object.");
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -82,7 +82,7 @@
{
BindingFault bindFault = fBindFaults[0];
HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.",
httpBindFaultExts);
@@ -94,7 +94,7 @@
bindFault = fBindFaults[1];
httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.",
httpBindFaultExts);
@@ -113,7 +113,7 @@
{
BindingFault bindFault = fBindFaults[0];
HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
String actual = httpBindFaultExts.getHttpContentEncoding();
assertNotNull("The value for http transfer coding was null", actual);
@@ -141,7 +141,7 @@
{
BindingFault bindFault = fBindFaults[2];
HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.",
httpBindFaultExts);
@@ -185,7 +185,7 @@
{
BindingFault bindFault = fBindFaults[3];
HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault
- .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
+ .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP);
assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.",
httpBindFaultExts);
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -93,7 +93,7 @@
HTTPBindingMessageReferenceExtensions httpBindMsgRefExts =
(HTTPBindingMessageReferenceExtensions) inputMsg
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindMsgRefExts.getHttpContentEncoding();
assertEquals("Unexpected value for http content encoding.",
@@ -105,7 +105,7 @@
HTTPBindingMessageReferenceExtensions httpBindMsgRefExts2 =
(HTTPBindingMessageReferenceExtensions) outputMsg
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindMsgRefExts2.getHttpContentEncoding();
assertNull("Null was expected for http content encoding.",
@@ -132,7 +132,7 @@
HTTPBindingMessageReferenceExtensions httpBindMsgRefExts =
(HTTPBindingMessageReferenceExtensions) inputMsg
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPHeader[] actual = httpBindMsgRefExts.getHttpHeaders();
assertEquals("Unexpected size of {http headers}.",
@@ -144,7 +144,7 @@
HTTPBindingMessageReferenceExtensions httpBindMsgRefExts2 =
(HTTPBindingMessageReferenceExtensions) outputMsg
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPHeader[] actual2 = httpBindMsgRefExts2.getHttpHeaders();
assertEquals("Unexpected size of {http headers}.",
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -89,7 +89,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String expected = "http://ws.apache.woden/location";
HTTPLocation httpLoc = httpBindOperExts.getHttpLocation();
@@ -103,7 +103,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPLocation actual2 = httpBindOperExts2.getHttpLocation();
assertNull("Http location did not default to null", actual2);
@@ -126,7 +126,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
Boolean actual = httpBindOperExts.isHttpLocationIgnoreUncited();
assertTrue("Http location ignore uncited was not True",
@@ -137,7 +137,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
Boolean actual2 = httpBindOperExts2.isHttpLocationIgnoreUncited();
assertFalse("Http location ignore uncited did not default to False",
@@ -165,7 +165,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpMethod();
assertEquals("Unexpected value for http method.",
@@ -177,7 +177,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpMethod();
assertNull("Http method was not null by default.",
@@ -220,7 +220,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpInputSerialization();
assertEquals("Unexpected value for http input serialization.",
@@ -233,7 +233,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -246,7 +246,7 @@
HTTPBindingOperationExtensions httpBindOperExts3 =
(HTTPBindingOperationExtensions) oper3
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual3 = httpBindOperExts3.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -259,7 +259,7 @@
HTTPBindingOperationExtensions httpBindOperExts4 =
(HTTPBindingOperationExtensions) oper4
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual4 = httpBindOperExts4.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -272,7 +272,7 @@
HTTPBindingOperationExtensions httpBindOperExts5 =
(HTTPBindingOperationExtensions) oper5
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual5 = httpBindOperExts5.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -285,7 +285,7 @@
HTTPBindingOperationExtensions httpBindOperExts6 =
(HTTPBindingOperationExtensions) oper6
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual6 = httpBindOperExts6.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -298,7 +298,7 @@
HTTPBindingOperationExtensions httpBindOperExts7 =
(HTTPBindingOperationExtensions) oper7
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual7 = httpBindOperExts7.getHttpInputSerialization();
assertEquals("Unexpected default value for http input serialization.",
@@ -324,7 +324,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpOutputSerialization();
assertEquals("Unexpected value for http output serialization.",
@@ -336,7 +336,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpOutputSerialization();
assertEquals("Unexpected default value for http output serialization.",
@@ -361,7 +361,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpFaultSerialization();
assertEquals("Unexpected value for http fault serialization.",
@@ -373,7 +373,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpFaultSerialization();
assertEquals("Unexpected default value for http fault serialization.",
@@ -398,7 +398,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpQueryParameterSeparator();
assertEquals("Unexpected value for http query parameter separator.",
@@ -410,7 +410,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpQueryParameterSeparator();
assertNull("Expected a null value for http query parameter separator.",
@@ -434,7 +434,7 @@
HTTPBindingOperationExtensions httpBindOperExts =
(HTTPBindingOperationExtensions) oper
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpBindOperExts.getHttpContentEncodingDefault();
assertEquals("Unexpected value for http content encoding default.",
@@ -446,7 +446,7 @@
HTTPBindingOperationExtensions httpBindOperExts2 =
(HTTPBindingOperationExtensions) oper2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual2 = httpBindOperExts2.getHttpContentEncodingDefault();
assertNull("Http content encoding default did not default to null.",
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -94,7 +94,7 @@
HTTPEndpointExtensions httpEndpointExts =
(HTTPEndpointExtensions) endpoint
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPAuthenticationScheme actual = httpEndpointExts.getHttpAuthenticationScheme();
assertEquals("Unexpected value for http authentication scheme.",
@@ -106,7 +106,7 @@
HTTPEndpointExtensions httpEndpointExts2 =
(HTTPEndpointExtensions) endpoint2
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPAuthenticationScheme actual2 = httpEndpointExts2.getHttpAuthenticationScheme();
assertEquals("Unexpected value for http authentication scheme.",
@@ -118,7 +118,7 @@
HTTPEndpointExtensions httpEndpointExts3 =
(HTTPEndpointExtensions) endpoint3
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
HTTPAuthenticationScheme actual3 = httpEndpointExts3.getHttpAuthenticationScheme();
assertNull("Http authentication scheme did not default to null.",
@@ -139,7 +139,7 @@
HTTPEndpointExtensions httpEndpointExts =
(HTTPEndpointExtensions) endpoint
.getComponentExtensionsForNamespace(
- ComponentExtensions.URI_NS_HTTP);
+ ComponentExtensions.NS_URI_HTTP);
String actual = httpEndpointExts.getHttpAuthenticationRealm();
assertEquals("Unexpected value for http authentication realm.",
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -69,13 +69,13 @@
Binding binding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", binding);
- fSoapBindExts = (SOAPBindingExtensions)binding.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ fSoapBindExts = (SOAPBindingExtensions)binding.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
assertNotNull("The Binding does not contain a SOAPBindingExtensions object.");
Binding binding2 = descComp.getBindings()[1];
assertNotNull("The Description does not contain a second Binding.", binding2);
- fSoapBind2Exts = (SOAPBindingExtensions)binding2.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ fSoapBind2Exts = (SOAPBindingExtensions)binding2.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
assertNotNull("The second Binding does not contain a SOAPBindingExtensions object.");
}
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -92,7 +92,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[0];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode);
@@ -110,7 +110,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[1];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode);
@@ -128,7 +128,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[2];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode);
@@ -145,7 +145,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[0];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes);
@@ -166,7 +166,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[1];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes);
@@ -184,7 +184,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[2];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes();
assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes);
@@ -201,7 +201,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[1];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindFaultExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 3, actual.length);
}
@@ -214,7 +214,7 @@
{
BindingFault bindFault = fBinding.getBindingFaults()[2];
SOAPBindingFaultExtensions soapBindFaultExts =
- (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPHeaderBlock[] actual = soapBindFaultExts.getSoapHeaders();
assertEquals("Unexpected number of SOAPHeaderBlock objects.", 2, actual.length);
}
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -100,7 +100,7 @@
assertTrue("The BindingFaultReference does not represent an <infault> element.", Direction.IN.equals(direction));
SOAPBindingFaultReferenceExtensions soapBindFaultRefExts =
- (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindFaultRefExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 2, actual.length);
}
@@ -119,7 +119,7 @@
assertTrue("The BindingFaultReference does not represent an <outfault> element.", Direction.OUT.equals(direction));
SOAPBindingFaultReferenceExtensions soapBindFaultRefExts =
- (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindFaultRefExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length);
}
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -100,7 +100,7 @@
assertTrue("The BindingMessageReference does not represent an <input> element.", Direction.IN.equals(direction));
SOAPBindingMessageReferenceExtensions soapBindMsgRefExts =
- (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindMsgRefExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 2, actual.length);
}
@@ -119,7 +119,7 @@
assertTrue("The BindingMessageReference does not represent an <output> element.", Direction.OUT.equals(direction));
SOAPBindingMessageReferenceExtensions soapBindMsgRefExts =
- (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindMsgRefExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length);
}
@@ -134,7 +134,7 @@
assertNotNull("The BindingOperation does not contain a BindingMessageReference.", bindMsgRef);
SOAPBindingMessageReferenceExtensions soapBindMsgRefExts =
- (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPHeaderBlock[] actual = soapBindMsgRefExts.getSoapHeaders();
assertEquals("Unexpected number of SOAPHeaderBlock objects.", 2, actual.length);
}
@@ -149,7 +149,7 @@
assertNotNull("The BindingOperation does not contain the expected BindingMessageReference.", bindMsgRef);
SOAPBindingMessageReferenceExtensions soapBindMsgRefExts =
- (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPHeaderBlock[] actual = soapBindMsgRefExts.getSoapHeaders();
assertEquals("Unexpected number of SOAPHeaderBlock objects.", 1, actual.length);
}
Modified: incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java?rev=604313&r1=604312&r2=604313&view=diff
==============================================================================
--- incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java (original)
+++ incubator/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java Fri Dec 14 14:16:44 2007
@@ -97,7 +97,7 @@
public void testGetSoapMep()
{
SOAPBindingOperationExtensions soapBindOperExts =
- (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
URI soapMep = soapBindOperExts.getSoapMep();
assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap mep}.", soapMep);
@@ -111,7 +111,7 @@
public void testGetSoapAction()
{
SOAPBindingOperationExtensions soapBindOperExts =
- (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
URI soapAction = soapBindOperExts.getSoapAction();
assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap action}.", soapAction);
@@ -125,7 +125,7 @@
public void testGetSoapModules()
{
SOAPBindingOperationExtensions soapBindOperExts =
- (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
SOAPModule[] actual = soapBindOperExts.getSoapModules();
assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length);
}
@@ -138,14 +138,14 @@
public void testGetHttpQueryParameterSeparator()
{
SOAPBindingOperationExtensions soapBindOperExts =
- (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String actual = soapBindOperExts.getHttpQueryParameterSeparator();
assertNotNull("The SOAPBindingOperationExtensions did not return a value for {http query parameter separator}.", actual);
assertEquals("Unexpected value for http query parameter separator.", "$", actual);
SOAPBindingOperationExtensions soapBind2OperExts =
- (SOAPBindingOperationExtensions) fBind2Oper.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ (SOAPBindingOperationExtensions) fBind2Oper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP);
String actual2 = soapBind2OperExts.getHttpQueryParameterSeparator();
assertNull("Non-null value for http query parameter separator.", actual2);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org