[jbossws-commits] JBossWS SVN: r2689 - in trunk: build/ant-import and 2 other directories.
Author: jason.greene(a)jboss.com
Date: 2007-03-27 00:02:27 -0400 (Tue, 27 Mar 2007)
New Revision: 2689
Modified:
trunk/build/ant-import/build-deploy.xml
trunk/build/version.properties
trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java
Log:
Fix JBCTS-450
Fix DOMWriter.normalize()
Modified: trunk/build/ant-import/build-deploy.xml
===================================================================
--- trunk/build/ant-import/build-deploy.xml 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/build/ant-import/build-deploy.xml 2007-03-27 04:02:27 UTC (rev 2689)
@@ -62,6 +62,7 @@
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
@@ -280,4 +281,4 @@
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/build/version.properties 2007-03-27 04:02:27 UTC (rev 2689)
@@ -15,7 +15,7 @@
# thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
-ibm-wsdl4j=1.5.2jboss
+ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
jboss-jbossxb=2.0.0.CR1
jboss-microcontainer=2.0.0.Beta3
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java 2007-03-26 23:52:53
UTC (rev 2688)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java 2007-03-27 04:02:27
UTC (rev 2689)
@@ -564,6 +564,11 @@
str.append(""");
break;
}
+ case '\'':
+ {
+ str.append("'");
+ break;
+ }
case '\r':
case '\n':
{
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java
===================================================================
---
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-26
23:52:53 UTC (rev 2688)
+++
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-27
04:02:27 UTC (rev 2689)
@@ -27,6 +27,7 @@
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
@@ -58,6 +59,8 @@
{
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
wsdlReader = wsdlFactory.newWSDLReader();
+ // Allow unknown extensions (jaxws/jaxb binding elements)
+ wsdlReader.setExtensionRegistry(new ExtensionRegistry());
wsdlReader.setFeature(WSDL11DefinitionFactory.FEATURE_VERBOSE, false);
}
@@ -88,8 +91,8 @@
// Set EntityResolver in patched version of wsdl4j-1.5.2jboss
// [TODO] show the usecase that needs this
// ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver);
-
Definition wsdlDefinition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver,
wsdlLocation));
+
return wsdlDefinition;
}
}