Author: jkaputin
Date: Thu Oct 19 14:13:06 2006
New Revision: 465889
URL: http://svn.apache.org/viewvc?view=rev&rev=465889
Log:
Merged the WODEN-14 updates to Trunk (465571) into
the WODEN-44 branch.
Made minor corrections to OMSimpleURIResolverTest.
Added:
incubator/woden/branches/WODEN-44/LICENSE.wsdl2.html
- copied unchanged from r465672,
incubator/woden/trunk/java/LICENSE.wsdl2.html
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/resolver/
- copied from r465672,
incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/resolver/EntityResolverAdapter.java
- copied unchanged from r465672,
incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/EntityResolverAdapter.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/resolver/SchemaResolverAdapter.java
- copied unchanged from r465672,
incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SchemaResolverAdapter.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
- copied unchanged from r465672,
incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/resolver/
- copied from r465672,
incubator/woden/trunk/java/src/org/apache/woden/resolver/
incubator/woden/branches/WODEN-44/src/org/apache/woden/resolver/URIResolver.java
- copied unchanged from r465672,
incubator/woden/trunk/java/src/org/apache/woden/resolver/URIResolver.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/
- copied from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
- copied, changed from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/SimpleURIResolverTest.java
- copied, changed from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/
- copied from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/XMLSchema.dtd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/XMLSchema.dtd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/XMLSchema.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/XMLSchema.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/binding.wsdl
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/datatypes.dtd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/datatypes.dtd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/interface.wsdl
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/schemaImport.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/schemaImport.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/schemaInclude.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/schemaInclude.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/simpleresolver.catalog
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/simpleresolver.catalog
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/woden14.wsdl
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20-extensions.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-extensions.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20-instance.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-instance.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20-rpc.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-rpc.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20-soap.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-soap.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/wsdl20.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20.xsd
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/resources/xml.xsd
- copied unchanged from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/xml.xsd
Modified:
incubator/woden/branches/WODEN-44/build.xml
incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-44/test/javax/xml/namespace/QNameTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsOM.java
Modified: incubator/woden/branches/WODEN-44/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/build.xml?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
--- incubator/woden/branches/WODEN-44/build.xml (original)
+++ incubator/woden/branches/WODEN-44/build.xml Thu Oct 19 14:13:06 2006
@@ -487,6 +487,7 @@
<include name="LICENSE.dom" />
<include name="LICENSE.sax" />
<include name="LICENSE.xerces" />
+ <include name="LICENSE.wsdl2.html" />
<include name="NOTICE" />
<include name="README" />
<include name="release-notes.html" />
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
(original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java Thu
Oct 19 14:13:06 2006
@@ -15,6 +15,7 @@
*/
package org.apache.woden;
+import org.apache.woden.resolver.URIResolver;
import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
import org.apache.woden.wsdl20.xml.DescriptionElement;
@@ -268,4 +269,18 @@
*/
public Object getProperty(String name);
+ /**
+ * Sets the URI resolver to be used.
+ *
+ * @param resolver
+ */
+ public void setURIResolver(URIResolver resolver);
+
+ /**
+ * Gets the URI Resolver currently in use
+ * @return
+ */
+ public URIResolver getURIResolver();
+
+
}
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
Thu Oct 19 14:13:06 2006
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal;
+import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -24,14 +25,17 @@
import javax.xml.namespace.QName;
-import org.apache.woden.XMLElement;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
+import org.apache.woden.XMLElement;
+import org.apache.woden.internal.resolver.SimpleURIResolver;
import org.apache.woden.internal.schema.SchemaConstants;
+import org.apache.woden.internal.util.PropertyUtils;
import org.apache.woden.internal.util.StringUtils;
import org.apache.woden.internal.wsdl20.Constants;
+import org.apache.woden.resolver.URIResolver;
import org.apache.woden.schema.Schema;
import org.apache.woden.types.NCName;
import org.apache.woden.wsdl20.enumeration.Direction;
@@ -76,17 +80,63 @@
* @author [EMAIL PROTECTED]
*/
public abstract class BaseWSDLReader implements WSDLReader {
+
+ private final String
DEFAULT_RESOLVER_PROPERTY="org.apache.woden.resolver.default";
private WSDLFactory fFactory;
private String fFactoryImplName = null;
private ErrorReporter fErrorReporter;
private ExtensionRegistry fExtReg;
+ private URIResolver fResolver = null;
protected ReaderFeatures features;
protected BaseWSDLReader() throws WSDLException {
fErrorReporter= new ErrorReporterImpl();
features = new ReaderFeatures();
+
+ /* Establish the default URIResolver.
+ *
+ * Find the class representing the default:
+ * Search for a property setting for the default URI resolver.
+ * The property can be set via:
+ * 1. JVM system properties (e.g. java -D arguments)
+ * use -Dorg.apache.woden.resolver.default=<fully
qualified class name> on the command line
+ * where RHS is the name of the chosen default URIResolver
implementation.
+ * 2. application properties defined in /META-INF/services (e.g. in a
jar file)
+ * (when implemented in PropertyUtils.findProperty(String p)...)
+ * 3. properties defined in a wsdl properties file located in
JAVAHOME/lib directory
+ */
+
+ String defaultURIResolver =
PropertyUtils.findProperty(DEFAULT_RESOLVER_PROPERTY);
+ if (defaultURIResolver == null)
+ {
+ // property not set (an allowable condition)
+ // use the "default default" URI resolver
+ fResolver = new SimpleURIResolver();
+ }
+ else
+ {
+ try
+ {
+ Class resolverClass = Class.forName(defaultURIResolver);
+ fResolver = (URIResolver) resolverClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ /*
+ Catches and wraps:
+ ClassNotFoundException
+ InstantiationException
+ IllegalAccessException
+ */
+
+ throw new WSDLException(WSDLException.CONFIGURATION_ERROR,
+ "Problem instantiating a URIResolver implementation " +
+ "using classname '" + defaultURIResolver + "' ",
+ e);
+ }
+ }
}
/* ************************************************************
@@ -456,9 +506,10 @@
if(locationURI != null)
{
//TODO handle missing locationURI (OPTIONAL attr)
- imp.setLocation(getURI(locationURI));
+ URI resolvedLocationURI = resolveURI(getURI(locationURI));
+ imp.setLocation(resolvedLocationURI);
DescriptionElement importedDesc =
- getWSDLFromLocation(locationURI, desc, wsdlModules);
+ getWSDLFromLocation(resolvedLocationURI.toString(), desc,
wsdlModules);
imp.setDescriptionElement(importedDesc);
}
@@ -479,9 +530,10 @@
if(locationURI != null)
{
- include.setLocation(getURI(locationURI));
+ URI resolvedLocationURI = resolveURI(getURI(locationURI));
+ include.setLocation(resolvedLocationURI);
DescriptionElement includedDesc =
- getWSDLFromLocation(locationURI, desc, wsdlModules);
+ getWSDLFromLocation(resolvedLocationURI.toString(), desc,
wsdlModules);
include.setDescriptionElement(includedDesc);
}
@@ -1676,4 +1728,68 @@
Map wsdlModules)
throws WSDLException;
+ /**
+ * Provides the capability of setting a supplied URI Resolver.
+ *
+ */
+ public void setURIResolver(URIResolver resolver) {
+ fResolver = resolver;
+ }
+
+ /*
+ * convenience method to call the URI resolver and handle common
exceptions.
+ * Unlike the actual Resolver, returns the original URI if no resolution
is
+ * available.
+ *
+ * TODO move to o.a.w.internal.util ?
+ */
+ protected URI resolveURI(URI uri) throws WSDLException {
+
+ if (uri != null) {
+ URI resolvedUri = null;
+ try {
+ resolvedUri = getURIResolver().resolveURI(uri);
+ } catch (IOException e) {
+ getErrorReporter().reportError(
+ new ErrorLocatorImpl(), //TODO line&col nos.
+ "WSDL524",
+ new Object[] {uri},
+ ErrorReporter.SEVERITY_ERROR,
+ e);
+ }
+ if (resolvedUri != null) {
+ uri = resolvedUri;
+ }
+ }
+
+ return uri;
+ }
+
+ /*
+ * Convenience method for resolving URI's to Strings
+ *
+ * @param uri
+ * @return
+ */
+ protected String resolveURI(String uri) {
+ String resolvedUri;
+ try {
+ resolvedUri = getURIResolver().resolveURI(new URI(uri)).toString();
+ } catch (Exception e) {
+ // revert to "default" behaviour
+ resolvedUri = uri;
+ }
+
+ return resolvedUri;
+ }
+
+
+ /**
+ * Find the current URI Resolver
+ */
+ public URIResolver getURIResolver() {
+ return fResolver;
+ }
+
+
}
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
Thu Oct 19 14:13:06 2006
@@ -31,6 +31,7 @@
import org.apache.woden.WSDLReader;
import org.apache.woden.WSDLSource;
import org.apache.woden.XMLElement;
+import org.apache.woden.internal.resolver.SchemaResolverAdapter;
import org.apache.woden.internal.schema.ImportedSchemaImpl;
import org.apache.woden.internal.schema.InlinedSchemaImpl;
import org.apache.woden.internal.schema.SchemaConstants;
@@ -273,6 +274,9 @@
try {
Element domSchemaEl = (Element)schemaEl.getSource();
XmlSchemaCollection xsc = new XmlSchemaCollection();
+
+ // Plug in the selected woden URI Resolver
+ xsc.setSchemaResolver(new
SchemaResolverAdapter(getURIResolver()));
schemaDef = xsc.read(domSchemaEl, baseURI);
}
catch (XmlSchemaException e)
@@ -403,6 +407,10 @@
try {
String baseLoc = contextURI != null ? contextURI.toString() :
null;
XmlSchemaCollection xsc = new XmlSchemaCollection();
+
+ // Plug in the selected woden URI Resolver
+ xsc.setSchemaResolver(new
SchemaResolverAdapter(getURIResolver()));
+
schemaDef = xsc.read(schemaEl, baseLoc);
fImportedSchemas.put(schemaURL, schemaDef);
}
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
Thu Oct 19 14:13:06 2006
@@ -75,6 +75,7 @@
WSDL521=Could not parse an inline schema in the WSDL at URL "{0}".
WSDL522=Could not parse a schema imported from URL "{0}".
WSDL523=The QName of an extension attribute must not be null.
+WSDL524=URI resolution failed on URI "{0}".
# ------------ TODO determine if these errors are needed -------------------
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Thu Oct 19 14:13:06 2006
@@ -33,6 +33,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.WSDLSource;
import org.apache.woden.XMLElement;
+import org.apache.woden.internal.resolver.SchemaResolverAdapter;
import org.apache.woden.internal.schema.ImportedSchemaImpl;
import org.apache.woden.internal.schema.InlinedSchemaImpl;
import org.apache.woden.internal.schema.SchemaConstants;
@@ -1096,6 +1097,10 @@
try {
XmlSchemaCollection xsc = new XmlSchemaCollection();
+
+ // Plug in the selected woden URI Resolver
+ xsc.setSchemaResolver(new
SchemaResolverAdapter(getURIResolver()));
+
schemaDef = xsc.read(schemaSource, null);
fImportedSchemas.put(schemaURL, schemaDef);
}
@@ -1143,6 +1148,10 @@
xsc.setBaseUri(baseURI);
NamespaceMap namespaces = new NamespaceMap(desc.getNamespaces());
xsc.setNamespaceContext(namespaces);
+
+ // Plug in the selected woden URI Resolver
+ xsc.setSchemaResolver(new SchemaResolverAdapter(getURIResolver()));
+
schemaDef = xsc.read(schemaSource, null);
}
catch (XmlSchemaException e){
Modified:
incubator/woden/branches/WODEN-44/test/javax/xml/namespace/QNameTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/javax/xml/namespace/QNameTest.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
--- incubator/woden/branches/WODEN-44/test/javax/xml/namespace/QNameTest.java
(original)
+++ incubator/woden/branches/WODEN-44/test/javax/xml/namespace/QNameTest.java
Thu Oct 19 14:13:06 2006
@@ -459,7 +459,7 @@
URL url =
getClass().getClassLoader().getResource("javax/xml/namespace/serialized_QName_no_prefix");
- File f = new File(url.getFile());
+ File f = new File(url.getFile().replaceAll("%20", " "));
ObjectInputStream ois =
new ObjectInputStream(new FileInputStream(f));
Copied:
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
(from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java)
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java?view=diff&rev=465889&p1=incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java&r1=465672&p2=incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java&r2=465889
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/OMSimpleURIResolverTest.java
Thu Oct 19 14:13:06 2006
@@ -104,7 +104,7 @@
// (cater for URL space char representation)
fCatalogPropValue = System.setProperty(fCatalogProperty,
catalogURL.getFile().replaceAll("%20", " "));
- WSDLFactory factory = OMWSDLFactory.newInstance();
+ WSDLFactory factory =
OMWSDLFactory.newInstance("org.apache.woden.internal.OMWSDLFactory");
WSDLReader reader = factory.newWSDLReader();
ErrorHandler handler = new TestErrorHandler();
reader.setFeature(WSDLReader.FEATURE_VALIDATION, true);
@@ -136,9 +136,9 @@
assertEquals("The Description should contain 1 Binding component.", 1,
fBindings.length);
assertEquals("The Description should contain 1 Interface component.",
1, fInterfaces.length);
- assertEquals("The Description should contain 1 imported schema.", 1,
fImportedSchemas.length);
+ assertEquals("The Description should contain no imported schemas.", 0,
fImportedSchemas.length); //Note, the OM impl does not automatically import the
schema for W3C XML Schema
assertEquals("The Description should contain 1 included (inlined)
schema.", 1, fInlinedSchemas.length);
- assertEquals("The Description should contain total of 2 imported &
inlined schema.", 2, fSchemas.length);
+ assertEquals("The Description should contain total of 1 imported &
inlined schema.", 1, fSchemas.length);
}
/**
Copied:
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/SimpleURIResolverTest.java
(from r465672,
incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java)
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/SimpleURIResolverTest.java?view=diff&rev=465889&p1=incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java&r1=465672&p2=incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/SimpleURIResolverTest.java&r2=465889
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/resolver/SimpleURIResolverTest.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/resolver/SimpleURIResolverTest.java
Thu Oct 19 14:13:06 2006
@@ -135,7 +135,7 @@
assertEquals("The Description should contain 1 Binding component.", 1,
fBindings.length);
assertEquals("The Description should contain 1 Interface component.",
1, fInterfaces.length);
- assertEquals("The Description should contain 1 imported schema.", 1,
fImportedSchemas.length);
+ assertEquals("The Description should contain 1 imported schema.", 1,
fImportedSchemas.length); //the schema for W3C XML Schema imported by the DOM
impl
assertEquals("The Description should contain 1 included (inlined)
schema.", 1, fInlinedSchemas.length);
assertEquals("The Description should contain total of 2 imported &
inlined schema.", 2, fSchemas.length);
}
Modified:
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
Thu Oct 19 14:13:06 2006
@@ -26,6 +26,7 @@
import org.apache.woden.internal.ReaderFeaturesTest;
import org.apache.woden.internal.wsdl20.validation.WSDLComponentValidatorTest;
import org.apache.woden.internal.wsdl20.validation.WSDLDocumentValidatorTest;
+import org.apache.woden.resolver.SimpleURIResolverTest;
import org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensionsTest;
import org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensionsTest;
import
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensionsTest;
@@ -99,6 +100,7 @@
addTest(HTTPBindingOperationExtensionsTest.suite());
addTest(HTTPBindingMessageReferenceExtensionsTest.suite());
addTest(HTTPEndpointExtensionsTest.suite());
+ addTest(SimpleURIResolverTest.suite());
//TODO in-progress 30May06 tests for BindingOpExt and BindingMsgRefExt
}
Modified:
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsOM.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsOM.java?view=diff&rev=465889&r1=465888&r2=465889
==============================================================================
---
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsOM.java
(original)
+++
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsOM.java
Thu Oct 19 14:13:06 2006
@@ -22,6 +22,7 @@
import org.apache.woden.OMWSDLFactoryTest;
import org.apache.woden.OMWSDLReaderTest;
+import org.apache.woden.resolver.OMSimpleURIResolverTest;
import org.apache.woden.wsdl20.xml.OMEndpointElementTest;
import org.apache.woden.wsdl20.xml.OMServiceElementTest;
@@ -61,6 +62,7 @@
addTest(OMW3CTestSuiteTest.suite());
addTest(OMServiceElementTest.suite());
addTest(OMEndpointElementTest.suite());
+ addTest(OMSimpleURIResolverTest.suite());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
