svn commit: r448374 - in /incubator/woden/trunk/java: build.properties src/org/apache/woden/internal/OMWSDLReader.java

[oshani]

Author: oshani
Date: Wed Sep 20 15:29:36 2006
New Revision: 448374

URL: http://svn.apache.org/viewvc?view=rev&rev=448374
Log:
Moved to XmlSchema1.1. 
However testSchemaId1G test case is failing with this change. Will try 
to fix this asap!



Modified:
    incubator/woden/trunk/java/build.properties
    incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java

Modified: incubator/woden/trunk/java/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.properties?view=diff&rev=448374&r1=448373&r2=448374
==============================================================================
--- incubator/woden/trunk/java/build.properties (original)
+++ incubator/woden/trunk/java/build.properties Wed Sep 20 15:29:36 2006
@@ -16,8 +16,8 @@
 ###########################################################################

 

 ! Prereq information

-XmlSchemaURL         = 
http://www.apache.org/dist/maven-repository/org/apache/ws/commons/XmlSchema/1.0.3/XmlSchema-1.0.3.jar

-XmlSchemaFile        = XmlSchema-1.0.3.jar

+XmlSchemaURL         = 
http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/ws/commons/XmlSchema/1.1/XmlSchema-1.1.jar

+XmlSchemaFile        = XmlSchema-1.1.jar

 XercesURL            = 
http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.8.0.zip

 XercesFile           = Xerces-J-bin.2.8.0.zip

 XercesJar1           = xercesImpl.jar


Modified: 
incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=448374&r1=448373&r2=448374
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java 
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/OMWSDLReader.java 
Wed Sep 20 15:29:36 2006
@@ -60,6 +60,7 @@
 import org.apache.ws.commons.schema.XmlSchema;

 import org.apache.ws.commons.schema.XmlSchemaCollection;

 import org.apache.ws.commons.schema.XmlSchemaException;

+import org.apache.ws.commons.schema.utils.NamespaceMap;

 import org.xml.sax.InputSource;

 

 import javax.xml.namespace.QName;

@@ -1186,13 +1187,8 @@
 

             //Set the baseURI and the namespaces from the DescriptionElement 
in the XMLSchemaCollection

             xsc.setBaseUri(baseURI);

-            Iterator prefixKeySet = desc.getNamespaces().keySet().iterator();

-            Object prefix;

-            while (prefixKeySet.hasNext()){

-                prefix = prefixKeySet.next();

-                String namespace = desc.getNamespaces().get(prefix).toString();

-                xsc.mapNamespace(prefix.toString(),namespace);

-            }

+            NamespaceMap namespaces = new NamespaceMap(desc.getNamespaces());

+            xsc.setNamespaceContext(namespaces);

             schemaDef = xsc.read(schemaSource, null);

         }

         catch (XmlSchemaException e){




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]