[jboss-svn-commits] JBL Code SVN: r37265 - in labs/jbossesb/branches/JBESB_4_10_CP/product: lib/ext and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2011-07-15 17:07:50 -0400 (Fri, 15 Jul 2011)
New Revision: 37265

Removed:
   labs/jbossesb/branches/JBESB_4_10_CP/product/lib/ext/wstx-asl-3.2.8.jar
Modified:
   labs/jbossesb/branches/JBESB_4_10_CP/product/build-distr.xml
   labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
   labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/QNameHelper.java
   labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/StreamHelper.java
Log:
JBESB-3635
Upgrade wstx-asl from 3.2.8 to 3.2.9.    Checkin Kevin's patch to fix
namespace issues with wstx-asl-3.29, which was adding an empty namespace
if none existed.


Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/build-distr.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/build-distr.xml	2011-07-14 15:34:25 UTC (rev 37264)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/build-distr.xml	2011-07-15 21:07:50 UTC (rev 37265)
@@ -110,7 +110,7 @@
             <!-- XStream jars -->
             <fileset dir="${lib.dir}" includes="xstream-*.jar"/>
             <!-- woodstox for the StaxDriver -->
-            <fileset dir="${lib.ext.dir}" includes="wstx-*.jar"/>
+            <fileset dir="${lib.dir}" includes="wstx-*.jar"/>
         	<!-- MVEL -->
         	<fileset dir="${lib.dir}" includes="mvel*.jar"/>
             <!-- Quartz -->

Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml	2011-07-14 15:34:25 UTC (rev 37264)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml	2011-07-15 21:07:50 UTC (rev 37265)
@@ -71,6 +71,9 @@
             <exclude org="xpp3" module="xpp3_min"/>
             <exclude org="org.codehaus.woodstox" module="wstx-asl"/>
         </dependency>
+        <dependency org="org.codehaus.woodstox" name="wstx-asl" rev="3.2.9">
+       	    <exclude org="stax" module="stax-api"/>
+        </dependency>
         <dependency org="apache-bsf" name="bsf" rev="2.3.0"/>
         <dependency org="beanshell" name="bsh" rev="1.3.0"/>
 

Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/lib/ext/wstx-asl-3.2.8.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/QNameHelper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/QNameHelper.java	2011-07-14 15:34:25 UTC (rev 37264)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/QNameHelper.java	2011-07-15 21:07:50 UTC (rev 37265)
@@ -96,4 +96,21 @@
             return value ;
         }
     }
+
+    /**
+     * Get the normalised value of the namespace.
+     * @param namespace The namespace.
+     * @return The normalised namespace.
+     */
+    public static String getNormalisedNamespaceURI(final String namespace)
+    {
+        if ((namespace != null) && (namespace.length() == 0))
+        {
+            return null ;
+        }
+        else
+        {
+            return namespace ;
+        }
+    }
 }

Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/StreamHelper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/StreamHelper.java	2011-07-14 15:34:25 UTC (rev 37264)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/stax/StreamHelper.java	2011-07-15 21:07:50 UTC (rev 37265)
@@ -346,7 +346,7 @@
         throws XMLStreamException
     {
         streamReader.require(XMLStreamConstants.END_ELEMENT,
-            expected.getNamespaceURI(), expected.getLocalPart()) ;
+            QNameHelper.getNormalisedNamespaceURI(expected.getNamespaceURI()), expected.getLocalPart()) ;
     }
     
     /**