Author: dandiep
Date: Sun Jan 14 18:08:55 2007
New Revision: 496206
URL: http://svn.apache.org/viewvc?view=rev&rev=496206
Log:
o Add XmlSchema object into the SchemaInfo in the service model
o Add isElementFormQualified/isAttributeFormQualified to SchemaInfo (CXF-363 -
thanks Balaji!)
o Update to latest Woodstox jar with perf improvements
o Remove redundant TypeInfo class and put SchemaInfos directly on ServiceInfo
Removed:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/TypeInfo.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/TypeInfoTest.java
Modified:
incubator/cxf/trunk/api/pom.xml
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
incubator/cxf/trunk/common/common/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/ClientTest.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
incubator/cxf/trunk/tools/java2wsdl/pom.xml
incubator/cxf/trunk/tools/misctools/pom.xml
incubator/cxf/trunk/tools/validator/pom.xml
incubator/cxf/trunk/tools/wsdl2java/pom.xml
Modified: incubator/cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/api/pom.xml (original)
+++ incubator/cxf/trunk/api/pom.xml Sun Jan 14 18:08:55 2007
@@ -81,7 +81,7 @@
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
</dependencies>
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
Sun Jan 14 18:08:55 2007
@@ -21,19 +21,26 @@
import org.w3c.dom.Element;
+import org.apache.ws.commons.schema.XmlSchema;
+
public final class SchemaInfo extends AbstractPropertiesHolder {
- TypeInfo typeInfo;
+ ServiceInfo serviceInfo;
String namespaceUri;
Element element;
+ boolean isElementQualified;
+ boolean isAttributeQualified;
+ XmlSchema schema;
- public SchemaInfo(TypeInfo typeInfo, String namespaceUri) {
- this.typeInfo = typeInfo;
+ public SchemaInfo(ServiceInfo serviceInfo, String namespaceUri) {
+ this.serviceInfo = serviceInfo;
this.namespaceUri = namespaceUri;
+ this.isElementQualified = false;
+ this.isAttributeQualified = false;
}
- public TypeInfo getTypeInfo() {
- return typeInfo;
+ public ServiceInfo getServiceInfo() {
+ return serviceInfo;
}
public String getNamespaceURI() {
@@ -49,6 +56,30 @@
}
public void setElement(Element element) {
- this.element = element;
+ this.element = element;
+ String form = element.getAttribute("elementFormDefault");
+ if ((form != null) && form.equals("qualified")) {
+ isElementQualified = true;
+ }
+ form = element.getAttribute("attributeFormDefault");
+ if ((form != null) && form.equals("qualified")) {
+ isAttributeQualified = true;
+ }
+ }
+
+ public boolean isElementFormQualified() {
+ return isElementQualified;
+ }
+
+ public boolean isAttributeFormQualified() {
+ return isAttributeQualified;
+ }
+
+ public XmlSchema getSchema() {
+ return schema;
+ }
+
+ public void setSchema(XmlSchema schema) {
+ this.schema = schema;
}
}
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
Sun Jan 14 18:08:55 2007
@@ -19,8 +19,10 @@
package org.apache.cxf.service.model;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -30,10 +32,10 @@
QName name;
String targetNamespace;
InterfaceInfo intf;
- TypeInfo typeInfo;
Map<QName, BindingInfo> bindings = new ConcurrentHashMap<QName,
BindingInfo>(2);
Map<QName, EndpointInfo> endpoints = new ConcurrentHashMap<QName,
EndpointInfo>(2);
Map<QName, MessageInfo> messages;
+ List<SchemaInfo> schemas = new ArrayList<SchemaInfo>(4);
public ServiceInfo() {
}
@@ -83,14 +85,6 @@
public Collection<BindingInfo> getBindings() {
return Collections.unmodifiableCollection(bindings.values());
}
-
- public TypeInfo getTypeInfo() {
- return typeInfo;
- }
-
- public void setTypeInfo(TypeInfo typeInfo) {
- this.typeInfo = typeInfo;
- }
public Map<QName, MessageInfo> getMessages() {
if (messages != null) {
@@ -110,5 +104,22 @@
public MessageInfo getMessage(QName qname) {
return getMessages().get(qname);
+ }
+
+ public void addSchema(SchemaInfo schemaInfo) {
+ schemas.add(schemaInfo);
+ }
+
+ public SchemaInfo getSchema(String namespaceURI) {
+ for (SchemaInfo s : schemas) {
+ if (s.getNamespaceURI().equals(namespaceURI)) {
+ return s;
+ }
+ }
+ return null;
+ }
+
+ public Collection<SchemaInfo> getSchemas() {
+ return Collections.unmodifiableCollection(schemas);
}
}
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
Sun Jan 14 18:08:55 2007
@@ -71,7 +71,7 @@
} else {
tns = messagePartInfo.getTypeQName().getNamespaceURI();
}
- for (SchemaInfo schema : serviceInfo.getTypeInfo().getSchemas()) {
+ for (SchemaInfo schema : serviceInfo.getSchemas()) {
if (tns.equals(schema.getNamespaceURI())) {
schemaInfo = schema;
}
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
Sun Jan 14 18:08:55 2007
@@ -399,7 +399,7 @@
SchemaFactory factory = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI);
List<Source> schemaSources = new ArrayList<Source>();
- for (SchemaInfo schemaInfo :
serviceInfo.getTypeInfo().getSchemas()) {
+ for (SchemaInfo schemaInfo : serviceInfo.getSchemas()) {
Source source = new DOMSource(schemaInfo.getElement());
source.setSystemId(schemaInfo.getElement().getBaseURI());
if (source != null) {
Modified:
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
(original)
+++
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
Sun Jan 14 18:08:55 2007
@@ -34,7 +34,6 @@
}
public void testConstructor() throws Exception {
- assertNull(schemaInfo.getTypeInfo());
assertNull(schemaInfo.getElement());
assertEquals(schemaInfo.getNamespaceURI(),
"http://apache.org/hello_world_soap_http/types";);
Modified: incubator/cxf/trunk/common/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Sun Jan 14 18:08:55 2007
@@ -113,7 +113,7 @@
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/cxf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Sun Jan 14 18:08:55 2007
@@ -431,9 +431,9 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.0.3</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified:
incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/ClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/ClientTest.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/ClientTest.java
(original)
+++
incubator/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/ClientTest.java
Sun Jan 14 18:08:55 2007
@@ -70,7 +70,7 @@
customer = (Customer) objects[0];
assertEquals("Dan Diephouse", customer.getName());
-
+//
// objects = client.invoke(new QName("http://cxf.apache.org/jra";,
"deleteCustomer"),
// customer.getId());
// assertTrue(objects == null || objects.length == 0);
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
Sun Jan 14 18:08:55 2007
@@ -63,7 +63,6 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.TypeInfo;
public final class ServiceWSDLBuilder {
@@ -99,8 +98,8 @@
definition.setQName(service.getName());
definition.setTargetNamespace(service.getTargetNamespace());
addExtensibiltyElements(definition, getWSDL11Extensors(service));
- if (service.getTypeInfo() != null) {
- buildTypes(service.getTypeInfo());
+ if (service.getSchemas() != null && service.getSchemas().size() >
0) {
+ buildTypes(service.getSchemas());
}
buildPortType(service.getInterface());
buildBinding(service.getBindings());
@@ -123,9 +122,9 @@
}
}
- protected void buildTypes(TypeInfo typeInfo) {
+ protected void buildTypes(Collection<SchemaInfo> schemas) {
Types types = definition.createTypes();
- for (SchemaInfo schemaInfo : typeInfo.getSchemas()) {
+ for (SchemaInfo schemaInfo : schemas) {
SchemaImpl schemaImpl = new SchemaImpl();
schemaImpl.setRequired(true);
schemaImpl.setElementType(SCHEMA_QNAME);
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Sun Jan 14 18:08:55 2007
@@ -50,7 +50,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
-
import org.apache.cxf.resource.XmlSchemaURIResolver;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
@@ -65,11 +64,9 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.TypeInfo;
import org.apache.cxf.service.model.UnwrappedOperationInfo;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
-
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -129,10 +126,8 @@
service.setProperty(WSDL_DEFINITION, def);
service.setProperty(WSDL_SERVICE, serv);
- TypeInfo typeInfo = new TypeInfo(service);
- XmlSchemaCollection schemas = getSchemas(def, typeInfo);
+ XmlSchemaCollection schemas = getSchemas(def, service);
service.setProperty(WSDL_SCHEMA_LIST, schemas);
- service.setTypeInfo(typeInfo);
service.setTargetNamespace(def.getTargetNamespace());
service.setName(serv.getQName());
copyExtensors(service, def.getExtensibilityElements());
@@ -160,13 +155,13 @@
return service;
}
- private XmlSchemaCollection getSchemas(Definition def, TypeInfo typeInfo) {
+ private XmlSchemaCollection getSchemas(Definition def, ServiceInfo
serviceInfo) {
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
List<Definition> defList = new ArrayList<Definition>();
parseImports(def, defList);
- extractSchema(def, schemaCol, typeInfo);
+ extractSchema(def, schemaCol, serviceInfo);
for (Definition def2 : defList) {
- extractSchema(def2, schemaCol, typeInfo);
+ extractSchema(def2, schemaCol, serviceInfo);
}
return schemaCol;
}
@@ -184,7 +179,7 @@
}
}
- private void extractSchema(Definition def, XmlSchemaCollection schemaCol,
TypeInfo typeInfo) {
+ private void extractSchema(Definition def, XmlSchemaCollection schemaCol,
ServiceInfo serviceInfo) {
Types typesElement = def.getTypes();
if (typesElement != null) {
for (Object obj : typesElement.getExtensibilityElements()) {
@@ -208,10 +203,11 @@
schemaCol.setBaseUri(def.getDocumentBaseURI());
schemaCol.setSchemaResolver(new XmlSchemaURIResolver());
XmlSchema xmlSchema = schemaCol.read(schemaElem);
- SchemaInfo schemaInfo = new SchemaInfo(typeInfo,
xmlSchema.getTargetNamespace());
+
+ SchemaInfo schemaInfo = new SchemaInfo(serviceInfo,
xmlSchema.getTargetNamespace());
schemaInfo.setElement(schemaElem);
- typeInfo.addSchema(schemaInfo);
-
+ schemaInfo.setSchema(xmlSchema);
+ serviceInfo.addSchema(schemaInfo);
}
}
}
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
(original)
+++
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
Sun Jan 14 18:08:55 2007
@@ -55,7 +55,6 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.TypeInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl4jutils.WSDLLocatorImpl;
@@ -328,10 +327,8 @@
XmlSchemaCollection schemas =
serviceInfo.getProperty(WSDLServiceBuilder.WSDL_SCHEMA_LIST,
XmlSchemaCollection.class);
assertNotNull(schemas);
- TypeInfo typeInfo = serviceInfo.getTypeInfo();
- assertNotNull(typeInfo);
- assertEquals(typeInfo.getSchemas().size(), 1);
- SchemaInfo schemaInfo = typeInfo.getSchemas().iterator().next();
+ assertEquals(serviceInfo.getSchemas().size(), 1);
+ SchemaInfo schemaInfo = serviceInfo.getSchemas().iterator().next();
assertNotNull(schemaInfo);
assertEquals(schemaInfo.getNamespaceURI(),
"http://apache.org/hello_world_soap_http/types";);
assertEquals(schemas.read(schemaInfo.getElement()).getTargetNamespace(),
@@ -393,10 +390,8 @@
fout.close();
}
setUpWSDL(IMPORT_WSDL_PATH, 0);
- TypeInfo types = serviceInfo.getTypeInfo();
- assertNotNull(types);
- assertNotNull(types.getSchemas());
- Element ele = types.getSchemas().iterator().next().getElement();
+ assertNotNull(serviceInfo.getSchemas());
+ Element ele = serviceInfo.getSchemas().iterator().next().getElement();
assertNotNull(ele);
Schema schema = EndpointReferenceUtils.getSchema(serviceInfo);
assertNotNull(schema);
Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Sun Jan 14 18:08:55 2007
@@ -123,7 +123,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</dependency>
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
(original)
+++
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Sun Jan 14 18:08:55 2007
@@ -59,7 +59,6 @@
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.TypeInfo;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -195,12 +194,6 @@
col = new XmlSchemaCollection();
try {
- TypeInfo typeInfo = serviceInfo.getTypeInfo();
- if (typeInfo == null) {
- typeInfo = new TypeInfo(serviceInfo);
- serviceInfo.setTypeInfo(typeInfo);
- }
-
for (DOMResult r : generateJaxbSchemas()) {
Document d = (Document)r.getNode();
String ns =
d.getDocumentElement().getAttribute("targetNamespace");
@@ -224,9 +217,9 @@
continue;
}
- SchemaInfo schema = new SchemaInfo(typeInfo, ns);
+ SchemaInfo schema = new SchemaInfo(serviceInfo, ns);
schema.setElement(d.getDocumentElement());
- typeInfo.addSchema(schema);
+ serviceInfo.addSchema(schema);
col.read(d.getDocumentElement());
}
} catch (IOException e) {
Modified:
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
---
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Sun Jan 14 18:08:55 2007
@@ -64,7 +64,6 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.TypeInfo;
import org.apache.cxf.service.model.UnwrappedOperationInfo;
import org.apache.cxf.workqueue.SynchronousExecutor;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
@@ -357,12 +356,6 @@
}
}
- TypeInfo typeInfo = serviceInfo.getTypeInfo();
- if (typeInfo == null) {
- typeInfo = new TypeInfo(serviceInfo);
- serviceInfo.setTypeInfo(typeInfo);
- }
-
Document[] docs;
try {
docs = XmlSchemaSerializer.serializeSchema(schema, false);
@@ -370,9 +363,10 @@
throw new ServiceConstructionException(e1);
}
Element e = docs[0].getDocumentElement();
- SchemaInfo schemaInfo = new SchemaInfo(typeInfo,
getServiceNamespace());
+ SchemaInfo schemaInfo = new SchemaInfo(serviceInfo,
getServiceNamespace());
schemaInfo.setElement(e);
- typeInfo.addSchema(schemaInfo);
+ schemaInfo.setSchema(schema);
+ serviceInfo.addSchema(schemaInfo);
}
private void createWrappedMessage(MessageInfo wrappedMessage,
Modified: incubator/cxf/trunk/tools/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/pom.xml (original)
+++ incubator/cxf/trunk/tools/java2wsdl/pom.xml Sun Jan 14 18:08:55 2007
@@ -105,7 +105,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/cxf/trunk/tools/misctools/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/tools/misctools/pom.xml (original)
+++ incubator/cxf/trunk/tools/misctools/pom.xml Sun Jan 14 18:08:55 2007
@@ -76,7 +76,7 @@
<artifactId>saaj-api</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/cxf/trunk/tools/validator/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/tools/validator/pom.xml (original)
+++ incubator/cxf/trunk/tools/validator/pom.xml Sun Jan 14 18:08:55 2007
@@ -83,7 +83,7 @@
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
</dependency>
Modified: incubator/cxf/trunk/tools/wsdl2java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/pom.xml?view=diff&rev=496206&r1=496205&r2=496206
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/pom.xml (original)
+++ incubator/cxf/trunk/tools/wsdl2java/pom.xml Sun Jan 14 18:08:55 2007
@@ -94,7 +94,7 @@
<artifactId>saaj-api</artifactId>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
</dependency>
