svn commit: r700332 - in /tuscany/java/sca/modules: interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/ xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/

[rfeng]

Author: rfeng
Date: Mon Sep 29 21:14:28 2008
New Revision: 700332

URL: http://svn.apache.org/viewvc?rev=700332&view=rev
Log:
Use the XMLInputFactory from the registry instead of a local one

Modified:
    
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
    
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
    
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
    
tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java

Modified: 
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java?rev=700332&r1=700331&r2=700332&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
 Mon Sep 29 21:14:28 2008
@@ -21,10 +21,11 @@
 
 import java.net.URL;
 
+import javax.xml.stream.XMLInputFactory;
+
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -45,7 +46,7 @@
 
     @Test
     public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(wsdl, 
XMLDocumentHelper.WSDL11, true, "targetNamespace");
+        String tns = XMLDocumentHelper.readTargetNamespace(wsdl, 
XMLDocumentHelper.WSDL11, true, "targetNamespace", 
XMLInputFactory.newInstance());
         Assert.assertEquals("http://helloworld";, tns);
     }
 

Modified: 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java?rev=700332&r1=700331&r2=700332&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
 (original)
+++ 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
 Mon Sep 29 21:14:28 2008
@@ -150,9 +150,7 @@
         return inputSource;
     }
 
-    private final static XMLInputFactory inputFactory = 
XMLInputFactory.newInstance();
-
-    public static String readTargetNamespace(URL doc, QName element, boolean 
rootOnly, String attribute)
+    public static String readTargetNamespace(URL doc, QName element, boolean 
rootOnly, String attribute, XMLInputFactory inputFactory)
         throws IOException, XMLStreamException {
         if (attribute == null) {
             attribute = "targetNamespace";

Modified: 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java?rev=700332&r1=700331&r2=700332&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
 Mon Sep 29 21:14:28 2008
@@ -23,6 +23,7 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
 
 import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
@@ -44,10 +45,12 @@
 public class XSDDocumentProcessor implements 
URLArtifactProcessor<XSDefinition> {
 
     private XSDFactory factory;
+    private XMLInputFactory inputFactory;
     private Monitor monitor;
 
     public XSDDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
Monitor monitor) {
         this.factory = modelFactories.getFactory(XSDFactory.class);
+        this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
         this.monitor = monitor;
     }
     
@@ -91,7 +94,7 @@
     protected XSDefinition indexRead(URL doc) throws Exception {
         XSDefinition xsd = factory.createXSDefinition();
         xsd.setUnresolved(true);
-        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, 
"targetNamespace"));
+        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, 
"targetNamespace", inputFactory));
         xsd.setLocation(doc.toURI());
         xsd.setUnresolved(false);
         return xsd;

Modified: 
tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java?rev=700332&r1=700331&r2=700332&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
 Mon Sep 29 21:14:28 2008
@@ -21,6 +21,8 @@
 
 import java.net.URL;
 
+import javax.xml.stream.XMLInputFactory;
+
 import junit.framework.Assert;
 
 import org.junit.Before;
@@ -42,7 +44,7 @@
 
     @Test
     public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(xsd, 
XMLDocumentHelper.XSD, true, null);
+        String tns = XMLDocumentHelper.readTargetNamespace(xsd, 
XMLDocumentHelper.XSD, true, null, XMLInputFactory.newInstance());
         Assert.assertEquals("http://greeting";, tns);
     }