Author: veithen
Date: Tue Aug 16 18:37:08 2011
New Revision: 1158411
URL: http://svn.apache.org/viewvc?rev=1158411&view=rev
Log:
Started to migrate to XmlSchema 2.0.
Modified:
webservices/woden/branches/xmlschema2/pom.xml
webservices/woden/branches/xmlschema2/woden-api/pom.xml
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
webservices/woden/branches/xmlschema2/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
webservices/woden/branches/xmlschema2/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
Modified: webservices/woden/branches/xmlschema2/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/pom.xml?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/pom.xml Tue Aug 16 18:37:08 2011
@@ -340,7 +340,7 @@
<properties>
<woden.osgi.version>1.0.0</woden.osgi.version>
<bundle.plugin.version>1.4.0</bundle.plugin.version>
-
<apache.xmlSchema.version>1.4.8-SNAPSHOT</apache.xmlSchema.version>
+
<apache.xmlSchema.version>2.0.1-SNAPSHOT</apache.xmlSchema.version>
<apache.axiom.version>1.2.13-SNAPSHOT</apache.axiom.version>
<apache.ant.version>1.7.1</apache.ant.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
Modified: webservices/woden/branches/xmlschema2/woden-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-api/pom.xml?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
--- webservices/woden/branches/xmlschema2/woden-api/pom.xml (original)
+++ webservices/woden/branches/xmlschema2/woden-api/pom.xml Tue Aug 16 18:37:08
2011
@@ -84,8 +84,8 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
<version>${apache.xmlSchema.version}</version>
</dependency>
</dependencies>
Modified:
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
---
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
(original)
+++
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
Tue Aug 16 18:37:08 2011
@@ -17,8 +17,8 @@
package org.apache.woden.internal.wsdl20;
import java.net.URI;
-import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Vector;
import javax.xml.namespace.QName;
@@ -52,11 +52,11 @@ import org.apache.woden.wsdl20.xml.Inter
import org.apache.woden.wsdl20.xml.ServiceElement;
import org.apache.woden.wsdl20.xml.TypesElement;
import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaExternal;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
+import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
/**
@@ -220,13 +220,9 @@ public class ComponentModelBuilder {
buildTypeDefinitions(schemaDef, schemaTns, typeSystemURI);
//process elements and types declared in any included or imported
schemas.
- //note that XmlSchema keeps included and imported schemas together,
via getIncludes().
+ //note that XmlSchema keeps included and imported schemas together,
via getExternals().
- XmlSchemaObjectCollection includeColl = schemaDef.getIncludes();
- Iterator includes = includeColl.getIterator();
- while(includes.hasNext()) {
- Object o = includes.next();
- XmlSchemaExternal externalSchema = (XmlSchemaExternal)o;
+ for(XmlSchemaExternal externalSchema : schemaDef.getExternals()) {
XmlSchema schema = externalSchema.getSchema();
if(schema != null )
{
@@ -244,11 +240,9 @@ public class ComponentModelBuilder {
*/
private void buildElementDeclarations(XmlSchema schemaDef, String
schemaTns, URI typeSystemURI) {
- XmlSchemaObjectTable elementTable = schemaDef.getElements();
NamespacePrefixList prefixes = schemaDef.getNamespaceContext();
- Iterator qnames = elementTable.getNames();
- while (qnames.hasNext()) {
- QName xseQN = (QName) qnames.next();
+ for (Map.Entry<QName,XmlSchemaElement> entry :
schemaDef.getElements().entrySet()) {
+ QName xseQN = entry.getKey();
if(fDesc.getElementDeclaration(xseQN) != null) {
//The Description already contains this Element Declaration.
continue;
@@ -280,7 +274,7 @@ public class ComponentModelBuilder {
ed.setName(edQN);
ed.setSystem(typeSystemURI);
ed.setContentModel(Constants.API_APACHE_WS_XS);
- ed.setContent(elementTable.getItem(xseQN));
+ ed.setContent(entry.getValue());
fDesc.addElementDeclaration(ed);
}
}
@@ -291,11 +285,9 @@ public class ComponentModelBuilder {
*/
private void buildTypeDefinitions(XmlSchema schemaDef, String
schemaTns, URI typeSystemURI) {
- XmlSchemaObjectTable typeTable = schemaDef.getSchemaTypes();
NamespacePrefixList prefixes = schemaDef.getNamespaceContext();
- Iterator qnames = typeTable.getNames();
- while (qnames.hasNext()) {
- QName xstQN = (QName) qnames.next();
+ for (Map.Entry<QName,XmlSchemaType> entry :
schemaDef.getSchemaTypes().entrySet()) {
+ QName xstQN = entry.getKey();
if(SchemaConstants.NS_STRING_SCHEMA.equals(schemaTns) &&
!SchemaConstants.LIST_Q_BUILT_IN_TYPES.contains(xstQN)) {
@@ -329,7 +321,7 @@ public class ComponentModelBuilder {
td.setName(tdQN);
td.setSystem(typeSystemURI);
td.setContentModel(Constants.API_APACHE_WS_XS);
- td.setContent(typeTable.getItem(xstQN));
+ td.setContent(entry.getValue());
fDesc.addTypeDefinition(td);
}
}
Modified:
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
---
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
(original)
+++
webservices/woden/branches/xmlschema2/woden-commons/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
Tue Aug 16 18:37:08 2011
@@ -40,7 +40,6 @@ import org.apache.woden.wsdl20.xml.Inter
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
import org.apache.woden.wsdl20.xml.TypesElement;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
/**
* The WSDL document validator validates a WSDL XML model against the
@@ -353,11 +352,8 @@ public class WSDLDocumentValidator
if(schemas.containsKey(ns))
{
List schemaList = (List)schemas.get(ns);
- XmlSchemaObjectTable elements =
iSchema.getSchemaDefinition().getElements();
- Iterator elementNames = elements.getNames();
- while(elementNames.hasNext())
+ for(QName elementName :
iSchema.getSchemaDefinition().getElements().keySet())
{
- QName elementName = (QName)elementNames.next();
Iterator otherInlineSchemas = schemaList.iterator();
while(otherInlineSchemas.hasNext())
{
@@ -371,11 +367,8 @@ public class WSDLDocumentValidator
}
- XmlSchemaObjectTable types =
iSchema.getSchemaDefinition().getSchemaTypes();
- Iterator typeNames = types.getNames();
- while(typeNames.hasNext())
+ for(QName typeName :
iSchema.getSchemaDefinition().getSchemaTypes().keySet())
{
- QName typeName = (QName)typeNames.next();
Iterator otherInlineSchemas = schemaList.iterator();
while(otherInlineSchemas.hasNext())
{
Modified:
webservices/woden/branches/xmlschema2/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
---
webservices/woden/branches/xmlschema2/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
webservices/woden/branches/xmlschema2/woden-om/src/main/java/org/apache/woden/internal/OMWSDLReader.java
Tue Aug 16 18:37:08 2011
@@ -291,7 +291,7 @@ public class OMWSDLReader extends BaseWS
// Plug in the selected woden URI Resolver
xsc.setSchemaResolver(new
OMSchemaResolverAdapter(getURIResolver(), importEl));
- schemaDef = xsc.read(schemaSource, null);
+ schemaDef = xsc.read(schemaSource);
fImportedSchemas.put(schemaURL, schemaDef);
}
catch (XmlSchemaException e){
@@ -350,7 +350,7 @@ public class OMWSDLReader extends BaseWS
// Plug in the selected woden URI Resolver
xsc.setSchemaResolver(new
OMSchemaResolverAdapter(getURIResolver(), schemaElement));
- schemaDef = xsc.read(schemaSource, null);
+ schemaDef = xsc.read(schemaSource);
}
catch (XmlSchemaException e){
Modified:
webservices/woden/branches/xmlschema2/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
URL:
http://svn.apache.org/viewvc/webservices/woden/branches/xmlschema2/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java?rev=1158411&r1=1158410&r2=1158411&view=diff
==============================================================================
---
webservices/woden/branches/xmlschema2/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
(original)
+++
webservices/woden/branches/xmlschema2/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
Tue Aug 16 18:37:08 2011
@@ -44,7 +44,6 @@ import org.apache.ws.commons.schema.XmlS
import org.apache.ws.commons.schema.XmlSchemaExternal;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
/**
* Functional verification test of SimpleURIResolver.
@@ -170,11 +169,8 @@ public class SimpleURIResolverTest exten
XmlSchema xmlSchema = schema1.getSchemaDefinition();
assertEquals("Unexpected targetNamespace.",
"http://example.org/getAccountDetails/";, schema1.getNamespace().toString());
- XmlSchemaObjectCollection schemaIncludes = xmlSchema.getIncludes(); //
returns both includes and imports
- Iterator schemaIterator = schemaIncludes.getIterator();
- while (schemaIterator.hasNext())
+ for (XmlSchemaExternal xso : xmlSchema.getExternals()) // returns both
includes and imports
{
- XmlSchemaExternal xso = (XmlSchemaExternal)
schemaIterator.next();
if (xso instanceof XmlSchemaImport)
{
assertEquals("Unexpected namespace.",
"http://example.org/getOverdraft";, ((XmlSchemaImport)xso).getNamespace());
@@ -192,11 +188,8 @@ public class SimpleURIResolverTest exten
XmlSchema xmlSchema = schema1.getSchemaDefinition();
assertEquals("Unexpected targetNamespace.",
"http://example.org/getAccountDetails/";, schema1.getNamespace().toString());
- XmlSchemaObjectCollection schemaIncludes = xmlSchema.getIncludes(); //
returns both includes and imports
- Iterator schemaIterator = schemaIncludes.getIterator();
- while (schemaIterator.hasNext())
+ for (XmlSchemaExternal xso : xmlSchema.getExternals()) // returns both
includes and imports
{
- XmlSchemaExternal xso = (XmlSchemaExternal)
schemaIterator.next();
if (xso instanceof XmlSchemaInclude)
{
assertEquals("Unexpected schemaLocation.",
"http://test.com/getBalance.xsd";, xso.getSchemaLocation());
