Improve the XML schema validation to enable XSDs in other modules

Fix an issue to write to XMLStreamWriter from SUN JDK 1.6


git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802988 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 11 deletions

diff --git a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 039176856c..ae68eec237 100644
--- a/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/java/sca/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -76,13 +76,7 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio

  n

 Eclipse-RegisterBuddy: org.apache.axis2.kernel

-Import-Package: javax.xml.stream,

- javax.xml.transform,

- javax.xml.transform.dom,

- javax.xml.parsers,

- org.w3c.dom,

- javax.activation;resolution:=optional,

- org.xml.sax, 

+Import-Package: javax.activation;resolution:=optional,

  javax.security.auth.callback;resolution:=optional,

  javax.servlet,

  javax.servlet.http,

@@ -93,6 +87,10 @@ Import-Package: javax.xml.stream,
  javax.wsdl.factory;resolution:=optional,

  javax.wsdl.xml;resolution:=optional,

  javax.xml.namespace,

+ javax.xml.parsers,

+ javax.xml.stream,

+ javax.xml.transform,

+ javax.xml.transform.dom,

  org.apache.axiom.om,

  org.apache.axiom.om.impl.builder,

  org.apache.axiom.om.util,

@@ -124,12 +122,13 @@ Import-Package: javax.xml.stream,
  org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token;version="2.0.0",

  org.apache.tuscany.sca.binding.ws.axis2.policy.configuration;version="2.0.0",

  org.apache.tuscany.sca.binding.ws.axis2.policy.header;version="2.0.0",

+ org.apache.tuscany.sca.common.xml;version="2.0.0",

  org.apache.tuscany.sca.contribution.processor;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.extensibility;version="2.0.0",

  org.apache.tuscany.sca.core.assembly;version="2.0.0",

  org.apache.tuscany.sca.databinding;version="2.0.0",

  org.apache.tuscany.sca.definitions;version="2.0.0",

+ org.apache.tuscany.sca.extensibility;version="2.0.0",

  org.apache.tuscany.sca.host.http;version="2.0.0",

  org.apache.tuscany.sca.interfacedef;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

@@ -150,7 +149,9 @@ Import-Package: javax.xml.stream,
  org.apache.ws.security,

  org.apache.ws.security.handler,

  org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional

+ org.oasisopen.sca.annotation;version="2.0.0";resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
index 6a44c875e3..be4e902eaa 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
@@ -70,13 +70,13 @@ import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
 import org.apache.tuscany.sca.assembly.AbstractContract;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy;
+import org.apache.tuscany.sca.common.xml.XMLDocumentHelper;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.MessageFactory;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.PolicySubject;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
 import org.apache.ws.commons.schema.resolver.URIResolver;
 
 public class Axis2ServiceClient {
@@ -205,7 +205,7 @@ public class Axis2ServiceClient {
                     baseUri = definition.getDocumentBaseURI();
                 }
                 URL url = new URL(new URL(baseUri), schemaLocation);
-                return XMLDocumentHelper.getInputSource(url);
+                return XMLDocumentHelper.getInputSource(url); 
             } catch (IOException e) {
                 return null;
             }