Author: dain
Date: Fri Dec 7 17:40:47 2007
New Revision: 602292
URL: http://svn.apache.org/viewvc?rev=602292&view=rev
Log:
Removed XmlBeans schema loader
Removed:
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlBeansSchemaInfoBuilder.java
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlBeansSchemaLoader.java
openejb/trunk/openejb3/server/openejb-axis/src/test/resources/schema/foo.xsd
Modified:
openejb/trunk/openejb3/server/openejb-axis/pom.xml
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
openejb/trunk/openejb3/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java
Modified: openejb/trunk/openejb3/server/openejb-axis/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/pom.xml?rev=602292&r1=602291&r2=602292&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-axis/pom.xml Fri Dec 7 17:40:47 2007
@@ -49,11 +49,6 @@
<!-- For schema processing -->
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>1.3.1</version>
Modified:
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java?rev=602292&r1=602291&r2=602292&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
(original)
+++
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
Fri Dec 7 17:40:47 2007
@@ -23,22 +23,22 @@
import org.apache.axis.providers.java.RPCProvider;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.JavaWsdlMapping;
-import org.apache.openejb.jee.PortComponent;
import org.apache.openejb.core.webservices.HandlerChainData;
import org.apache.openejb.core.webservices.HandlerData;
import org.apache.openejb.core.webservices.PortData;
+import org.apache.openejb.jee.JavaWsdlMapping;
+import org.apache.openejb.jee.PortComponent;
+import org.apache.openejb.server.axis.assembler.CommonsSchemaInfoBuilder;
import org.apache.openejb.server.axis.assembler.JaxRpcServiceInfo;
import org.apache.openejb.server.axis.assembler.JaxRpcServiceInfoBuilder;
-import org.apache.openejb.server.axis.assembler.XmlBeansSchemaInfoBuilder;
import org.apache.openejb.server.axis.assembler.XmlSchemaInfo;
import org.apache.openejb.server.httpd.HttpListener;
import org.apache.openejb.server.webservices.WsService;
import javax.naming.Context;
+import javax.wsdl.Port;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.HandlerInfo;
-import javax.wsdl.Port;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -55,7 +55,7 @@
private JaxRpcServiceInfo getJaxRpcServiceInfo(ClassLoader classLoader)
throws OpenEJBException {
JavaWsdlMapping mapping = null; // the java to wsdl mapping file
- XmlBeansSchemaInfoBuilder xmlBeansSchemaInfoBuilder = new
XmlBeansSchemaInfoBuilder(null, null); // the schema data from the wsdl file
+ CommonsSchemaInfoBuilder xmlBeansSchemaInfoBuilder = new
CommonsSchemaInfoBuilder(null, null); // the schema data from the wsdl file
PortComponent portComponent = null; // webservice.xml declaration of
this service
Port port = null; // wsdl.xml declaration of this service
String wsdlFile = null;
Modified:
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java?rev=602292&r1=602291&r2=602292&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
Fri Dec 7 17:40:47 2007
@@ -55,7 +55,7 @@
import java.util.jar.JarFile;
public class CommonsSchemaInfoBuilder {
- private static final Log log =
LogFactory.getLog(XmlBeansSchemaInfoBuilder.class);
+ private static final Log log =
LogFactory.getLog(CommonsSchemaInfoBuilder.class);
private static final String XML_SCHEMA_NS =
"http://www.w3.org/2001/XMLSchema";;
private static final String XML_NS_NS = "http://www.w3.org/2000/xmlns/";;
private static final String SOAP_ENCODING_NS =
"http://schemas.xmlsoap.org/soap/encoding/";;
@@ -92,9 +92,6 @@
}
- /**
- * builds a map of SchemaTypeKey containing jaxrpc-style fake QName and
context info to xmlbeans SchemaType object.
- */
private void buildXmlTypeInfos() {
for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) {
// Global Elements
Modified:
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java?rev=602292&r1=602291&r2=602292&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
(original)
+++
openejb/trunk/openejb3/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
Fri Dec 7 17:40:47 2007
@@ -47,7 +47,7 @@
import java.util.zip.ZipEntry;
public class CommonsSchemaLoader {
- private static final Log log =
LogFactory.getLog(XmlBeansSchemaInfoBuilder.class);
+ private static final Log log =
LogFactory.getLog(CommonsSchemaLoader.class);
private final URI wsdlUri;
private final JarFile moduleFile;
Modified:
openejb/trunk/openejb3/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java?rev=602292&r1=602291&r2=602292&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java
(original)
+++
openejb/trunk/openejb3/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/SchemaInfoBuilderTest.java
Fri Dec 7 17:40:47 2007
@@ -19,19 +19,10 @@
import junit.framework.TestCase;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.xmlbeans.XmlError;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.SchemaTypeSystem;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.apache.openejb.OpenEJBException;
import javax.xml.namespace.QName;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Collection;
-import java.util.ArrayList;
public class SchemaInfoBuilderTest extends TestCase {
public void testSimpleType() throws Exception {
@@ -378,41 +369,11 @@
}
private XmlSchemaInfo loadSchemaInfo(String fileName) throws Exception {
- if (true) {
- InputStream in =
getClass().getClassLoader().getResourceAsStream(fileName);
- XmlSchemaCollection xmlSchemaCollection = new
XmlSchemaCollection();
- xmlSchemaCollection.read(new InputStreamReader(in), null);
- CommonsSchemaInfoBuilder schemaInfoBuilder = new
CommonsSchemaInfoBuilder(xmlSchemaCollection);
- XmlSchemaInfo schemaInfo = schemaInfoBuilder.createSchemaInfo();
- return schemaInfo;
- } else {
- Collection<XmlError> errors = new ArrayList<XmlError>();
- XmlOptions xmlOptions = new XmlOptions();
- xmlOptions.setErrorListener(errors);
- InputStream in =
getClass().getClassLoader().getResourceAsStream(fileName);
- SchemaDocument schema = SchemaDocument.Factory.parse(in,
xmlOptions);
-
- SchemaTypeSystem schemaTypeSystem = XmlBeans.compileXsd(new
XmlObject[]{schema}, XmlBeansSchemaLoader.basicTypeSystem, xmlOptions);
- if (errors.size() > 0) {
- boolean wasError = false;
- for (XmlError xmlError : errors) {
- if (xmlError.getSeverity() == XmlError.SEVERITY_ERROR) {
- System.out.println(xmlError);
- wasError = true;
- } else if (xmlError.getSeverity() ==
XmlError.SEVERITY_WARNING) {
- System.out.println(xmlError);
- } else if (xmlError.getSeverity() ==
XmlError.SEVERITY_INFO) {
- System.out.println(xmlError);
- }
- }
- if (wasError) {
- throw new OpenEJBException("Could not compile schema type
system, see log for errors");
- }
- }
-
- XmlBeansSchemaInfoBuilder schemaInfoBuilder = new
XmlBeansSchemaInfoBuilder(schemaTypeSystem);
- XmlSchemaInfo schemaInfo = schemaInfoBuilder.createSchemaInfo();
- return schemaInfo;
- }
+ InputStream in =
getClass().getClassLoader().getResourceAsStream(fileName);
+ XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
+ xmlSchemaCollection.read(new InputStreamReader(in), null);
+ CommonsSchemaInfoBuilder schemaInfoBuilder = new
CommonsSchemaInfoBuilder(xmlSchemaCollection);
+ XmlSchemaInfo schemaInfo = schemaInfoBuilder.createSchemaInfo();
+ return schemaInfo;
}
}
