[jbossws-commits] JBossWS SVN: r9623 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-03-19 07:01:28 -0400 (Thu, 19 Mar 2009)
New Revision: 9623

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java
Log:
[JBWS-2208] Do not register http://www.w3.org/XML/1998/namespace namespace and prevent xml prefix to be bound to any namespace other than its usual namespace


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java	2009-03-18 17:21:31 UTC (rev 9622)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java	2009-03-19 11:01:28 UTC (rev 9623)
@@ -112,6 +112,19 @@
    /** Register the given namespaceURI/prefix combination */
    public String registerNamespaceURI(String nsURI, String prefix)
    {
+      if (Constants.NS_XML.equalsIgnoreCase(nsURI))
+      {
+         //"http://www.w3.org/XML/1998/namespace" is always bound to "xml" prefix
+         //and does not need to be registered.
+         return Constants.PREFIX_XML;
+      }
+      else if (Constants.PREFIX_XML.equalsIgnoreCase(prefix))
+      {
+         throw new IllegalArgumentException("The prefix " + Constants.PREFIX_XML +
+               " cannot be bound to any namespace other than its usual namespace (trying to bind to "
+               + nsURI + " )");
+      }
+      
       String pre = namespaces.getPrefix(nsURI);
       if (pre == null || 0 == pre.length())
       {