Author: peterjones
Date: Sun Jan 28 13:24:24 2007
New Revision: 500888
URL: http://svn.apache.org/viewvc?view=rev&rev=500888
Log:
Couple minor fixes for ibm jdk issues.
CXF-391 - When we add any of the wsdl defs namespace declarations to the
schema element, we need to include namespaceURI.
CXF-387 - Do xslt transform that generates wsdl in the validate phase so
that it happens before the wsdl2java plugin runs in the generate-sources
phase.
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
incubator/cxf/trunk/testutils/pom.xml
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=500888&r1=500887&r2=500888
==============================================================================
---
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 28 13:24:24 2007
@@ -401,8 +401,8 @@
List<Source> schemaSources = new ArrayList<Source>();
for (SchemaInfo schemaInfo : serviceInfo.getSchemas()) {
Source source = new DOMSource(schemaInfo.getElement());
- source.setSystemId(schemaInfo.getElement().getBaseURI());
if (source != null) {
+ source.setSystemId(schemaInfo.getElement().getBaseURI());
schemaSources.add(source);
}
}
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=500888&r1=500887&r2=500888
==============================================================================
---
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 28 13:24:24 2007
@@ -221,7 +221,8 @@
for (Object prefix : def.getNamespaces().keySet()) {
String ns = (String)def.getNamespaces().get(prefix);
if (!"".equals(prefix) &&
!schemaElem.hasAttribute("xmlns:" + prefix)) {
- schemaElem.setAttribute("xmlns:" + prefix, ns);
+
schemaElem.setAttributeNS(javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
+ "xmlns:" + prefix, ns);
}
}
schemaCol.setBaseUri(def.getDocumentBaseURI());
Modified: incubator/cxf/trunk/testutils/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=500888&r1=500887&r2=500888
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Sun Jan 28 13:24:24 2007
@@ -73,8 +73,13 @@
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
+ <!--
+ Run in validate phase to ensure wsdls exist
+ before running wsdl2java in generate-sources
+ phase.
+ -->
+ <id>validate</id>
+ <phase>validate</phase>
<configuration>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<tasks>
