cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r608223 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/bin/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/
Date Wed, 02 Jan 2008 20:54:08 GMT
Author: dkulp
Date: Wed Jan  2 12:54:07 2008
New Revision: 608223

URL: http://svn.apache.org/viewvc?rev=608223&view=rev
Log:
Merged revisions 605061 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r605061 | bimargulies | 2007-12-17 20:28:56 -0500 (Mon, 17 Dec 2007) | 4 lines
  
  Remove spurious =='s from some shell scripts. They should be =.
  Some shells complain. Make error message clearer when there is no namespace
  at all on outer element of message, in response to pickle of dain's.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/java2wsdl
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2soap
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdlvalidator
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/xsd2wsdl
    incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
    incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/java2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/java2wsdl?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/java2wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/java2wsdl Wed Jan
 2 12:54:07 2008
@@ -59,7 +59,7 @@
 #
 
 sun_tool_path=""
-if [ $darwin == false ]; then
+if [ $darwin = false ]; then
     sun_tool_path=${JAVA_HOME}/lib/tools.jar
     if [ ! -f $sun_tool_path ]; then
 	echo "ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed"

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2soap
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2soap?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2soap (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdl2soap Wed Jan
 2 12:54:07 2008
@@ -55,7 +55,7 @@
 #
 
 sun_tool_path=""
-if [ $darwin == false ]; then
+if [ $darwin = false ]; then
     sun_tool_path=${JAVA_HOME}/lib/tools.jar
     if [ ! -f $sun_tool_path ]; then
 	echo "ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed"

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdlvalidator
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdlvalidator?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdlvalidator (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/wsdlvalidator Wed
Jan  2 12:54:07 2008
@@ -55,7 +55,7 @@
 #
 
 sun_tool_path=""
-if [ $darwin == false ]; then
+if [ $darwin = false ]; then
     sun_tool_path=${JAVA_HOME}/lib/tools.jar
     if [ ! -f $sun_tool_path ]; then
 	echo "ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed"

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/xsd2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/xsd2wsdl?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/xsd2wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/bin/xsd2wsdl Wed Jan
 2 12:54:07 2008
@@ -56,7 +56,7 @@
 #
 
 sun_tool_path=""
-if [ $darwin == false ]; then
+if [ $darwin = false ]; then
     sun_tool_path=${JAVA_HOME}/lib/tools.jar
     if [ ! -f $sun_tool_path ]; then
 	echo "ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed"

Modified: incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Messages.properties
Wed Jan  2 12:54:07 2008
@@ -25,6 +25,7 @@
 PARSER_EXC=Could not create DOM DocumentBuilder.
 NO_OPERATION=No such operation: {0}
 ATTACHMENT_IO=Attachment IO Exception: {0}
-INVALID_VERSION="{0}" is not a valid SOAP version.
+INVALID_VERSION="{0}", the namespace on the "{1}" element, is not a valid SOAP version.
+NO_NAMESPACE=No namespace on "{0}" element.
 BP_2211_RPCLIT_CANNOT_BE_NULL=Cannot write part {0}. RPC/Literal parts cannot be null. (WS-I
BP R2211)
 UNKNOWN_RPC_LIT_PART=Found element {0} but could not find matching RPC/Literal part

Modified: incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=608223&r1=608222&r2=608223&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
Wed Jan  2 12:54:07 2008
@@ -84,10 +84,14 @@
         try {
             if (xmlReader.nextTag() == XMLStreamConstants.START_ELEMENT) {
                 String ns = xmlReader.getNamespaceURI();
+                if (ns == null || "".equals(ns)) {
+                    throw new SoapFault(new Message("NO_NAMESPACE", LOG, xmlReader.getLocalName()),
+                                        Soap11.getInstance().getVersionMismatch());
+                }
                 
                 SoapVersion soapVersion = SoapVersionFactory.getInstance().getSoapVersion(ns);
                 if (soapVersion == null) {
-                    throw new SoapFault(new Message("INVALID_VERSION", LOG, ns),
+                    throw new SoapFault(new Message("INVALID_VERSION", LOG, ns, xmlReader.getLocalName()),
                                             Soap11.getInstance().getVersionMismatch());
                 }
                 message.setVersion(soapVersion);



Mime
View raw message