Author: antelder
Date: Wed Nov 19 06:02:37 2008
New Revision: 718964
URL: http://svn.apache.org/viewvc?rev=718964&view=rev
Log:
Fix build error by removeing use of XmlSchema as its not used presently
Modified:
tuscany/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
Modified: tuscany/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF?rev=718964&r1=718963&r2=718964&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/databinding-jaxb/META-INF/MANIFEST.MF Wed Nov 19
06:02:37 2008
@@ -43,7 +43,6 @@
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,
Modified:
tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java?rev=718964&r1=718963&r2=718964&view=diff
==============================================================================
---
tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
(original)
+++
tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
Wed Nov 19 06:02:37 2008
@@ -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.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 @@
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) {
Modified:
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java?rev=718964&r1=718963&r2=718964&view=diff
==============================================================================
---
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
(original)
+++
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
Wed Nov 19 06:02:37 2008
@@ -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$
*/