Author: gturrell
Date: Wed Feb 7 11:30:59 2007
New Revision: 504655
URL: http://svn.apache.org/viewvc?view=rev&rev=504655
Log:
*** Comment-fix only. Introductory usage notes and examples were out of date
and misleading for M7.
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/resolver/SimpleURIResolver.java?view=diff&rev=504655&r1=504654&r2=504655
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
Wed Feb 7 11:30:59 2007
@@ -36,11 +36,11 @@
import org.apache.woden.internal.util.PropertyUtils;
import org.apache.woden.resolver.URIResolver;
-/**
+/*
* A Simple URI Resolver.
*
* Locating the catalog file:
- * These alternatives, listed in search order, are:
+ * These alternatives, listed in search order, will be:
* 1. JVM system properties (e.g. java -D arguments)
* use
-Dorg.apache.woden.resolver.simpleresolver.catalog="<filespec>" on the command
line
* where <filespec> is the location of the simple resolver catalog
on the local file system.
@@ -52,27 +52,28 @@
*
* Catalog file format:
* This is as for Java Properties file format, with one entry for each
resolution mapping:
- * <listed document URI>=<physical location>.
+ * <listed document URI>=<physical location URI>.
*
- * A typical catalog will include resolutions of XML schema and associated
documents, sufficient to
- * run the parser "offline".
- * Example catalog file contents:
+ * Example catalog file contents (fictitious):
*
- * # standard resolutions for XML Schema
* # {referenced URI}={actual location}
* #
- * http\://www.w3.org/2006/01/wsdl/wsdl20.xsd=file:///c:/schema/wsdl20.xsd
- * http\://www.w3.org/2001/XMLSchema.xsd=file:///c:/schema/XMLSchema.xsd
+ *
http\://www.apache.org/schema/remoteSchema.xsd=file:///c:/schema/localSchema.xsd
+ * http\://www.apache.org/schema/myDoc=file:///c:/schema/XMLSchema.xsd
*
http\://www.w3.org/2006/01/wsdl-extensions.xsd=file:///c:/schema/wsdl-extensions.xsd
* # end
*
- * Note the use of backslash on the first colon of each line.
- * Also {actual location} is treated as a URI but for local files the
abbreviated form can be used
- * like this:
+ * Note the use of backslash on the first colon of each line. This is
necessary as catalog files are
+ * read as Java Properties files.
*
- * http\://www.w3.org/2006/01/wsdl/wsdl20.xsd=c:/schema/wsdl20.xsd
- *
- * TODO - update the javadoc.
+ * Currently, any relative URI references to other documents (such as with
the WSDL 2.0 "location"
+ * attribute of the <wsdl:import> and <wsdl:include> elements) will be
automatically resolved
+ * by virtue of the parent document.
+ * That is, if document a.wsdl references b.wsdl with a relative path and
a.wsdl has an entry in the catalog
+ * file, then the reference to b.wsdl will be deemed relative to the resolved
location of a.wsdl (not the
+ * original location). This is under review and it is expected that future
milestone releases will offer the
+ * choice of either option.
+ *
*/
public class SimpleURIResolver implements URIResolver {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
