Author: sagara
Date: Sat Oct 26 13:50:39 2013
New Revision: 1535992
URL: http://svn.apache.org/r1535992
Log:
Fixed WODEN-234, Upgrade Woden trunk to use XmlSchema 2
Modified:
webservices/woden/trunk/java/pom.xml
webservices/woden/trunk/java/woden-core/pom.xml
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
Modified: webservices/woden/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/pom.xml?rev=1535992&r1=1535991&r2=1535992&view=diff
==============================================================================
--- webservices/woden/trunk/java/pom.xml (original)
+++ webservices/woden/trunk/java/pom.xml Sat Oct 26 13:50:39 2013
@@ -308,7 +308,7 @@
<properties>
<bundle.plugin.version>2.3.7</bundle.plugin.version>
-
<apache.xmlSchema.version>1.4.8-SNAPSHOT</apache.xmlSchema.version>
+
<apache.xmlSchema.version>2.0.4-SNAPSHOT</apache.xmlSchema.version>
<apache.ant.version>1.7.1</apache.ant.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<slf4.version>1.5.8</slf4.version>
Modified: webservices/woden/trunk/java/woden-core/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-core/pom.xml?rev=1535992&r1=1535991&r2=1535992&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-core/pom.xml (original)
+++ webservices/woden/trunk/java/woden-core/pom.xml Sat Oct 26 13:50:39 2013
@@ -76,8 +76,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>
<!-- Logger dependencies -->
Modified:
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java?rev=1535992&r1=1535991&r2=1535992&view=diff
==============================================================================
---
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
(original)
+++
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/ComponentModelBuilder.java
Sat Oct 26 13:50:39 2013
@@ -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;
/**
@@ -222,11 +222,7 @@ public class ComponentModelBuilder {
//process elements and types declared in any included or imported
schemas.
//note that XmlSchema keeps included and imported schemas together,
via getIncludes().
- 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)) {
@@ -323,13 +315,13 @@ public class ComponentModelBuilder {
tdQN = new QName(tdQN.getNamespaceURI(),
tdQN.getLocalPart(), pfx);
}
}
- if (schemaTns == null ||
schemaTns.equals(tdQN.getNamespaceURI()))
+ if (schemaTns == null ||
schemaTns.equals(tdQN.getNamespaceURI()))
{
TypeDefinitionImpl td = new TypeDefinitionImpl();
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);
}
}
@@ -575,7 +567,7 @@ public class ComponentModelBuilder {
}
private void buildEndpointExtensions(EndpointImpl endpoint) {
-
+
/*
* Create a ComponentExtensions subtype specific to the binding type.
*/
Modified:
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java?rev=1535992&r1=1535991&r2=1535992&view=diff
==============================================================================
---
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
(original)
+++
webservices/woden/trunk/java/woden-core/src/main/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
Sat Oct 26 13:50:39 2013
@@ -40,7 +40,7 @@ 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;
+import org.apache.ws.commons.schema.XmlSchema;
/**
* The WSDL document validator validates a WSDL XML model against the
@@ -349,15 +349,12 @@ public class WSDLDocumentValidator
if(iSchemaNs == null)
continue;
String ns = iSchemaNs.toString();
-
+
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())
{
@@ -368,14 +365,11 @@ public class WSDLDocumentValidator
isValid = false;
}
}
-
+
}
-
- 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())
{
@@ -386,7 +380,7 @@ public class WSDLDocumentValidator
isValid = false;
}
}
-
+
}
//Check if another element has been defined.
//check if another type has been defined.
@@ -399,7 +393,7 @@ public class WSDLDocumentValidator
schemaList.add(iSchema);
schemas.put(ns, schemaList);
}
-
+
}
return isValid;
}
@@ -428,6 +422,7 @@ public class WSDLDocumentValidator
}
}
return isValid;
+
}
/**
Modified:
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
URL:
http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java?rev=1535992&r1=1535991&r2=1535992&view=diff
==============================================================================
---
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
(original)
+++
webservices/woden/trunk/java/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
Sat Oct 26 13:50:39 2013
@@ -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.
@@ -88,7 +87,7 @@ public class SimpleURIResolverTest exten
testConnection = new URL("www.apache.org").openConnection();
}
catch (IOException e){
-
+
}
assertNull("Expected no connection IOException due to non-existent
HTTP Proxy.", testConnection);
@@ -112,7 +111,7 @@ public class SimpleURIResolverTest exten
wsdlURL);
- // set the resolver explicitly, using the root as a base URL
+ // set the resolver explicitly, using the root as a base URL
// (SimpleURIResolver() default constructor is the default
behaviour)
// Base/root URL property no longer required in this test - now uses
classpath
@@ -121,7 +120,7 @@ public class SimpleURIResolverTest exten
// wsdlURL);
//System.setProperty(fCatalogBaseProperty, rootURL.toString());
reader.setURIResolver(new SimpleURIResolver());
-
+
Description descComp = reader.readWSDL(wsdlURL.toString());
assertNotNull("The reader did not return a WSDL description.",
descComp);
@@ -129,7 +128,7 @@ public class SimpleURIResolverTest exten
fInterfaces = descComp.getInterfaces();
DescriptionElement descElem = descComp.toElement();
- TypesElement types = descElem.getTypesElement();
+ TypesElement types = descElem.getTypesElement();
fSchemas = types.getSchemas();
fImportedSchemas = types.getImportedSchemas();
fInlinedSchemas = types.getInlinedSchemas();
@@ -170,12 +169,9 @@ 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)
+ if (xso instanceof XmlSchemaImport)
{
assertEquals("Unexpected namespace.",
"http://example.org/getOverdraft";, ((XmlSchemaImport)xso).getNamespace());
assertEquals("Unexpected schemaLocation.",
"http://test.com/getOverdraft.xsd";, xso.getSchemaLocation());
@@ -191,13 +187,10 @@ public class SimpleURIResolverTest exten
InlinedSchema schema1 = fInlinedSchemas[0];
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)
+ if (xso instanceof XmlSchemaInclude)
{
assertEquals("Unexpected schemaLocation.",
"http://test.com/getBalance.xsd";, xso.getSchemaLocation());
}
@@ -212,16 +205,16 @@ public class SimpleURIResolverTest exten
{
p.remove(fCatalogProperty);
}
- else
+ else
{
p.setProperty(fCatalogProperty, fCatalogPropValue);
}
-
+
if (fHttpProxyHostValue == null)
{
p.remove(fHttpProxyHostProperty);
}
- else
+ else
{
p.setProperty(fHttpProxyHostProperty, fHttpProxyHostValue);
}
@@ -229,7 +222,7 @@ public class SimpleURIResolverTest exten
// above required as following throws NPE when arg1 == null (contrary
to spec)
//System.setProperty(fCatalogProperty, fCatalogPropValue);
//System.setProperty("http.proxyHost", fHttpProxyHostValue);
-
+
System.setProperties(p);
}
