From dc2c101033af2e41fa9c0d1a1bf999129c68b5e8 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 Nov 2008 14:02:37 +0000
Subject: Fix build error by removeing use of XmlSchema as its not used
 presently

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718964 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/databinding-jaxb/META-INF/MANIFEST.MF  |  1 -
 .../sca/databinding/jaxb/JAXBTypeHelper.java       | 41 ++++++++++------------
 .../databinding/jaxb/JAXBReflectionTestCase.java   |  4 +--
 3 files changed, 21 insertions(+), 25 deletions(-)

(limited to 'java/sca/modules/databinding-jaxb')

diff --git a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
index f07a915800..7be846337a 100644
--- a/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
@@ -43,7 +43,6 @@ Import-Package: javax.activation,
  org.apache.tuscany.sca.interfacedef.util;version="1.4",
  org.apache.tuscany.sca.policy;version="1.4.0",
  org.apache.tuscany.sca.xsd;version="1.4",
- org.apache.ws.commons.schema.resolver,
  
  org.osoa.sca;version="1.4",
  org.w3c.dom,
diff --git a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index a60a882801..d8224686f9 100644
--- a/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.databinding.jaxb;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -45,10 +44,8 @@ import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
 import org.apache.tuscany.sca.xsd.XSDFactory;
 import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.resolver.URIResolver;
 import org.osoa.sca.ServiceRuntimeException;
 import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
 
 public class JAXBTypeHelper implements XMLTypeHelper {
     private static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
@@ -97,25 +94,25 @@ public class JAXBTypeHelper implements XMLTypeHelper {
         return xsds;
     }
 
-    private static class XSDResolver implements URIResolver {
-        private Map<String, String> xsds;
-
-        public XSDResolver(Map<String, String> xsds) {
-            super();
-            this.xsds = xsds;
-        }
-
-        public InputSource resolveEntity(java.lang.String namespace,
-                                         java.lang.String schemaLocation,
-                                         java.lang.String baseUri) {
-            String xsd = xsds.get(schemaLocation);
-            if (xsd == null) {
-                return null;
-            }
-            return new InputSource(new StringReader(xsd));
-        }
-
-    }
+//    private static class XSDResolver implements URIResolver {
+//        private Map<String, String> xsds;
+//
+//        public XSDResolver(Map<String, String> xsds) {
+//            super();
+//            this.xsds = xsds;
+//        }
+//
+//        public InputSource resolveEntity(java.lang.String namespace,
+//                                         java.lang.String schemaLocation,
+//                                         java.lang.String baseUri) {
+//            String xsd = xsds.get(schemaLocation);
+//            if (xsd == null) {
+//                return null;
+//            }
+//            return new InputSource(new StringReader(xsd));
+//        }
+//
+//    }
 
     /*
     private void generateJAXBSchemas1(List<XSDefinition> definitions, XSDFactory factory) {
diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index 08522864b5..9d85c32e63 100644
--- a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
@@ -19,12 +19,12 @@
 
 package org.apache.tuscany.sca.databinding.jaxb;
 
+import java.util.Map;
+
 import javax.xml.bind.JAXBContext;
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-
 /**
  * @version $Rev$ $Date$
  */
-- 
cgit v1.2.3