Author: jkaputin
Date: Thu Oct 27 22:08:50 2005
New Revision: 329105
URL: http://svn.apache.org/viewcvs?rev=329105&view=rev
Log:
Changed String URIs to java.net.URI to be consistent
across the API and Impl (discussion still pending re
jre 1.3 support). Also, added new message WSDL506
for bad uri strings.
Modified:
incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/java/src/org/apache/woden/internal/Messages.properties
incubator/woden/java/src/org/apache/woden/internal/util/dom/DOMUtils.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/Feature.java
incubator/woden/java/src/org/apache/woden/wsdl20/Property.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
Modified: incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java Thu
Oct 27 22:08:50 2005
@@ -17,6 +17,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Hashtable;
import java.util.Iterator;
@@ -137,7 +139,7 @@
DescriptionElement desc =
((DOMWSDLFactory)getFactory()).newDescription();
- desc.setDocumentBaseURI(documentBaseURI);
+ desc.setDocumentBaseURI(getURI(documentBaseURI));
//TODO set extension registry here or let factory set it in
newDescription?
@@ -147,7 +149,7 @@
if(targetNamespace != null)
{
- desc.setTargetNamespace(targetNamespace);
+ desc.setTargetNamespace(getURI(targetNamespace));
}
else
{
@@ -177,11 +179,11 @@
{
if (!(Constants.ATTR_XMLNS).equals(localPart))
{
- desc.addNamespace(localPart, value); //a prefixed namespace
+ desc.addNamespace(localPart, getURI(value)); //a prefixed
namespace
}
else
{
- desc.addNamespace(null, value); //the default namespace
+ desc.addNamespace(null, getURI(value)); //the default
namespace
}
}
}
@@ -226,12 +228,15 @@
private FeatureElement parseFeature(Element featEl,
DescriptionElement desc)
+ throws WSDLException
{
FeatureElement feature = desc.createFeatureElement();
- //ref is of type xs:AnyURI, so store as a String
- feature.setRef(DOMUtils.getAttribute(featEl, Constants.ATTR_REF));
- //TODO ref is required, so terminate if validation=false and
continue-on-error=false.
+ String ref = DOMUtils.getAttribute(featEl, Constants.ATTR_REF);
+ if(ref != null)
+ {
+ feature.setRef(getURI(ref));
+ }
String req = DOMUtils.getAttribute(featEl, Constants.ATTR_REQUIRED);
feature.setRequired(Constants.VALUE_TRUE.equals(req) ? true : false);
@@ -285,7 +290,7 @@
if(name != null)
{
- QName qname = QNameUtils.newQName(desc.getTargetNamespace(),
+ QName qname =
QNameUtils.newQName(desc.getTargetNamespace().toString(),
name);
intface.setName(qname);
}
@@ -295,15 +300,16 @@
//TODO terminate if validation=false and continue-on-error=false.
}
- //Parse the styleDefaults attribute
String styleDefault = DOMUtils.getAttribute(interfaceEl,
Constants.ATTR_STYLE_DEFAULT);
if(styleDefault != null)
{
- List styleURIs = StringUtils.parseNMTokens(styleDefault);
- Iterator it = styleURIs.iterator();
+ List stringList = StringUtils.parseNMTokens(styleDefault);
+ String uriString = null;
+ Iterator it = stringList.iterator();
while(it.hasNext())
{
- intface.addStyleDefault((String)it.next());
+ uriString = (String)it.next();
+ intface.addStyleDefaultURI(getURI(uriString));
}
}
@@ -371,7 +377,7 @@
if(name != null)
{
- QName qname = QNameUtils.newQName(desc.getTargetNamespace(), name);
+ QName qname =
QNameUtils.newQName(desc.getTargetNamespace().toString(), name);
fault.setName(qname);
}
else
@@ -434,7 +440,7 @@
if(name != null)
{
- QName qname = QNameUtils.newQName(desc.getTargetNamespace(), name);
+ QName qname =
QNameUtils.newQName(desc.getTargetNamespace().toString(), name);
oper.setName(qname);
}
else
@@ -443,18 +449,20 @@
//TODO terminate if validation=false and continue-on-error=false.
}
- //Parse the styleDefaults attribute
String style = DOMUtils.getAttribute(operEl, Constants.ATTR_STYLE);
if(style != null)
{
- List styleURIs = StringUtils.parseNMTokens(style);
- Iterator it = styleURIs.iterator();
+ List stringList = StringUtils.parseNMTokens(style);
+ String uriString = null;
+ Iterator it = stringList.iterator();
while(it.hasNext())
{
- oper.addStyle((String)it.next());
+ uriString = (String)it.next();
+ oper.addStyleURI(getURI(uriString));
}
}
+
//TODO pattern attribute
//TODO extension attributes
//TODO complete the parsing of interface operation
@@ -493,9 +501,11 @@
{
PropertyElement property = desc.createPropertyElement();
- //ref is of type xs:AnyURI, so store as a String
- property.setRef(DOMUtils.getAttribute(propEl, Constants.ATTR_REF));
- //TODO ref is required, so terminate if validation=false and
continue-on-error=false.
+ String ref = DOMUtils.getAttribute(propEl, Constants.ATTR_REF);
+ if(ref != null)
+ {
+ property.setRef(getURI(ref));
+ }
//TODO extension attributes
@@ -650,16 +660,17 @@
try
{
- String contextURI = desc.getDocumentBaseURI();
+ String contextURI = desc.getDocumentBaseURI().toString();
URL contextURL = (contextURI != null) ?
StringUtils.getURL(null, contextURI) : null;
- url = StringUtils.getURL(contextURL,
schemaImport.getSchemaLocation());
+ url = StringUtils.getURL(contextURL,
+
schemaImport.getSchemaLocation().toString());
} catch (MalformedURLException e) {
- String locURI = schemaImport.getSchemaLocation();
+ String locURI = schemaImport.getSchemaLocation().toString();
String baseURI = desc.getDocumentBaseURI() != null ?
- desc.getDocumentBaseURI() : "null";
+ desc.getDocumentBaseURI().toString() : "null";
getErrorReporter().reportError(
new ErrorLocatorImpl(), //TODO line&col nos.
@@ -860,6 +871,30 @@
//TODO - potentially returns null. correct after deciding how
//to handle exceptions (e.g. return inside try block).
return doc;
+ }
+
+ /*
+ * Convert a string of type xs:anyURI to a java.net.URI.
+ * An empty string argument will return an empty string URI.
+ * A null argument will return a null.
+ */
+ private URI getURI(String anyURI) throws WSDLException
+ {
+ URI uri = null;
+ if(anyURI != null)
+ {
+ try {
+ uri = new URI(anyURI);
+ } catch (URISyntaxException e) {
+ getErrorReporter().reportError(
+ new ErrorLocatorImpl(), //TODO line&col nos.
+ "WSDL506",
+ new Object[] {anyURI},
+ ErrorReporter.SEVERITY_ERROR,
+ e);
+ }
+ }
+ return uri;
}
}
Modified: incubator/woden/java/src/org/apache/woden/internal/Messages.properties
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/Messages.properties?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/Messages.properties
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/Messages.properties Thu
Oct 27 22:08:50 2005
@@ -61,6 +61,7 @@
WSDL503=An XML schema is missing its target namespace attribute. Schema id is
"{0}".
WSDL504=Problem creating a QName from the string "{0}" in element "{1}".
WSDL505=The "{0}" attribute is missing from a "{1}" element.
+WSDL506=Could not create a URI from the string "{0}".
Modified:
incubator/woden/java/src/org/apache/woden/internal/util/dom/DOMUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/util/dom/DOMUtils.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/util/dom/DOMUtils.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/util/dom/DOMUtils.java
Thu Oct 27 22:08:50 2005
@@ -15,13 +15,18 @@
*/
package org.apache.woden.internal.util.dom;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.List;
import java.util.ListIterator;
import java.util.Vector;
import javax.xml.namespace.QName;
+import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
+import org.apache.woden.internal.ErrorLocatorImpl;
+import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.w3c.dom.Attr;
import org.w3c.dom.CharacterData;
@@ -337,8 +342,10 @@
public static void registerUniquePrefix(String prefix,
String namespaceURI,
DescriptionElement desc)
+ throws WSDLException
{
- String tempNSUri = desc.getNamespace(prefix);
+ URI nsUri = desc.getNamespace(prefix);
+ String tempNSUri = nsUri != null ? nsUri.toString() : null;
if (tempNSUri != null && tempNSUri.equals(namespaceURI))
{
@@ -348,10 +355,24 @@
while (tempNSUri != null && !tempNSUri.equals(namespaceURI))
{
prefix += "_";
- tempNSUri = desc.getNamespace(prefix);
+ nsUri = desc.getNamespace(prefix);
+ tempNSUri = nsUri != null ? nsUri.toString() : null;
+ }
+
+ URI uri = null;
+ try {
+ uri = new URI(namespaceURI);
+ } catch (URISyntaxException e) {
+ //TODO make sure custom err handler is used, if configured
+ new ErrorReporterImpl().reportError(
+ new ErrorLocatorImpl(), //TODO line&col nos.
+ "WSDL506",
+ new Object[] {namespaceURI},
+ ErrorReporter.SEVERITY_ERROR,
+ e);
}
- desc.addNamespace(prefix, namespaceURI);
+ desc.addNamespace(prefix, uri);
}
/**
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal.wsdl20;
+import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,9 +52,9 @@
*/
public class DescriptionElementImpl implements DescriptionElement {
- private String fDocumentBaseURI = null;
+ private URI fDocumentBaseURI = null;
- private String fTargetNamespace = null;
+ private URI fTargetNamespace = null;
private Map fNamespaces = new HashMap();
private List fDocumentationElements = new Vector();
@@ -71,27 +72,27 @@
* Attribute accessor and modifier methods
* *******************************************/
- public void setDocumentBaseURI(String documentBaseURI)
+ public void setDocumentBaseURI(URI documentBaseURI)
{
fDocumentBaseURI = documentBaseURI;
}
- public String getDocumentBaseURI()
+ public URI getDocumentBaseURI()
{
return fDocumentBaseURI;
}
- public void setTargetNamespace(String namespace)
+ public void setTargetNamespace(URI namespace)
{
fTargetNamespace = namespace;
}
- public String getTargetNamespace()
+ public URI getTargetNamespace()
{
return fTargetNamespace;
}
- public void addNamespace(String prefix, String namespace)
+ public void addNamespace(String prefix, URI namespace)
{
//ignores duplicate prefixes in the WSDL - earlier namespace gets
overwritten.
@@ -114,11 +115,11 @@
fNamespaces.remove(pfx);
}
- public String getNamespace(String prefix)
+ public URI getNamespace(String prefix)
{
String pfx = (prefix != null) ? prefix : "";
- return (String) fNamespaces.get(pfx);
+ return (URI) fNamespaces.get(pfx);
}
public Map getNamespaces()
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal.wsdl20;
+import java.net.URI;
import java.util.List;
import java.util.Vector;
@@ -31,14 +32,14 @@
*/
public class FeatureImpl implements Feature, FeatureElement {
- private String fRef = null;
+ private URI fRef = null;
private boolean fRequired = false;
private List fDocumentationElements = new Vector();
/*
- * @see org.apache.woden.wsdl20.xml.FeatureElement#setRef(String)
+ * @see org.apache.woden.wsdl20.xml.FeatureElement#setRef(URI)
*/
- public void setRef(String ref)
+ public void setRef(URI ref)
{
fRef = ref;
}
@@ -47,7 +48,7 @@
* @see org.apache.woden.wsdl20.Feature#getRef()
* @see org.apache.woden.wsdl20.xml.FeatureElement#getRef()
*/
- public String getRef()
+ public URI getRef()
{
return fRef;
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal.wsdl20;
+import java.net.URI;
import java.util.List;
import java.util.Vector;
@@ -26,9 +27,9 @@
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.Property;
import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
+import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
import org.apache.woden.wsdl20.xml.PropertyElement;
@@ -45,7 +46,7 @@
*/
private QName fName = null;
private List fExtendsQNames = new Vector();
- private List fStyleDefaults = new Vector();
+ private List fStyleDefault = new Vector();
private List fDocumentationElements = new Vector();
private List fInterfaceFaultElements = new Vector();
@@ -87,21 +88,21 @@
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceElement#addStyleDefault(String)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceElement#addStyleDefaultURI(URI)
*/
- public void addStyleDefault(String uri)
+ public void addStyleDefaultURI(URI uri)
{
- fStyleDefaults.add(uri);
+ fStyleDefault.add(uri);
}
/*
- * @see org.apache.woden.wsdl20.xml.InterfaceElement#getStyleDefaults()
+ * @see org.apache.woden.wsdl20.xml.InterfaceElement#getStyleDefault()
*/
- public String[] getStyleDefaults()
+ public URI[] getStyleDefault()
{
- return (String[])fStyleDefaults.toArray();
+ return (URI[])fStyleDefault.toArray();
}
-
+
/*
* @see org.apache.woden.wsdl20.xml.InterfaceElement#addExtendsQName(QName)
*/
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
Thu Oct 27 22:08:50 2005
@@ -55,8 +55,6 @@
private Interface fParent = null;
//XML data
- private String fPattern = null;
- private String[] fStyles = null;
private List fInputs = new Vector();
private List fOutputs = new Vector();
private List fInfaults = new Vector();
@@ -105,10 +103,11 @@
/* (non-Javadoc)
* @see org.apache.woden.wsdl20.InterfaceOperation#getStyle()
+ * @see org.apache.woden.wsdl20.xml.InterfaceOperationElement#getStyle()
*/
- public URI[] getStyle() {
- // TODO Auto-generated method stub
- return null;
+ public URI[] getStyle()
+ {
+ return (URI[])fStyle.toArray();
}
/* (non-Javadoc)
@@ -148,43 +147,35 @@
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#setPattern(String)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#setPattern(URI)
*/
- public void setPattern(String mep)
+ public void setPattern(URI uri)
{
- fPattern = mep;
+ fMessageExchangePattern = uri;
}
/*
* @see org.apache.woden.wsdl20.xml.InterfaceOperationElement#getPattern()
*/
- public String getPattern()
+ public URI getPattern()
{
- return fPattern;
+ return fMessageExchangePattern;
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addStyle(String)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addStyleURI(URI)
*/
- public void addStyle(String uri)
+ public void addStyleURI(URI uri)
{
fStyle.add(uri);
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeStyle(String)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeStyleURI(URI)
*/
- public void removeStyle(String uri)
+ public void removeStyleURI(URI uri)
{
fStyle.remove(uri);
- }
-
- /*
- * @see org.apache.woden.wsdl20.xml.InterfaceOperationElement#getStyles()
- */
- public String[] getStyles()
- {
- return (String[])fStyle.toArray();
}
/*
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal.wsdl20;
+import java.net.URI;
import java.util.List;
import java.util.Vector;
@@ -34,7 +35,7 @@
*/
public class PropertyImpl implements Property, PropertyElement {
- private String fRef = null;
+ private URI fRef = null;
private List fDocumentationElements = new Vector();
private Object fValue = null; //TODO decide how to handle value contents
private QName fConstraint = null;
@@ -42,9 +43,9 @@
private boolean fHasValueToken = false; //true if <constraint>='#value'
/*
- * @see org.apache.woden.wsdl20.xml.PropertyElement#setRef(String)
+ * @see org.apache.woden.wsdl20.xml.PropertyElement#setRef(URI)
*/
- public void setRef(String ref)
+ public void setRef(URI ref)
{
fRef = ref;
}
@@ -53,7 +54,7 @@
* @see org.apache.woden.wsdl20.Property#getRef()
* @see org.apache.woden.wsdl20.xml.PropertyElement#getRef()
*/
- public String getRef()
+ public URI getRef()
{
return fRef;
}
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/Feature.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/Feature.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/Feature.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/Feature.java Thu Oct 27
22:08:50 2005
@@ -15,12 +15,14 @@
*/
package org.apache.woden.wsdl20;
+import java.net.URI;
+
/**
* @author [EMAIL PROTECTED]
*/
public interface Feature extends NestedComponent {
- public String getRef();
+ public URI getRef();
public boolean isRequired();
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/Property.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/Property.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/Property.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/Property.java Thu Oct 27
22:08:50 2005
@@ -15,12 +15,14 @@
*/
package org.apache.woden.wsdl20;
+import java.net.URI;
+
/**
* @author [EMAIL PROTECTED]
*/
public interface Property extends NestedComponent {
- public String getRef();
+ public URI getRef();
public TypeDefinition getValueConstraint();
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
(original)
+++
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
Thu Oct 27 22:08:50 2005
@@ -15,7 +15,9 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
import java.util.Map;
+
import org.apache.woden.wsdl20.Description;
/**
@@ -37,11 +39,11 @@
* Attributes and namespaces
*/
- public void setDocumentBaseURI(String documentBaseURI);
- public String getDocumentBaseURI();
+ public void setDocumentBaseURI(URI documentBaseURI);
+ public URI getDocumentBaseURI();
- public void setTargetNamespace(String namespace);
- public String getTargetNamespace();
+ public void setTargetNamespace(URI namespaceURI);
+ public URI getTargetNamespace();
/**
* This is a way to add a namespace association to a definition.
@@ -56,7 +58,7 @@
* @param namespaceURI the namespace URI to associate the prefix
* with. If you use null, the namespace association will be removed.
*/
- public void addNamespace(String prefix, String namespace);
+ public void addNamespace(String prefix, URI namespace);
public void removeNamespace(String prefix);
@@ -65,10 +67,10 @@
* there is no namespace URI associated with this prefix. This is
* unrelated to the <wsdl:import> element.
*
- * @see #addNamespace(String, String)
+ * @see #addNamespace(String, URI)
* @see #getPrefix(String)
*/
- public String getNamespace(String prefix);
+ public URI getNamespace(String prefix);
public Map getNamespaces();//TODO return arrays instead of Map?
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,8 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
+
/**
* Represents the <feature> element.
*
@@ -22,8 +24,8 @@
*/
public interface FeatureElement extends DocumentableElement
{
- public void setRef(String uri);
- public String getRef();
+ public void setRef(URI uri);
+ public URI getRef();
public void setRequired(boolean required);
public boolean isRequired();
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,8 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
+
import javax.xml.namespace.QName;
/**
@@ -34,13 +36,14 @@
public void setName(QName qname);
public QName getName();
+ //TODO change to store InterfaceElments instead of QNames?
public void addExtendsQName(QName qname);
public QName[] getExtendsQNames();
- //TODO remove method
+ //TODO add a remove method
- public void addStyleDefault(String uri);
- public String[] getStyleDefaults();
- //TODO remove method
+ public void addStyleDefaultURI(URI uri);
+ public URI[] getStyleDefault();
+ //TODO add a remove method
/*
* Elements
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
(original)
+++
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,8 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
+
import javax.xml.namespace.QName;
/**
@@ -35,12 +37,12 @@
public void setName(QName qname);
public QName getName();
- public void setPattern(String patternURI);
- public String getPattern();
+ public void setPattern(URI uri);
+ public URI getPattern();
- public void addStyle(String styleURI);
- public void removeStyle(String styleURI);
- public String[] getStyles();
+ public void addStyleURI(URI uri);
+ public void removeStyleURI(URI uri);
+ public URI[] getStyle();
/*
* Elements
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java?rev=329105&r1=329104&r2=329105&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
Thu Oct 27 22:08:50 2005
@@ -15,6 +15,8 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
+
import javax.xml.namespace.QName;
/**
@@ -33,8 +35,8 @@
*/
public interface PropertyElement extends DocumentableElement
{
- public void setRef(String uri);
- public String getRef();
+ public void setRef(URI uri);
+ public URI getRef();
public void setValue(Object o);
public Object getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
