[jbossws-commits] JBossWS SVN: r16173 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/core/soap and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 17 08:22:01 EDT 2012
Author: ropalka
Date: 2012-04-17 08:22:00 -0400 (Tue, 17 Apr 2012)
New Revision: 16173
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NameImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/GetProperty.java
Log:
[JBPAPP-8718] Merged revisions 16169,16171 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r16169 | ropalka | 2012-04-17 13:19:23 +0200 (Tue, 17 Apr 2012) | 1 line
[JBWS-3465] removing precondition Native SAAJ impl is always in use - allows multiple SAAJ impls. to coexist at runtime
.......
r16171 | ropalka | 2012-04-17 13:40:23 +0200 (Tue, 17 Apr 2012) | 1 line
fix classloader issue - use proper one
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16097,16099-16105,16157-16168,16170
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16097,16099-16105,16157-16171
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16170
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NameImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NameImpl.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NameImpl.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -24,6 +24,8 @@
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
+
/**
* An implementation of a Name
* <p/>
@@ -107,10 +109,10 @@
public boolean equals(Object obj)
{
- if (!(obj instanceof NameImpl)) return false;
+ if (!(obj instanceof Name)) return false;
if (obj == this) return true;
- NameImpl other = (NameImpl)obj;
- return qname.equals(other.qname);
+ Name other = (Name)obj;
+ return qname.equals(SOAPUtils.toQName(other));
}
public QName toQName()
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -41,6 +41,7 @@
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.common.Constants;
import org.jboss.ws.common.DOMUtils;
+import org.jboss.ws.core.soap.utils.SOAPUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -532,7 +533,8 @@
*/
public Iterator<SOAPElement> getChildElements(Name name)
{
- return getChildElements(((NameImpl)name).toQName());
+ QName qName = SOAPUtils.toQName(name);
+ return getChildElements(qName);
}
public Iterator<SOAPElement> getChildElements(QName qname)
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/utils/SOAPUtils.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -90,4 +90,9 @@
public static Name newName(final QName faultCode, final SOAPEnvelope soapEnvelope) throws SOAPException {
return soapEnvelope.createName(faultCode.getLocalPart(), faultCode.getPrefix(), faultCode.getNamespaceURI());
}
+
+ public static QName toQName(final Name name) {
+ return new QName(name.getURI(), name.getLocalName(), name.getPrefix());
+ }
+
}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -44,6 +44,7 @@
import org.jboss.ws.common.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLException;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
@@ -104,7 +105,7 @@
if (log.isDebugEnabled())
log.debug("parse: " + wsdlLocation.toExternalForm());
- EntityResolver entityResolver = new JBossWSEntityResolver();
+ EntityResolver entityResolver = new JBossWSEntityResolver(ClassLoaderProvider.getDefaultProvider().getServerJAXRPCIntegrationClassLoader());
WSDLDefinitions wsdlDefinitions = null;
try
{
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -59,10 +59,9 @@
SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD);
soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI);
- SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse");
- bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl");
- SOAPElement soapElement = bodyElement.addChildElement("TimeChanged");
- soapElement.setAttributeNS("xsi", "type", "xsd:string");
+ SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse", "foo", "http://netid.msu.edu:8080/lastmod.pl");
+ SOAPElement soapElement = bodyElement.addChildElement("TimeChanged", "foo");
+ soapElement.setAttributeNS(Constants.NS_SCHEMA_XSI, "type", "xsd:string");
soapElement.setValue("yesterday");
((SOAPMessageContext)msgContext).setMessage(soapMessage);
}
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/GetProperty.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/GetProperty.java 2012-04-17 12:16:16 UTC (rev 16172)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/GetProperty.java 2012-04-17 12:22:00 UTC (rev 16173)
@@ -104,7 +104,7 @@
{
SOAPElement sel = _any[i];
Name name = sel.getElementName();
- builder.append(name);
+ builder.append("{" + name.getURI() + "}").append(name.getLocalName());
}
}
return "[elmt=" + strElement + ",attr=" + strAttr + ",lang=" + lang + ",any=" + builder + "]";
More information about the jbossws-commits
mailing list