svn commit: r291910 - in /incubator/woden/java/src/org/apache/woden: internal/schema/SchemaImpl.java internal/schema/SchemaImportImpl.java schema/Schema.java

[jk...@apache.org]

Author: jkaputin
Date: Tue Sep 27 04:33:39 2005
New Revision: 291910

URL: http://svn.apache.org/viewcvs?rev=291910&view=rev
Log:
Temporarily change schema parsing to use Xerces XML
Schema API impl, pending enhancements to ws-commons 
XmlSchema (i.e. to achieve Woden M1 end-Sept).

Modified:
    incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java
    incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java
    incubator/woden/java/src/org/apache/woden/schema/Schema.java

Modified: incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java?rev=291910&r1=291909&r2=291910&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImpl.java Tue Sep 27 04:33:39 2005
@@ -4,8 +4,8 @@
 package org.apache.woden.internal.schema;
 
 import org.apache.woden.schema.Schema;
-
-import org.apache.axis.xsd.xml.schema.XmlSchema;  //TODO test ws-commons XmlSchema
+import org.apache.ws.commons.schema.XmlSchema;  //TODO test ws-commons XmlSchema
+import org.apache.xerces.xs.*; //temp, while using Xerces XMLSchema API
 
 /**
  * Represents a schema element such as <xs:schema> and
@@ -15,9 +15,9 @@
  */
 public class SchemaImpl implements Schema {
     
-    private String fTargetNamespace;
-    private String fId;
-    private XmlSchema fSchemaContent;
+    private String fTargetNamespace = null;
+    private String fId = null;
+    private XSModel fSchemaContent = null;
 
     public void setId(String id)
     {
@@ -45,12 +45,12 @@
         return this.fTargetNamespace;
     }
     
-    public void setSchemaContent(XmlSchema xmlSchema)
+    public void setSchemaContent(XSModel xmlSchema)
     {
         this.fSchemaContent = xmlSchema;
     }
     
-    public XmlSchema getSchemaContent()
+    public XSModel getSchemaContent()
     {
         return this.fSchemaContent;
     }

Modified: incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java?rev=291910&r1=291909&r2=291910&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/schema/SchemaImportImpl.java Tue Sep 27 04:33:39 2005
@@ -16,7 +16,7 @@
     
     private String fNamespace = null;
     private String fSchemaLocation = null;
-    private Schema fSchema;
+    private Schema fSchema = null;
 
     /* (non-Javadoc)
      * @see org.apache.woden.wsdl20.extensions.SchemaImport#setNamespace(java.lang.String)

Modified: incubator/woden/java/src/org/apache/woden/schema/Schema.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/schema/Schema.java?rev=291910&r1=291909&r2=291910&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/schema/Schema.java (original)
+++ incubator/woden/java/src/org/apache/woden/schema/Schema.java Tue Sep 27 04:33:39 2005
@@ -3,7 +3,8 @@
  */
 package org.apache.woden.schema;
 
-import org.apache.axis.xsd.xml.schema.*;  //TODO test ws-commons XmlSchema
+import org.apache.ws.commons.schema.*;  
+import org.apache.xerces.xs.XSModel; //temp, while using Xerces XMLSchema API
 
 /**
  * This interface represents the a schema element from any XML based 
@@ -18,6 +19,9 @@
  * different elements and types from the same namespace). The actual 
  * schema content is represented as an <code>XmlSchema</code> object.
  * <p>
+ * NOTE: TODO temporarily using Xerces XMLSchema API to represent the
+ * schema content pending enhancements to ws-commons XmlSchema
+ * <p>
  * NOTE: non-XML type systems like DTD are not handled by this interface. They must be
  * handled by WSDL 2.0 extension mechanisms.
  * 
@@ -37,8 +41,20 @@
     
     public String getTargetNamespace();
     
-    public void setSchemaContent(XmlSchema xmlSchema);
+    /**
+     * temporarily using Xerces XMLSchema API, pending 
+     * ws-commons XmlSchema enhancements.
+     * 
+     * @param xmlSchema the schema content
+     */
+    public void setSchemaContent(XSModel xmlSchema);
     
-    public XmlSchema getSchemaContent();
+    /**
+     * temporarily using Xerces XMLSchema API, pending 
+     * ws-commons XmlSchema enhancements.
+     * 
+     * @return XSModel the schema content
+     */
+    public XSModel getSchemaContent();
     
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org