Author: mageshbk(a)jboss.com Date: 2009-07-13 03:17:28 -0400 (Mon, 13 Jul 2009) New Revision: 10320 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java Log: [JBPAPP-2060] Allow binding objects that are defined by XmlAttribute from "http://www.w3.org/XML/1998/namespace" Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java 2009-07-13 07:06:53 UTC (rev 10319) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitions.java 2009-07-13 07:17:28 UTC (rev 10320) @@ -114,11 +114,24 @@ /** 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 || pre == "") + if (pre == null || 0 == pre.length()) { pre = namespaces.registerURI(nsURI, prefix); - log.trace("registerNamespaceURI: " + pre + "=" + nsURI); + log.trace("registerNamespaceURI: " + pre + '=' + nsURI); } return pre; }