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 2005/09/08 17:02:48 UTC
svn commit: r279570 - in /incubator/woden/java/src/org/apache/woden:
internal/ internal/schema/ internal/wsdl20/ internal/wsdl20/extensions/
schema/ wsdl20/extensions/ wsdl20/xml/
Author: jkaputin
Date: Thu Sep 8 08:02:26 2005
New Revision: 279570
URL: http://svn.apache.org/viewcvs?rev=279570&view=rev
Log:
Removed the fTypeSystem attribute and accessors from
Schema and SchemaImport as this is is defined in the
TypesElement which should be sufficient. Also, moved
Schema and SchemaImport from the
org.apache.woden.wsdl20.extensions package to the new
org.apache.woden.schema package.
Added:
incubator/woden/java/src/org/apache/woden/internal/schema/
incubator/woden/java/src/org/apache/woden/internal/schema/SchemaConstants.java
- copied, changed from r220098, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaConstants.java
incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java
- copied, changed from r279015, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImpl.java
incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java
- copied, changed from r279015, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImportImpl.java
incubator/woden/java/src/org/apache/woden/schema/
incubator/woden/java/src/org/apache/woden/schema/Schema.java
- copied, changed from r279015, incubator/woden/java/src/org/apache/woden/wsdl20/extensions/Schema.java
incubator/woden/java/src/org/apache/woden/schema/SchemaImport.java
- copied, changed from r279015, incubator/woden/java/src/org/apache/woden/wsdl20/extensions/SchemaImport.java
Removed:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaConstants.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImportImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/Schema.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/SchemaImport.java
Modified:
incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.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=279570&r1=279569&r2=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/DOMWSDLReader.java Thu Sep 8 08:02:26 2005
@@ -13,11 +13,16 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.woden.internal.schema.SchemaConstants;
+import org.apache.woden.internal.schema.SchemaImpl;
+import org.apache.woden.internal.schema.SchemaImportImpl;
import org.apache.woden.internal.util.StringUtils;
import org.apache.woden.internal.util.dom.DOMUtils;
import org.apache.woden.internal.util.dom.QNameUtils;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.internal.wsdl20.extensions.*;
+import org.apache.woden.schema.Schema;
+import org.apache.woden.schema.SchemaImport;
import org.apache.woden.wsdl20.extensions.*;
import org.apache.woden.wsdl20.xml.*;
import org.w3c.dom.Attr;
@@ -219,7 +224,6 @@
//TODO the type system will depend on the WSDL doc so consider
//parameterizing it. Fixed with an XML Schema constant for now.
- schema.setTypeSystem(Constants.TYPE_XSD_2001); //XML Schema type system
schema.setContentModel(Constants.TYPE_XS_API); //XML Schema API
//TODO currently only the XSModel is stored in Schema.
@@ -309,7 +313,6 @@
//So consider changing Schema so that it stores both.
//Perhaps using a Map with a ContentModel/Content pair.
- schemaImport.setTypeSystem(Constants.TYPE_XSD_2001); //XML Schema type system
schemaImport.setContentModel(Constants.TYPE_XS_API); //XML Schema API
try {
Copied: incubator/woden/java/src/org/apache/woden/internal/schema/SchemaConstants.java (from r220098, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaConstants.java)
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/schema/SchemaConstants.java?p2=incubator/woden/java/src/org/apache/woden/internal/schema/SchemaConstants.java&p1=incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaConstants.java&r1=220098&r2=279570&rev=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaConstants.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/schema/SchemaConstants.java Thu Sep 8 08:02:26 2005
@@ -2,7 +2,7 @@
* TODO Apache boiler plate
*/
-package org.apache.woden.internal.wsdl20.extensions;
+package org.apache.woden.internal.schema;
import java.util.Arrays;
import java.util.List;
Copied: incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java (from r279015, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java?p2=incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java&p1=incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImpl.java&r1=279015&r2=279570&rev=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java Thu Sep 8 08:02:26 2005
@@ -1,19 +1,18 @@
/*
* TODO Apache boiler plate
*/
-package org.apache.woden.internal.wsdl20.extensions;
+package org.apache.woden.internal.schema;
-import org.apache.woden.wsdl20.extensions.Schema;
+import org.apache.woden.schema.Schema;
/**
- * A wrapper for a <xs:schema> element.
+ * A wrapper for a schema element.
*
* @author jkaputin@apache.org
*/
public class SchemaImpl implements Schema {
private String fTargetNamespace;
- private String fTypeSystem;
private String fContentModel;
private Object fContent;
@@ -33,16 +32,6 @@
return fTargetNamespace;
}
- public void setTypeSystem(String typeSystem)
- {
- fTypeSystem = typeSystem;
- }
-
- public String getTypeSystem()
- {
- return fTypeSystem;
- }
-
public void setContentModel(String contentModel)
{
fContentModel = contentModel;
Copied: incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java (from r279015, incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImportImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java?p2=incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java&p1=incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImportImpl.java&r1=279015&r2=279570&rev=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/SchemaImportImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java Thu Sep 8 08:02:26 2005
@@ -1,12 +1,12 @@
/*
* TODO Apache boiler plate
*/
-package org.apache.woden.internal.wsdl20.extensions;
+package org.apache.woden.internal.schema;
-import org.apache.woden.wsdl20.extensions.SchemaImport;
+import org.apache.woden.schema.SchemaImport;
/**
- * A wrapper for a <xs:import> element.
+ * A wrapper for a schema import element.
*
* @author jkaputin@apache.org
*/
@@ -14,7 +14,6 @@
private String fNamespace = null;
private String fSchemaLocation = null;
- private String fTypeSystem;
private String fContentModel;
private Object fContent;
@@ -49,16 +48,6 @@
public String getSchemaLocation()
{
return this.fSchemaLocation;
- }
-
- public void setTypeSystem(String typeSystem)
- {
- this.fTypeSystem = typeSystem;
- }
-
- public String getTypeSystem()
- {
- return this.fTypeSystem;
}
public void setContentModel(String contentModel)
Modified: incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java?rev=279570&r1=279569&r2=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java Thu Sep 8 08:02:26 2005
@@ -5,8 +5,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.woden.wsdl20.extensions.Schema;
-import org.apache.woden.wsdl20.extensions.SchemaImport;
+
+import org.apache.woden.schema.Schema;
+import org.apache.woden.schema.SchemaImport;
import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.TypesElement;
Copied: incubator/woden/java/src/org/apache/woden/schema/Schema.java (from r279015, incubator/woden/java/src/org/apache/woden/wsdl20/extensions/Schema.java)
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/schema/Schema.java?p2=incubator/woden/java/src/org/apache/woden/schema/Schema.java&p1=incubator/woden/java/src/org/apache/woden/wsdl20/extensions/Schema.java&r1=279015&r2=279570&rev=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/Schema.java (original)
+++ incubator/woden/java/src/org/apache/woden/schema/Schema.java Thu Sep 8 08:02:26 2005
@@ -1,23 +1,36 @@
/*
* TODO Apache boiler plate
*/
-package org.apache.woden.wsdl20.extensions;
+package org.apache.woden.schema;
/**
- * This interface represents the XML element information item for
- * a <xs:schema> element. It exposes the targetNamespace
- * attribute, but just wraps the remaining schema content as a
- * java.lang.Object.
+ * This interface represents the root schema element from any XML based
+ * type system that supports the semantics of schema inlining and
+ * schema importing. For example, in the W3C XML Schema type system
+ * is represents the <xs:schema> element. For Relax NG, it
+ * represents the <rng:grammar> element.
+ *
+ * It exposes the targetNamespace, but otherwise just returns the entire schema
+ * as a java.lang.Object. It also indicates type of object model (i.e. the API)
+ * used to represent the schema. A client application needing to process the
+ * underlying schema components can use this indicator to cast the schema Object
+ * to the appropriate type. For example, if it indicates the DOM API then the
+ * schema Object should be cast to an org.w3c.dom.Element.
+ *
+ * NOTE: non-XML type systems like DTD are not handled by this interface. They must be
+ * handled by WSDL 2.0 extension mechanisms.
+ *
+ * TODO initially this will be tested with XML Schema. Need to determine if it really
+ * is sufficient for other xml-based schema types like Relax NG or if some type of
+ * schema extension mechanism is required.
*
* @author jkaputin@apache.org
*/
-public interface Schema extends ExtensionElement {
+public interface Schema {
public void setTargetNamespace(String namespace);
public String getTargetNamespace();
-
- public String getTypeSystem();
public String getContentModel();
Copied: incubator/woden/java/src/org/apache/woden/schema/SchemaImport.java (from r279015, incubator/woden/java/src/org/apache/woden/wsdl20/extensions/SchemaImport.java)
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/schema/SchemaImport.java?p2=incubator/woden/java/src/org/apache/woden/schema/SchemaImport.java&p1=incubator/woden/java/src/org/apache/woden/wsdl20/extensions/SchemaImport.java&r1=279015&r2=279570&rev=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/SchemaImport.java (original)
+++ incubator/woden/java/src/org/apache/woden/schema/SchemaImport.java Thu Sep 8 08:02:26 2005
@@ -1,16 +1,32 @@
/*
* TODO Apache boiler plate
*/
-package org.apache.woden.wsdl20.extensions;
+package org.apache.woden.schema;
/**
- * This interface represents the XML element information item for
- * a <xs:import> element. It declares the behaviour required to
- * support parsing, creating and manipulating a <xs:import> element.
+ * This interface represents a schema import element from any XML based
+ * type system that supports the semantics of schema inlining and
+ * schema importing. For example, in the W3C XML Schema type system
+ * is represents the <xs:import> element. For Relax NG, it
+ * represents the <rng:include> element.
+ *
+ * It exposes the namespace and schema location. It returns the imported schema
+ * as a java.lang.Object. It also indicates type of object model (i.e. the API)
+ * used to represent the schema. A client application needing to process the
+ * underlying schema components can use this indicator to cast the imported schema
+ * Object to the appropriate type. For example, if it indicates the DOM API then the
+ * imported schema Object should be cast to an org.w3c.dom.Element.
+ *
+ * NOTE: non-XML type systems like DTD are not handled by this interface. They must be
+ * handled by WSDL 2.0 extension mechanisms.
+ *
+ * TODO initially this will be tested with XML Schema. Need to determine if it really
+ * is sufficient for other xml-based schema types like Relax NG or if some type of
+ * schema extension mechanism is required.
*
* @author jkaputin@apache.org
*/
-public interface SchemaImport extends ExtensionElement {
+public interface SchemaImport {
public void setNamespace(String namespace);
@@ -19,8 +35,6 @@
public void setSchemaLocation(String schemaLoc);
public String getSchemaLocation();
-
- public String getTypeSystem();
public String getContentModel();
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java?rev=279570&r1=279569&r2=279570&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java Thu Sep 8 08:02:26 2005
@@ -4,8 +4,9 @@
package org.apache.woden.wsdl20.xml;
import java.util.Map;
-import org.apache.woden.wsdl20.extensions.Schema;
-import org.apache.woden.wsdl20.extensions.SchemaImport;
+
+import org.apache.woden.schema.Schema;
+import org.apache.woden.schema.SchemaImport;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org