[jboss-cvs] JBossAS SVN: r62430 - in branches/JBoss_4_0_1_SP1_CP: jaxrpc/src/main/org/apache/axis/encoding and 2 other directories.

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

Author: fnasser at redhat.com
Date: 2007-04-19 16:28:38 -0400 (Thu, 19 Apr 2007)
New Revision: 62430

Modified:
   branches/JBoss_4_0_1_SP1_CP/jaxrpc/build.xml
   branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/DeserializationContextImpl.java
   branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/SerializationContextImpl.java
   branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/utils/Mapping.java
   branches/JBoss_4_0_1_SP1_CP/testsuite/imports/test-jars.xml
Log:
Merge of JBAS-4309 one-off branch (ASPATCH-200)

Modified: branches/JBoss_4_0_1_SP1_CP/jaxrpc/build.xml
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/jaxrpc/build.xml	2007-04-19 20:08:48 UTC (rev 62429)
+++ branches/JBoss_4_0_1_SP1_CP/jaxrpc/build.xml	2007-04-19 20:28:38 UTC (rev 62430)
@@ -174,8 +174,9 @@
   <!-- ================================================================== -->
 
   <!-- Deploy the webservice stuff to the server specified like this: -Dserver=default  -->
-  <target name="deploy" depends="main" if="server">
+  <target name="deploy" depends="main">
     <property environment="env"/>
+    <property name="server" value="default"/>
     <property name="jboss.home" value="${env.JBOSS_HOME}"/>
     <copy todir="${jboss.home}/client" file="${build.lib}/axis-ws4ee.jar" overwrite="true"/>
     <copy todir="${jboss.home}/server/${server}/deploy/jboss-ws4ee.sar" file="${build.lib}/axis-ws4ee.jar" overwrite="true"/>

Modified: branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/DeserializationContextImpl.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/DeserializationContextImpl.java	2007-04-19 20:08:48 UTC (rev 62429)
+++ branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/DeserializationContextImpl.java	2007-04-19 20:28:38 UTC (rev 62430)
@@ -88,8 +88,6 @@
 import javax.xml.rpc.JAXRPCException;
 import javax.xml.soap.SOAPException;
 import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -971,8 +969,13 @@
       throws SAXException
    {
       if (log.isDebugEnabled())
+         log.debug("Enter: DeserializationContextImpl::startPrefixMapping(" + prefix + ", " + uri + ")");
+
+      // This is a workaround for http://jira.jboss.com/jira/browse/JBWS-64
+      if ("".equals(uri))
       {
-         log.debug("Enter: DeserializationContextImpl::startPrefixMapping(" + prefix + ", " + uri + ")");
+         log.warn("Ignoring invalid namespace mapping: [prefix=" + prefix + ",uri=" + uri + "]");
+         return;
       }
 
       if (!doneParsing && (recorder != null))
@@ -1020,10 +1023,8 @@
       }
 
       if (log.isDebugEnabled())
-      {
          log.debug("Exit: DeserializationContextImpl::startPrefixMapping()");
       }
-   }
 
    public void endPrefixMapping(String prefix)
       throws SAXException

Modified: branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/SerializationContextImpl.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/SerializationContextImpl.java	2007-04-19 20:08:48 UTC (rev 62429)
+++ branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/encoding/SerializationContextImpl.java	2007-04-19 20:28:38 UTC (rev 62430)
@@ -106,7 +106,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Stack;
-import java.util.Collections;
 
 /**
  * Manage a serialization, including keeping track of namespace mappings
@@ -515,8 +514,13 @@
    public void registerPrefixForURI(String prefix, String uri)
    {
       if (log.isDebugEnabled())
+         log.debug("registerPrefixForURI(" + prefix + ", " + uri + ")");
+
+      // This is a workaround for http://jira.jboss.com/jira/browse/JBWS-64
+      if ("".equals(uri))
       {
-         log.debug(Messages.getMessage("register00", prefix, uri));
+         log.warn("Ignoring invalid namespace mapping: [prefix=" + prefix + ",uri=" + uri + "]");
+         return;
       }
 
       if ((uri != null) && (prefix != null))

Modified: branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/utils/Mapping.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/utils/Mapping.java	2007-04-19 20:08:48 UTC (rev 62429)
+++ branches/JBoss_4_0_1_SP1_CP/jaxrpc/src/main/org/apache/axis/utils/Mapping.java	2007-04-19 20:28:38 UTC (rev 62430)
@@ -83,7 +83,7 @@
 
    public void setNamespaceURI(String namespaceURI)
    {
-      if (namespaceURI == null || namespaceURI.length() == 0)
+      if (namespaceURI == null)
          throw new IllegalArgumentException("Namespace URI cannot be null");
 
       this.namespaceURI = namespaceURI;

Modified: branches/JBoss_4_0_1_SP1_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/testsuite/imports/test-jars.xml	2007-04-19 20:08:48 UTC (rev 62429)
+++ branches/JBoss_4_0_1_SP1_CP/testsuite/imports/test-jars.xml	2007-04-19 20:28:38 UTC (rev 62430)
@@ -4682,6 +4682,20 @@
       </metainf>
     </jar>
 
+    <!-- ws4ee-jbws64 -->
+    <war warfile="${build.lib}/ws4ee-jbws64.war"
+      webxml="${source.resources}/webservice/jbws64/WEB-INF/web.xml">
+      <classes dir="${build.classes}">
+        <include name="org/jboss/test/webservice/jbws64/Hello.class"/>
+        <include name="org/jboss/test/webservice/jbws64/HelloJavaBean.class"/>
+      </classes>
+      <webinf dir="${source.resources}/webservice/jbws64/WEB-INF">
+        <include name="webservices.xml"/>
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="wsdl/**"/>
+      </webinf>
+    </war>
+
     <!-- ws4ee-marshall-doclit -->
     <jar destfile="${build.lib}/ws4ee-marshall-doclit.jar" manifest="${build.etc}/manifest.mf">
       <fileset dir="${build.classes}">